Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
slapos.core
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Łukasz Nowak
slapos.core
Commits
e02b451e
Commit
e02b451e
authored
Nov 23, 2017
by
Rafael Monnerat
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
slapos_erp5: Merge slapos_cache into slapos_erp5 bt5
Reimplement promise alarm as constraint.
parent
1de8ff9c
Changes
26
Hide whitespace changes
Inline
Side-by-side
Showing
26 changed files
with
220 additions
and
626 deletions
+220
-626
master/bt5/slapos_cache/PathTemplateItem/portal_alarms/promise_slapos_shacache_website.xml
...ateItem/portal_alarms/promise_slapos_shacache_website.xml
+0
-132
master/bt5/slapos_cache/SkinTemplateItem/portal_skins/slapos_cache.xml
...apos_cache/SkinTemplateItem/portal_skins/slapos_cache.xml
+0
-47
master/bt5/slapos_cache/SkinTemplateItem/portal_skins/slapos_cache/Alarm_checkPromiseShacacheWebSite.py
...l_skins/slapos_cache/Alarm_checkPromiseShacacheWebSite.py
+0
-50
master/bt5/slapos_cache/SkinTemplateItem/portal_skins/slapos_cache/Alarm_installShacacheWebSite.py
...portal_skins/slapos_cache/Alarm_installShacacheWebSite.py
+0
-36
master/bt5/slapos_cache/SkinTemplateItem/portal_skins/slapos_cache/Alarm_installShacacheWebSite.xml
...ortal_skins/slapos_cache/Alarm_installShacacheWebSite.xml
+0
-62
master/bt5/slapos_cache/SkinTemplateItem/portal_skins/slapos_cache/SystemPreference_viewShacache.xml
...rtal_skins/slapos_cache/SystemPreference_viewShacache.xml
+0
-152
master/bt5/slapos_cache/SkinTemplateItem/portal_skins/slapos_cache/SystemPreference_viewShacache/my_preferred_shacache_website_expected_state.xml
...Shacache/my_preferred_shacache_website_expected_state.xml
+0
-120
master/bt5/slapos_cache/bt/dependency_list
master/bt5/slapos_cache/bt/dependency_list
+0
-2
master/bt5/slapos_cache/bt/template_action_path_list
master/bt5/slapos_cache/bt/template_action_path_list
+0
-1
master/bt5/slapos_cache/bt/template_format_version
master/bt5/slapos_cache/bt/template_format_version
+0
-1
master/bt5/slapos_cache/bt/template_path_list
master/bt5/slapos_cache/bt/template_path_list
+0
-1
master/bt5/slapos_cache/bt/template_property_sheet_id_list
master/bt5/slapos_cache/bt/template_property_sheet_id_list
+0
-1
master/bt5/slapos_cache/bt/template_skin_id_list
master/bt5/slapos_cache/bt/template_skin_id_list
+0
-1
master/bt5/slapos_cache/bt/title
master/bt5/slapos_cache/bt/title
+0
-1
master/bt5/slapos_cache/bt/version
master/bt5/slapos_cache/bt/version
+0
-1
master/bt5/slapos_erp5/PortalTypePropertySheetTemplateItem/property_sheet_list.xml
...rtalTypePropertySheetTemplateItem/property_sheet_list.xml
+7
-1
master/bt5/slapos_erp5/PropertySheetTemplateItem/portal_property_sheets/ShacacheSystemPreference.xml
...eItem/portal_property_sheets/ShacacheSystemPreference.xml
+0
-0
master/bt5/slapos_erp5/PropertySheetTemplateItem/portal_property_sheets/ShacacheSystemPreference/preferred_shacache_website_expected_state_property.xml
...ce/preferred_shacache_website_expected_state_property.xml
+0
-0
master/bt5/slapos_erp5/PropertySheetTemplateItem/portal_property_sheets/WebSiteModuleShacacheConstraint.xml
...ortal_property_sheets/WebSiteModuleShacacheConstraint.xml
+66
-0
master/bt5/slapos_erp5/PropertySheetTemplateItem/portal_property_sheets/WebSiteModuleShacacheConstraint/shacache_website_constraint_constraint.xml
...acheConstraint/shacache_website_constraint_constraint.xml
+80
-0
master/bt5/slapos_erp5/SkinTemplateItem/portal_skins/slapos_erp5/WebSiteModule_checkShacacheConstraint.py
...kins/slapos_erp5/WebSiteModule_checkShacacheConstraint.py
+55
-0
master/bt5/slapos_erp5/SkinTemplateItem/portal_skins/slapos_erp5/WebSiteModule_checkShacacheConstraint.xml
...ins/slapos_erp5/WebSiteModule_checkShacacheConstraint.xml
+2
-2
master/bt5/slapos_erp5/TestTemplateItem/portal_components/test.erp5.testSlapOSERP5SkinSelection.py
...ortal_components/test.erp5.testSlapOSERP5SkinSelection.py
+0
-11
master/bt5/slapos_erp5/bt/dependency_list
master/bt5/slapos_erp5/bt/dependency_list
+3
-2
master/bt5/slapos_erp5/bt/template_portal_type_property_sheet_list
...5/slapos_erp5/bt/template_portal_type_property_sheet_list
+3
-1
master/bt5/slapos_erp5/bt/template_property_sheet_id_list
master/bt5/slapos_erp5/bt/template_property_sheet_id_list
+4
-1
No files found.
master/bt5/slapos_cache/PathTemplateItem/portal_alarms/promise_slapos_shacache_website.xml
deleted
100644 → 0
View file @
1de8ff9c
<?xml version="1.0"?>
<ZopeData>
<record
id=
"1"
aka=
"AAAAAAAAAAE="
>
<pickle>
<global
name=
"Alarm"
module=
"erp5.portal_type"
/>
</pickle>
<pickle>
<dictionary>
<item>
<key>
<string>
_local_properties
</string>
</key>
<value>
<tuple>
<dictionary>
<item>
<key>
<string>
id
</string>
</key>
<value>
<string>
alarm_shacache_website_promise
</string>
</value>
</item>
<item>
<key>
<string>
type
</string>
</key>
<value>
<string>
string
</string>
</value>
</item>
</dictionary>
</tuple>
</value>
</item>
<item>
<key>
<string>
active_sense_method_id
</string>
</key>
<value>
<string>
Alarm_checkPromiseShacacheWebSite
</string>
</value>
</item>
<item>
<key>
<string>
alarm_notification_mode
</string>
</key>
<value>
<tuple>
<string>
never
</string>
</tuple>
</value>
</item>
<item>
<key>
<string>
alarm_shacache_website_promise
</string>
</key>
<value>
<string>
embeeded
</string>
</value>
</item>
<item>
<key>
<string>
configuration_form_id
</string>
</key>
<value>
<none/>
</value>
</item>
<item>
<key>
<string>
description
</string>
</key>
<value>
<none/>
</value>
</item>
<item>
<key>
<string>
enabled
</string>
</key>
<value>
<int>
0
</int>
</value>
</item>
<item>
<key>
<string>
id
</string>
</key>
<value>
<string>
promise_slapos_shacache_website
</string>
</value>
</item>
<item>
<key>
<string>
periodicity_day_frequency
</string>
</key>
<value>
<int>
1
</int>
</value>
</item>
<item>
<key>
<string>
periodicity_hour
</string>
</key>
<value>
<tuple>
<int>
0
</int>
</tuple>
</value>
</item>
<item>
<key>
<string>
periodicity_minute
</string>
</key>
<value>
<tuple/>
</value>
</item>
<item>
<key>
<string>
periodicity_month
</string>
</key>
<value>
<tuple/>
</value>
</item>
<item>
<key>
<string>
periodicity_month_day
</string>
</key>
<value>
<tuple/>
</value>
</item>
<item>
<key>
<string>
periodicity_start_date
</string>
</key>
<value>
<object>
<klass>
<global
name=
"DateTime"
module=
"DateTime.DateTime"
/>
</klass>
<tuple>
<none/>
</tuple>
<state>
<tuple>
<float>
0.0
</float>
<string>
GMT
</string>
</tuple>
</state>
</object>
</value>
</item>
<item>
<key>
<string>
periodicity_week
</string>
</key>
<value>
<tuple/>
</value>
</item>
<item>
<key>
<string>
portal_type
</string>
</key>
<value>
<string>
Alarm
</string>
</value>
</item>
<item>
<key>
<string>
solve_method_id
</string>
</key>
<value>
<string>
Alarm_installShacacheWebSite
</string>
</value>
</item>
<item>
<key>
<string>
title
</string>
</key>
<value>
<string>
Shacache website Promise
</string>
</value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
master/bt5/slapos_cache/SkinTemplateItem/portal_skins/slapos_cache.xml
deleted
100644 → 0
View file @
1de8ff9c
<?xml version="1.0"?>
<ZopeData>
<record
id=
"1"
aka=
"AAAAAAAAAAE="
>
<pickle>
<global
name=
"Folder"
module=
"OFS.Folder"
/>
</pickle>
<pickle>
<dictionary>
<item>
<key>
<string>
_local_properties
</string>
</key>
<value>
<tuple>
<dictionary>
<item>
<key>
<string>
id
</string>
</key>
<value>
<string>
business_template_skin_layer_priority
</string>
</value>
</item>
<item>
<key>
<string>
type
</string>
</key>
<value>
<string>
float
</string>
</value>
</item>
</dictionary>
</tuple>
</value>
</item>
<item>
<key>
<string>
_objects
</string>
</key>
<value>
<tuple/>
</value>
</item>
<item>
<key>
<string>
business_template_skin_layer_priority
</string>
</key>
<value>
<float>
60.0
</float>
</value>
</item>
<item>
<key>
<string>
id
</string>
</key>
<value>
<string>
slapos_cache
</string>
</value>
</item>
<item>
<key>
<string>
title
</string>
</key>
<value>
<string></string>
</value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
master/bt5/slapos_cache/SkinTemplateItem/portal_skins/slapos_cache/Alarm_checkPromiseShacacheWebSite.py
deleted
100644 → 0
View file @
1de8ff9c
from
Products.CMFActivity.ActiveResult
import
ActiveResult
portal
=
context
.
getPortalObject
()
web_site_module
=
getattr
(
portal
,
'web_site_module'
,
None
)
if
web_site_module
is
None
:
# web_site_module is not present yet, so it is impossible
# to keep the promise
return
False
shacache
=
getattr
(
web_site_module
,
'shacache'
,
None
)
shadir
=
getattr
(
web_site_module
,
'shadir'
,
None
)
expected_state
=
context
.
portal_preferences
.
getPreferredShacacheWebsiteExpectedState
(
"published"
)
active_result
=
ActiveResult
()
if
expected_state
==
"published"
and
shacache
is
None
:
severity
=
1
summary
=
"Shacache WebSite do not exist"
detail
=
""
elif
expected_state
==
"published"
and
shadir
is
None
:
severity
=
1
summary
=
"Shadir WebSite do not exist"
detail
=
""
elif
expected_state
==
"published"
and
shacache
.
getSkinSelectionName
()
!=
"SHACACHE"
:
severity
=
1
summary
=
"shacache site don't have SHACACHE as skin selection name"
detail
=
""
elif
expected_state
==
"published"
and
shadir
.
getSkinSelectionName
()
!=
"SHADIR"
:
severity
=
1
summary
=
"shadir site don't have SHADIR as skin selection name"
detail
=
""
elif
shacache
is
not
None
and
shacache
.
getValidationState
()
!=
expected_state
:
severity
=
1
summary
=
"shacache site is not what is expected: %s"
%
expected_state
detail
=
""
elif
shadir
is
not
None
and
shadir
.
getValidationState
()
!=
expected_state
:
severity
=
1
summary
=
"shadir site is not published %s"
%
expected_state
detail
=
""
else
:
severity
=
0
summary
=
"Nothing to do."
detail
=
""
active_result
.
edit
(
summary
=
summary
,
severity
=
severity
,
detail
=
detail
)
context
.
newActiveProcess
().
postResult
(
active_result
)
master/bt5/slapos_cache/SkinTemplateItem/portal_skins/slapos_cache/Alarm_installShacacheWebSite.py
deleted
100644 → 0
View file @
1de8ff9c
portal
=
context
.
getPortalObject
()
shacache
=
getattr
(
portal
.
web_site_module
,
'shacache'
,
None
)
shadir
=
getattr
(
portal
.
web_site_module
,
'shadir'
,
None
)
expected_state
=
context
.
portal_preferences
.
getPreferredShacacheWebsiteExpectedState
(
"published"
)
if
expected_state
==
"published"
and
shacache
is
None
:
shacache
=
portal
.
web_site_module
.
newContent
(
id
=
'shacache'
,
title
=
"Shacache"
)
if
expected_state
==
"published"
and
shadir
is
None
:
shadir
=
portal
.
web_site_module
.
newContent
(
id
=
'shadir'
,
title
=
"Shadir"
)
if
shadir
is
None
and
shacache
is
None
:
# Nothing to do
return
if
expected_state
==
"published"
:
shacache
.
setSkinSelectionName
(
"SHACACHE"
)
shadir
.
setSkinSelectionName
(
"SHADIR"
)
if
expected_state
==
"published"
:
if
portal
.
portal_workflow
.
isTransitionPossible
(
shacache
,
"publish"
):
shacache
.
publish
()
if
portal
.
portal_workflow
.
isTransitionPossible
(
shadir
,
"publish"
):
shadir
.
publish
()
return
if
portal
.
portal_workflow
.
isTransitionPossible
(
shacache
,
"embeed"
):
shacache
.
embeed
()
if
portal
.
portal_workflow
.
isTransitionPossible
(
shadir
,
"embeed"
):
shadir
.
embeed
()
master/bt5/slapos_cache/SkinTemplateItem/portal_skins/slapos_cache/Alarm_installShacacheWebSite.xml
deleted
100644 → 0
View file @
1de8ff9c
<?xml version="1.0"?>
<ZopeData>
<record
id=
"1"
aka=
"AAAAAAAAAAE="
>
<pickle>
<global
name=
"PythonScript"
module=
"Products.PythonScripts.PythonScript"
/>
</pickle>
<pickle>
<dictionary>
<item>
<key>
<string>
Script_magic
</string>
</key>
<value>
<int>
3
</int>
</value>
</item>
<item>
<key>
<string>
_bind_names
</string>
</key>
<value>
<object>
<klass>
<global
name=
"NameAssignments"
module=
"Shared.DC.Scripts.Bindings"
/>
</klass>
<tuple/>
<state>
<dictionary>
<item>
<key>
<string>
_asgns
</string>
</key>
<value>
<dictionary>
<item>
<key>
<string>
name_container
</string>
</key>
<value>
<string>
container
</string>
</value>
</item>
<item>
<key>
<string>
name_context
</string>
</key>
<value>
<string>
context
</string>
</value>
</item>
<item>
<key>
<string>
name_m_self
</string>
</key>
<value>
<string>
script
</string>
</value>
</item>
<item>
<key>
<string>
name_subpath
</string>
</key>
<value>
<string>
traverse_subpath
</string>
</value>
</item>
</dictionary>
</value>
</item>
</dictionary>
</state>
</object>
</value>
</item>
<item>
<key>
<string>
_params
</string>
</key>
<value>
<string>
**kw
</string>
</value>
</item>
<item>
<key>
<string>
id
</string>
</key>
<value>
<string>
Alarm_installShacacheWebSite
</string>
</value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
master/bt5/slapos_cache/SkinTemplateItem/portal_skins/slapos_cache/SystemPreference_viewShacache.xml
deleted
100644 → 0
View file @
1de8ff9c
<?xml version="1.0"?>
<ZopeData>
<record
id=
"1"
aka=
"AAAAAAAAAAE="
>
<pickle>
<global
name=
"ERP5 Form"
module=
"erp5.portal_type"
/>
</pickle>
<pickle>
<dictionary>
<item>
<key>
<string>
_bind_names
</string>
</key>
<value>
<object>
<klass>
<global
name=
"NameAssignments"
module=
"Shared.DC.Scripts.Bindings"
/>
</klass>
<tuple/>
<state>
<dictionary>
<item>
<key>
<string>
_asgns
</string>
</key>
<value>
<dictionary/>
</value>
</item>
</dictionary>
</state>
</object>
</value>
</item>
<item>
<key>
<string>
_objects
</string>
</key>
<value>
<tuple/>
</value>
</item>
<item>
<key>
<string>
action
</string>
</key>
<value>
<string>
Base_edit
</string>
</value>
</item>
<item>
<key>
<string>
description
</string>
</key>
<value>
<string></string>
</value>
</item>
<item>
<key>
<string>
edit_order
</string>
</key>
<value>
<list/>
</value>
</item>
<item>
<key>
<string>
encoding
</string>
</key>
<value>
<string>
UTF-8
</string>
</value>
</item>
<item>
<key>
<string>
enctype
</string>
</key>
<value>
<string></string>
</value>
</item>
<item>
<key>
<string>
group_list
</string>
</key>
<value>
<list>
<string>
left
</string>
<string>
right
</string>
<string>
center
</string>
<string>
bottom
</string>
<string>
hidden
</string>
</list>
</value>
</item>
<item>
<key>
<string>
groups
</string>
</key>
<value>
<dictionary>
<item>
<key>
<string>
bottom
</string>
</key>
<value>
<list/>
</value>
</item>
<item>
<key>
<string>
center
</string>
</key>
<value>
<list/>
</value>
</item>
<item>
<key>
<string>
hidden
</string>
</key>
<value>
<list/>
</value>
</item>
<item>
<key>
<string>
left
</string>
</key>
<value>
<list>
<string>
my_preferred_shacache_website_expected_state
</string>
</list>
</value>
</item>
<item>
<key>
<string>
right
</string>
</key>
<value>
<list/>
</value>
</item>
</dictionary>
</value>
</item>
<item>
<key>
<string>
id
</string>
</key>
<value>
<string>
SystemPreference_viewShacache
</string>
</value>
</item>
<item>
<key>
<string>
method
</string>
</key>
<value>
<string>
POST
</string>
</value>
</item>
<item>
<key>
<string>
name
</string>
</key>
<value>
<string>
SystemPreference_viewVifib
</string>
</value>
</item>
<item>
<key>
<string>
pt
</string>
</key>
<value>
<string>
form_view
</string>
</value>
</item>
<item>
<key>
<string>
row_length
</string>
</key>
<value>
<int>
4
</int>
</value>
</item>
<item>
<key>
<string>
stored_encoding
</string>
</key>
<value>
<string>
UTF-8
</string>
</value>
</item>
<item>
<key>
<string>
title
</string>
</key>
<value>
<string>
Vifib
</string>
</value>
</item>
<item>
<key>
<string>
unicode_mode
</string>
</key>
<value>
<int>
0
</int>
</value>
</item>
<item>
<key>
<string>
update_action
</string>
</key>
<value>
<string></string>
</value>
</item>
<item>
<key>
<string>
update_action_title
</string>
</key>
<value>
<string></string>
</value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
master/bt5/slapos_cache/SkinTemplateItem/portal_skins/slapos_cache/SystemPreference_viewShacache/my_preferred_shacache_website_expected_state.xml
deleted
100644 → 0
View file @
1de8ff9c
<?xml version="1.0"?>
<ZopeData>
<record
id=
"1"
aka=
"AAAAAAAAAAE="
>
<pickle>
<global
name=
"ProxyField"
module=
"Products.ERP5Form.ProxyField"
/>
</pickle>
<pickle>
<dictionary>
<item>
<key>
<string>
delegated_list
</string>
</key>
<value>
<list>
<string>
items
</string>
<string>
title
</string>
</list>
</value>
</item>
<item>
<key>
<string>
id
</string>
</key>
<value>
<string>
my_preferred_shacache_website_expected_state
</string>
</value>
</item>
<item>
<key>
<string>
message_values
</string>
</key>
<value>
<dictionary>
<item>
<key>
<string>
external_validator_failed
</string>
</key>
<value>
<string>
The input failed the external validator.
</string>
</value>
</item>
</dictionary>
</value>
</item>
<item>
<key>
<string>
overrides
</string>
</key>
<value>
<dictionary>
<item>
<key>
<string>
field_id
</string>
</key>
<value>
<string></string>
</value>
</item>
<item>
<key>
<string>
form_id
</string>
</key>
<value>
<string></string>
</value>
</item>
<item>
<key>
<string>
target
</string>
</key>
<value>
<string></string>
</value>
</item>
</dictionary>
</value>
</item>
<item>
<key>
<string>
tales
</string>
</key>
<value>
<dictionary>
<item>
<key>
<string>
field_id
</string>
</key>
<value>
<string></string>
</value>
</item>
<item>
<key>
<string>
form_id
</string>
</key>
<value>
<string></string>
</value>
</item>
<item>
<key>
<string>
items
</string>
</key>
<value>
<string></string>
</value>
</item>
<item>
<key>
<string>
target
</string>
</key>
<value>
<string></string>
</value>
</item>
<item>
<key>
<string>
title
</string>
</key>
<value>
<string></string>
</value>
</item>
</dictionary>
</value>
</item>
<item>
<key>
<string>
values
</string>
</key>
<value>
<dictionary>
<item>
<key>
<string>
field_id
</string>
</key>
<value>
<string>
my_list_field
</string>
</value>
</item>
<item>
<key>
<string>
form_id
</string>
</key>
<value>
<string>
Base_viewFieldLibrary
</string>
</value>
</item>
<item>
<key>
<string>
items
</string>
</key>
<value>
<list>
<tuple>
<string>
Embeeded
</string>
<string>
embeeded
</string>
</tuple>
<tuple>
<string>
Published
</string>
<string>
published
</string>
</tuple>
</list>
</value>
</item>
<item>
<key>
<string>
target
</string>
</key>
<value>
<string>
Click to edit the target
</string>
</value>
</item>
<item>
<key>
<string>
title
</string>
</key>
<value>
<string>
Preferred Shacache WebSite Expected State
</string>
</value>
</item>
</dictionary>
</value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
master/bt5/slapos_cache/bt/dependency_list
deleted
100644 → 0
View file @
1de8ff9c
erp5_web_shacache
erp5_web_shadir
\ No newline at end of file
master/bt5/slapos_cache/bt/template_action_path_list
deleted
100644 → 0
View file @
1de8ff9c
System Preference | shacache_preference
\ No newline at end of file
master/bt5/slapos_cache/bt/template_format_version
deleted
100644 → 0
View file @
1de8ff9c
1
\ No newline at end of file
master/bt5/slapos_cache/bt/template_path_list
deleted
100644 → 0
View file @
1de8ff9c
portal_alarms/promise_slapos_shacache_website
\ No newline at end of file
master/bt5/slapos_cache/bt/template_property_sheet_id_list
deleted
100644 → 0
View file @
1de8ff9c
ShacacheSystemPreference
\ No newline at end of file
master/bt5/slapos_cache/bt/template_skin_id_list
deleted
100644 → 0
View file @
1de8ff9c
slapos_cache
\ No newline at end of file
master/bt5/slapos_cache/bt/title
deleted
100644 → 0
View file @
1de8ff9c
slapos_cache
\ No newline at end of file
master/bt5/slapos_cache/bt/version
deleted
100644 → 0
View file @
1de8ff9c
1.0
\ No newline at end of file
master/bt5/slapos_erp5/PortalTypePropertySheetTemplateItem/property_sheet_list.xml
View file @
e02b451e
...
...
@@ -8,4 +8,10 @@
<portal_type
id=
"Memcached Tool"
>
<item>
MemcachedToolServerConstraint
</item>
</portal_type>
</property_sheet_list>
\ No newline at end of file
<portal_type
id=
"Organisation"
>
<item>
GeographicOrganisation
</item>
</portal_type>
<portal_type
id=
"Web Site Module"
>
<item>
WebSiteModuleShacacheConstraint
</item>
</portal_type>
</property_sheet_list>
master/bt5/slapos_
cache
/PropertySheetTemplateItem/portal_property_sheets/ShacacheSystemPreference.xml
→
master/bt5/slapos_
erp5
/PropertySheetTemplateItem/portal_property_sheets/ShacacheSystemPreference.xml
View file @
e02b451e
File moved
master/bt5/slapos_
cache
/PropertySheetTemplateItem/portal_property_sheets/ShacacheSystemPreference/preferred_shacache_website_expected_state_property.xml
→
master/bt5/slapos_
erp5
/PropertySheetTemplateItem/portal_property_sheets/ShacacheSystemPreference/preferred_shacache_website_expected_state_property.xml
View file @
e02b451e
File moved
master/bt5/slapos_erp5/PropertySheetTemplateItem/portal_property_sheets/WebSiteModuleShacacheConstraint.xml
0 → 100644
View file @
e02b451e
<?xml version="1.0"?>
<ZopeData>
<record
id=
"1"
aka=
"AAAAAAAAAAE="
>
<pickle>
<global
name=
"Property Sheet"
module=
"erp5.portal_type"
/>
</pickle>
<pickle>
<dictionary>
<item>
<key>
<string>
_count
</string>
</key>
<value>
<persistent>
<string
encoding=
"base64"
>
AAAAAAAAAAI=
</string>
</persistent>
</value>
</item>
<item>
<key>
<string>
_mt_index
</string>
</key>
<value>
<persistent>
<string
encoding=
"base64"
>
AAAAAAAAAAM=
</string>
</persistent>
</value>
</item>
<item>
<key>
<string>
_tree
</string>
</key>
<value>
<persistent>
<string
encoding=
"base64"
>
AAAAAAAAAAQ=
</string>
</persistent>
</value>
</item>
<item>
<key>
<string>
description
</string>
</key>
<value>
<none/>
</value>
</item>
<item>
<key>
<string>
id
</string>
</key>
<value>
<string>
WebSiteModuleShacacheConstraint
</string>
</value>
</item>
<item>
<key>
<string>
portal_type
</string>
</key>
<value>
<string>
Property Sheet
</string>
</value>
</item>
</dictionary>
</pickle>
</record>
<record
id=
"2"
aka=
"AAAAAAAAAAI="
>
<pickle>
<global
name=
"Length"
module=
"BTrees.Length"
/>
</pickle>
<pickle>
<int>
0
</int>
</pickle>
</record>
<record
id=
"3"
aka=
"AAAAAAAAAAM="
>
<pickle>
<global
name=
"OOBTree"
module=
"BTrees.OOBTree"
/>
</pickle>
<pickle>
<none/>
</pickle>
</record>
<record
id=
"4"
aka=
"AAAAAAAAAAQ="
>
<pickle>
<global
name=
"OOBTree"
module=
"BTrees.OOBTree"
/>
</pickle>
<pickle>
<none/>
</pickle>
</record>
</ZopeData>
master/bt5/slapos_
cache/ActionTemplateItem/portal_types/System%20Preference/shacache_preference
.xml
→
master/bt5/slapos_
erp5/PropertySheetTemplateItem/portal_property_sheets/WebSiteModuleShacacheConstraint/shacache_website_constraint_constraint
.xml
View file @
e02b451e
...
...
@@ -2,82 +2,77 @@
<ZopeData>
<record
id=
"1"
aka=
"AAAAAAAAAAE="
>
<pickle>
<global
name=
"
ActionInformation"
module=
"Products.CMFCore.ActionInformation
"
/>
<global
name=
"
Script Constraint"
module=
"erp5.portal_type
"
/>
</pickle>
<pickle>
<dictionary>
<item>
<key>
<string>
act
ion
</string>
</key>
<key>
<string>
_identity_criter
ion
</string>
</key>
<value>
<persistent>
<string
encoding=
"base64"
>
AAAAAAAAAAI=
</string>
</persistent>
</value>
</item>
<item>
<key>
<string>
_range_criterion
</string>
</key>
<value>
<persistent>
<string
encoding=
"base64"
>
AAAAAAAAAAM=
</string>
</persistent>
</value>
</item>
<item>
<key>
<string>
categories
</string>
</key>
<value>
<tuple>
<string>
action_type/object_view
</string>
<string>
constraint_type/post_upgrade
</string>
</tuple>
</value>
</item>
<item>
<key>
<string>
category
</string>
</key>
<value>
<string>
object_view
</string>
</value>
</item>
<item>
<key>
<string>
condition
</string>
</key>
<value>
<string></string>
</value>
</item>
<item>
<key>
<string>
description
</string>
</key>
<value>
<none/>
</value>
</item>
<item>
<key>
<string>
icon
</string>
</key>
<value>
<string></string>
</value>
</item>
<item>
<key>
<string>
id
</string>
</key>
<value>
<string>
shacache_preference
</string>
</value>
</item>
<item>
<key>
<string>
permissions
</string>
</key>
<value>
<tuple>
<string>
View
</string>
</tuple>
</value>
<value>
<string>
shacache_website_constraint_constraint
</string>
</value>
</item>
<item>
<key>
<string>
portal_type
</string>
</key>
<value>
<string>
Action Information
</string>
</value>
<value>
<string>
Script Constraint
</string>
</value>
</item>
<item>
<key>
<string>
priority
</string>
</key>
<value>
<float>
10.1
</float>
</value>
</item>
<item>
<key>
<string>
title
</string>
</key>
<value>
<string>
Shacache
</string>
</value>
<key>
<string>
script_id
</string>
</key>
<value>
<string>
WebSiteModule_checkShacacheConstraint
</string>
</value>
</item>
</dictionary>
</pickle>
</record>
<record
id=
"2"
aka=
"AAAAAAAAAAI="
>
<pickle>
<global
name=
"PersistentMapping"
module=
"Persistence.mapping"
/>
</pickle>
<pickle>
<dictionary>
<item>
<key>
<string>
visible
</string>
</key>
<value>
<int>
1
</int>
</value>
<key>
<string>
data
</string>
</key>
<value>
<dictionary/>
</value>
</item>
</dictionary>
</pickle>
</record>
<record
id=
"
2"
aka=
"AAAAAAAAAAI
="
>
<record
id=
"
3"
aka=
"AAAAAAAAAAM
="
>
<pickle>
<global
name=
"
Expression"
module=
"Products.CMFCore.Expression
"
/>
<global
name=
"
PersistentMapping"
module=
"Persistence.mapping
"
/>
</pickle>
<pickle>
<dictionary>
<item>
<key>
<string>
text
</string>
</key>
<value>
<string>
string:${object_url}/SystemPreference_viewShacache
</string>
</value>
<key>
<string>
data
</string>
</key>
<value>
<dictionary/>
</value>
</item>
</dictionary>
</pickle>
...
...
master/bt5/slapos_erp5/SkinTemplateItem/portal_skins/slapos_erp5/WebSiteModule_checkShacacheConstraint.py
0 → 100644
View file @
e02b451e
portal
=
context
.
getPortalObject
()
web_site_module
=
getattr
(
portal
,
'web_site_module'
,
None
)
if
web_site_module
is
None
:
# web_site_module is not present yet, so it is impossible
# to keep the promise
return
False
shacache
=
getattr
(
web_site_module
,
'shacache'
,
None
)
shadir
=
getattr
(
web_site_module
,
'shadir'
,
None
)
expected_state
=
context
.
portal_preferences
.
getPreferredShacacheWebsiteExpectedState
(
"published"
)
result_list
=
[]
if
expected_state
==
"published"
:
if
shacache
is
None
:
result_list
.
append
(
"Shacache WebSite do not exist"
)
if
fixit
:
shacache
=
portal
.
web_site_module
.
newContent
(
id
=
'shacache'
,
title
=
"Shacache"
)
if
shadir
is
None
:
result_list
.
append
(
"Shadir WebSite do not exist"
)
if
fixit
:
shadir
=
portal
.
web_site_module
.
newContent
(
id
=
'shadir'
,
title
=
"Shadir"
)
if
shacache
.
getSkinSelectionName
()
!=
"SHACACHE"
:
result_list
.
append
(
"shacache site don't have SHACACHE as skin selection name"
)
if
fixit
:
shacache
.
setSkinSelectionName
(
"SHACACHE"
)
if
shadir
.
getSkinSelectionName
()
!=
"SHADIR"
:
result_list
.
append
(
"shadir site don't have SHADIR as skin selection name"
)
if
fixit
:
shadir
.
setSkinSelectionName
(
"SHADIR"
)
if
shacache
is
not
None
and
shacache
.
getValidationState
()
!=
expected_state
:
result_list
.
append
(
"shacache site is not what is expected: %s"
%
expected_state
)
if
fixit
:
if
expected_state
==
"published"
and
\
portal
.
portal_workflow
.
isTransitionPossible
(
shacache
,
"publish"
):
shacache
.
publish
()
elif
expected_state
==
"embedded"
and
\
portal
.
portal_workflow
.
isTransitionPossible
(
shacache
,
"embed"
):
shacache
.
embed
()
if
shadir
is
not
None
and
shadir
.
getValidationState
()
!=
expected_state
:
result_list
.
append
(
"shadir site is not %s"
%
expected_state
)
if
fixit
:
if
expected_state
==
"published"
and
\
portal
.
portal_workflow
.
isTransitionPossible
(
shadir
,
"publish"
):
shadir
.
publish
()
elif
expected_state
==
"embedded"
and
\
portal
.
portal_workflow
.
isTransitionPossible
(
shadir
,
"embed"
):
shadir
.
embed
()
return
result_list
master/bt5/slapos_
cache/SkinTemplateItem/portal_skins/slapos_cache/Alarm_checkPromiseShacacheWebSite
.xml
→
master/bt5/slapos_
erp5/SkinTemplateItem/portal_skins/slapos_erp5/WebSiteModule_checkShacacheConstraint
.xml
View file @
e02b451e
...
...
@@ -50,11 +50,11 @@
</item>
<item>
<key>
<string>
_params
</string>
</key>
<value>
<string>
tag, fixit=False
, **kw
</string>
</value>
<value>
<string>
fixit=False, activate_kw={}
, **kw
</string>
</value>
</item>
<item>
<key>
<string>
id
</string>
</key>
<value>
<string>
Alarm_checkPromiseShacacheWebSite
</string>
</value>
<value>
<string>
WebSiteModule_checkShacacheConstraint
</string>
</value>
</item>
</dictionary>
</pickle>
...
...
master/bt5/slapos_erp5/TestTemplateItem/portal_components/test.erp5.testSlapOSERP5SkinSelection.py
View file @
e02b451e
...
...
@@ -124,7 +124,6 @@ slapos_trial
slapos_crm_monitoring
slapos_accounting
slapos_administration
slapos_cache
slapos_cloud
slapos_consumption
slapos_core
...
...
@@ -237,7 +236,6 @@ slapos_trial
slapos_crm_monitoring
slapos_accounting
slapos_administration
slapos_cache
slapos_cloud
slapos_consumption
slapos_core
...
...
@@ -345,7 +343,6 @@ slapos_trial
slapos_crm_monitoring
slapos_accounting
slapos_administration
slapos_cache
slapos_cloud
slapos_consumption
slapos_core
...
...
@@ -454,7 +451,6 @@ slapos_trial
slapos_crm_monitoring
slapos_accounting
slapos_administration
slapos_cache
slapos_cloud
slapos_consumption
slapos_core
...
...
@@ -560,7 +556,6 @@ slapos_trial
slapos_crm_monitoring
slapos_accounting
slapos_administration
slapos_cache
slapos_cloud
slapos_consumption
slapos_core
...
...
@@ -667,7 +662,6 @@ slapos_trial
slapos_crm_monitoring
slapos_accounting
slapos_administration
slapos_cache
slapos_cloud
slapos_consumption
slapos_core
...
...
@@ -773,7 +767,6 @@ slapos_trial
slapos_crm_monitoring
slapos_accounting
slapos_administration
slapos_cache
slapos_cloud
slapos_consumption
slapos_core
...
...
@@ -880,7 +873,6 @@ slapos_trial
slapos_crm_monitoring
slapos_accounting
slapos_administration
slapos_cache
slapos_cloud
slapos_consumption
slapos_core
...
...
@@ -986,7 +978,6 @@ slapos_trial
slapos_crm_monitoring
slapos_accounting
slapos_administration
slapos_cache
slapos_cloud
slapos_consumption
slapos_core
...
...
@@ -1094,7 +1085,6 @@ slapos_trial
slapos_crm_monitoring
slapos_accounting
slapos_administration
slapos_cache
slapos_cloud
slapos_consumption
slapos_core
...
...
@@ -1203,7 +1193,6 @@ slapos_trial
slapos_crm_monitoring
slapos_accounting
slapos_administration
slapos_cache
slapos_cloud
slapos_consumption
slapos_core
...
...
master/bt5/slapos_erp5/bt/dependency_list
View file @
e02b451e
...
...
@@ -8,8 +8,9 @@ erp5_forge
erp5_dhtml_style
erp5_ace_editor
erp5_code_mirror
erp5_web_shacache
erp5_web_shadir
slapos_accounting
slapos_cache
slapos_category
slapos_cloud
slapos_ecoallocation
...
...
@@ -21,4 +22,4 @@ slapos_web
slapos_jio
slapos_payzen
slapos_upgrader
slapos_trial_request
slapos_trial_request
\ No newline at end of file
master/bt5/slapos_erp5/bt/template_portal_type_property_sheet_list
View file @
e02b451e
Certificate Authority Tool | CertificateAuthorityToolConsistencyConstraint
Id Tool | SlapOSModuleIdGeneratorConstraint
Memcached Tool | MemcachedToolServerConstraint
\ No newline at end of file
Memcached Tool | MemcachedToolServerConstraint
Organisation | GeographicOrganisation
Web Site Module | WebSiteModuleShacacheConstraint
master/bt5/slapos_erp5/bt/template_property_sheet_id_list
View file @
e02b451e
...
...
@@ -2,4 +2,7 @@ PreferenceToolSlapOSConstraintPreference
PreferenceToolConversionServerConstraintPreference
CertificateAuthorityToolConsistencyConstraint
SlapOSModuleIdGeneratorConstraint
MemcachedToolServerConstraint
\ No newline at end of file
MemcachedToolServerConstraint
GeographicOrganisation
WebSiteModuleShacacheConstraint
ShacacheSystemPreference
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment