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
91fa45cf
Commit
91fa45cf
authored
Apr 19, 2022
by
Rafael Monnerat
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
slapos_erp5: Fixup Name Conventions and some cleanup
parent
2f116cc2
Changes
12
Show whitespace changes
Inline
Side-by-side
Showing
12 changed files
with
17 additions
and
77 deletions
+17
-77
master/bt5/slapos_configurator/PathTemplateItem/portal_workflow/slapos_master_configuration_workflow.xml
.../portal_workflow/slapos_master_configuration_workflow.xml
+1
-1
master/bt5/slapos_configurator/SkinTemplateItem/portal_skins/slapos_configurator/BusinessConfiguration_runPostUpgradeConsistency.py
...urator/BusinessConfiguration_runPostUpgradeConsistency.py
+0
-0
master/bt5/slapos_configurator/SkinTemplateItem/portal_skins/slapos_configurator/BusinessConfiguration_runPostUpgradeConsistency.xml
...rator/BusinessConfiguration_runPostUpgradeConsistency.xml
+1
-1
master/bt5/slapos_erp5/PropertySheetTemplateItem/portal_property_sheets/PreferenceSlapOSConstraintPreference.xml
..._property_sheets/PreferenceSlapOSConstraintPreference.xml
+1
-1
master/bt5/slapos_erp5/PropertySheetTemplateItem/portal_property_sheets/PreferenceSlapOSConstraintPreference/conversion_server_consistency_constraint.xml
...ntPreference/conversion_server_consistency_constraint.xml
+1
-1
master/bt5/slapos_erp5/PropertySheetTemplateItem/portal_property_sheets/PreferenceSlapOSConstraintPreference/system_preference_consistency_constraint.xml
...ntPreference/system_preference_consistency_constraint.xml
+1
-1
master/bt5/slapos_erp5/PropertySheetTemplateItem/portal_property_sheets/PreferenceToolConversionServerConstraintPreference.xml
...ts/PreferenceToolConversionServerConstraintPreference.xml
+0
-66
master/bt5/slapos_erp5/SkinTemplateItem/portal_skins/slapos_erp5/SystemPreference_checkConversionServerConsistency.py
...erp5/SystemPreference_checkConversionServerConsistency.py
+0
-0
master/bt5/slapos_erp5/SkinTemplateItem/portal_skins/slapos_erp5/SystemPreference_checkConversionServerConsistency.xml
...rp5/SystemPreference_checkConversionServerConsistency.xml
+1
-1
master/bt5/slapos_erp5/SkinTemplateItem/portal_skins/slapos_erp5/SystemPreference_checkSystemPreferenceConsistency.py
...erp5/SystemPreference_checkSystemPreferenceConsistency.py
+9
-2
master/bt5/slapos_erp5/SkinTemplateItem/portal_skins/slapos_erp5/SystemPreference_checkSystemPreferenceConsistency.xml
...rp5/SystemPreference_checkSystemPreferenceConsistency.xml
+1
-1
master/bt5/slapos_erp5/bt/template_property_sheet_id_list
master/bt5/slapos_erp5/bt/template_property_sheet_id_list
+1
-2
No files found.
master/bt5/slapos_configurator/PathTemplateItem/portal_workflow/slapos_master_configuration_workflow.xml
View file @
91fa45cf
...
@@ -40,7 +40,7 @@
...
@@ -40,7 +40,7 @@
</item>
</item>
<item>
<item>
<key>
<string>
configuration_after_script_id
</string>
</key>
<key>
<string>
configuration_after_script_id
</string>
</key>
<value>
<string>
BusinessConfiguration_
invokeSlapOSMasterPromiseAlarmList
</string>
</value>
<value>
<string>
BusinessConfiguration_
runPostUpgradeConsistency
</string>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
description
</string>
</key>
<key>
<string>
description
</string>
</key>
...
...
master/bt5/slapos_configurator/SkinTemplateItem/portal_skins/slapos_configurator/BusinessConfiguration_
invokeSlapOSMasterPromiseAlarmList
.py
→
master/bt5/slapos_configurator/SkinTemplateItem/portal_skins/slapos_configurator/BusinessConfiguration_
runPostUpgradeConsistency
.py
View file @
91fa45cf
File moved
master/bt5/slapos_configurator/SkinTemplateItem/portal_skins/slapos_configurator/BusinessConfiguration_
invokeSlapOSMasterPromiseAlarmList
.xml
→
master/bt5/slapos_configurator/SkinTemplateItem/portal_skins/slapos_configurator/BusinessConfiguration_
runPostUpgradeConsistency
.xml
View file @
91fa45cf
...
@@ -54,7 +54,7 @@
...
@@ -54,7 +54,7 @@
</item>
</item>
<item>
<item>
<key>
<string>
id
</string>
</key>
<key>
<string>
id
</string>
</key>
<value>
<string>
BusinessConfiguration_
invokeSlapOSMasterPromiseAlarmList
</string>
</value>
<value>
<string>
BusinessConfiguration_
runPostUpgradeConsistency
</string>
</value>
</item>
</item>
</dictionary>
</dictionary>
</pickle>
</pickle>
...
...
master/bt5/slapos_erp5/PropertySheetTemplateItem/portal_property_sheets/Preference
Tool
SlapOSConstraintPreference.xml
→
master/bt5/slapos_erp5/PropertySheetTemplateItem/portal_property_sheets/PreferenceSlapOSConstraintPreference.xml
View file @
91fa45cf
...
@@ -32,7 +32,7 @@
...
@@ -32,7 +32,7 @@
</item>
</item>
<item>
<item>
<key>
<string>
id
</string>
</key>
<key>
<string>
id
</string>
</key>
<value>
<string>
Preference
Tool
SlapOSConstraintPreference
</string>
</value>
<value>
<string>
PreferenceSlapOSConstraintPreference
</string>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
portal_type
</string>
</key>
<key>
<string>
portal_type
</string>
</key>
...
...
master/bt5/slapos_erp5/PropertySheetTemplateItem/portal_property_sheets/Preference
ToolConversionServer
ConstraintPreference/conversion_server_consistency_constraint.xml
→
master/bt5/slapos_erp5/PropertySheetTemplateItem/portal_property_sheets/Preference
SlapOS
ConstraintPreference/conversion_server_consistency_constraint.xml
View file @
91fa45cf
...
@@ -42,7 +42,7 @@
...
@@ -42,7 +42,7 @@
</item>
</item>
<item>
<item>
<key>
<string>
script_id
</string>
</key>
<key>
<string>
script_id
</string>
</key>
<value>
<string>
PreferenceTool
_checkConversionServerConsistency
</string>
</value>
<value>
<string>
SystemPreference
_checkConversionServerConsistency
</string>
</value>
</item>
</item>
</dictionary>
</dictionary>
</pickle>
</pickle>
...
...
master/bt5/slapos_erp5/PropertySheetTemplateItem/portal_property_sheets/Preference
Tool
SlapOSConstraintPreference/system_preference_consistency_constraint.xml
→
master/bt5/slapos_erp5/PropertySheetTemplateItem/portal_property_sheets/PreferenceSlapOSConstraintPreference/system_preference_consistency_constraint.xml
View file @
91fa45cf
...
@@ -42,7 +42,7 @@
...
@@ -42,7 +42,7 @@
</item>
</item>
<item>
<item>
<key>
<string>
script_id
</string>
</key>
<key>
<string>
script_id
</string>
</key>
<value>
<string>
PreferenceTool
_checkSystemPreferenceConsistency
</string>
</value>
<value>
<string>
SystemPreference
_checkSystemPreferenceConsistency
</string>
</value>
</item>
</item>
</dictionary>
</dictionary>
</pickle>
</pickle>
...
...
master/bt5/slapos_erp5/PropertySheetTemplateItem/portal_property_sheets/PreferenceToolConversionServerConstraintPreference.xml
deleted
100644 → 0
View file @
2f116cc2
<?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>
PreferenceToolConversionServerConstraintPreference
</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_erp5/SkinTemplateItem/portal_skins/slapos_erp5/
PreferenceTool
_checkConversionServerConsistency.py
→
master/bt5/slapos_erp5/SkinTemplateItem/portal_skins/slapos_erp5/
SystemPreference
_checkConversionServerConsistency.py
View file @
91fa45cf
File moved
master/bt5/slapos_erp5/SkinTemplateItem/portal_skins/slapos_erp5/
PreferenceTool
_checkConversionServerConsistency.xml
→
master/bt5/slapos_erp5/SkinTemplateItem/portal_skins/slapos_erp5/
SystemPreference
_checkConversionServerConsistency.xml
View file @
91fa45cf
...
@@ -54,7 +54,7 @@
...
@@ -54,7 +54,7 @@
</item>
</item>
<item>
<item>
<key>
<string>
id
</string>
</key>
<key>
<string>
id
</string>
</key>
<value>
<string>
PreferenceTool
_checkConversionServerConsistency
</string>
</value>
<value>
<string>
SystemPreference
_checkConversionServerConsistency
</string>
</value>
</item>
</item>
</dictionary>
</dictionary>
</pickle>
</pickle>
...
...
master/bt5/slapos_erp5/SkinTemplateItem/portal_skins/slapos_erp5/
PreferenceTool
_checkSystemPreferenceConsistency.py
→
master/bt5/slapos_erp5/SkinTemplateItem/portal_skins/slapos_erp5/
SystemPreference
_checkSystemPreferenceConsistency.py
View file @
91fa45cf
...
@@ -6,17 +6,24 @@
...
@@ -6,17 +6,24 @@
if
context
.
getPortalType
()
not
in
[
"System Preference"
]:
if
context
.
getPortalType
()
not
in
[
"System Preference"
]:
return
[]
return
[]
error_list
=
[]
if
context
.
getId
()
==
"slapos_default_system_preference"
and
context
.
getPreferenceState
()
!=
"global"
:
error_list
.
append
(
"The Default System preference globally enabled shouldn't be slapos_default_system_preference"
%
context
.
getId
())
if
fixit
:
context
.
globalEnable
(
comment
=
"Enabled by PreferenceTool_checkSystemPreferenceConsistency"
)
if
context
.
getPreferenceState
()
!=
"global"
:
if
context
.
getPreferenceState
()
!=
"global"
:
return
[]
return
[]
error_list
=
[]
if
context
.
getId
()
!=
"slapos_default_system_preference"
:
if
context
.
getId
()
!=
"slapos_default_system_preference"
:
error_list
.
append
(
error_list
.
append
(
"The Default System preference globally enabled shouldn't be %s but slapos_default_system_preference"
%
context
.
getId
())
"The Default System preference globally enabled shouldn't be %s but slapos_default_system_preference"
%
context
.
getId
())
if
fixit
:
if
fixit
:
context
.
disable
(
comment
=
"Disabled by PreferenceTool_checkSystemPreferenceConsistency"
)
context
.
disable
(
comment
=
"Disabled by PreferenceTool_checkSystemPreferenceConsistency"
)
preference_method_list
=
[
preference_method_list
=
[
"getPreferredHateoasUrl"
,
"getPreferredHateoasUrl"
,
"getPreferredPayzenPaymentServiceReference"
,
"getPreferredPayzenPaymentServiceReference"
,
...
...
master/bt5/slapos_erp5/SkinTemplateItem/portal_skins/slapos_erp5/
PreferenceTool
_checkSystemPreferenceConsistency.xml
→
master/bt5/slapos_erp5/SkinTemplateItem/portal_skins/slapos_erp5/
SystemPreference
_checkSystemPreferenceConsistency.xml
View file @
91fa45cf
...
@@ -54,7 +54,7 @@
...
@@ -54,7 +54,7 @@
</item>
</item>
<item>
<item>
<key>
<string>
id
</string>
</key>
<key>
<string>
id
</string>
</key>
<value>
<string>
PreferenceTool
_checkSystemPreferenceConsistency
</string>
</value>
<value>
<string>
SystemPreference
_checkSystemPreferenceConsistency
</string>
</value>
</item>
</item>
</dictionary>
</dictionary>
</pickle>
</pickle>
...
...
master/bt5/slapos_erp5/bt/template_property_sheet_id_list
View file @
91fa45cf
PreferenceToolSlapOSConstraintPreference
PreferenceSlapOSConstraintPreference
PreferenceToolConversionServerConstraintPreference
CertificateAuthorityToolConsistencyConstraint
CertificateAuthorityToolConsistencyConstraint
SlapOSModuleIdGeneratorConstraint
SlapOSModuleIdGeneratorConstraint
MemcachedToolServerConstraint
MemcachedToolServerConstraint
...
...
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