slapos_erp5: Fixup Name Conventions and some cleanup

master/bt5/slapos_configurator/PathTemplateItem/portal_workflow/slapos_master_configuration_workflow.xml

@@ -40,7 +40,7 @@
         </item>
         <item>
             <key> <string>configuration_after_script_id</string> </key>
-            <value> <string>BusinessConfiguration_invokeSlapOSMasterPromiseAlarmList</string> </value>
+            <value> <string>BusinessConfiguration_runPostUpgradeConsistency</string> </value>
         </item>
         <item>
             <key> <string>description</string> </key>

master/bt5/slapos_configurator/SkinTemplateItem/portal_skins/slapos_configurator/BusinessConfiguration_invokeSlapOSMasterPromiseAlarmList.xml → master/bt5/slapos_configurator/SkinTemplateItem/portal_skins/slapos_configurator/BusinessConfiguration_runPostUpgradeConsistency.xml

@@ -54,7 +54,7 @@
         </item>
         <item>
             <key> <string>id</string> </key>
-            <value> <string>BusinessConfiguration_invokeSlapOSMasterPromiseAlarmList</string> </value>
+            <value> <string>BusinessConfiguration_runPostUpgradeConsistency</string> </value>
         </item>
       </dictionary>
     </pickle>

master/bt5/slapos_erp5/PropertySheetTemplateItem/portal_property_sheets/PreferenceToolSlapOSConstraintPreference.xml → master/bt5/slapos_erp5/PropertySheetTemplateItem/portal_property_sheets/PreferenceSlapOSConstraintPreference.xml

@@ -32,7 +32,7 @@
         </item>
         <item>
             <key> <string>id</string> </key>
-            <value> <string>PreferenceToolSlapOSConstraintPreference</string> </value>
+            <value> <string>PreferenceSlapOSConstraintPreference</string> </value>
         </item>
         <item>
             <key> <string>portal_type</string> </key>

master/bt5/slapos_erp5/PropertySheetTemplateItem/portal_property_sheets/PreferenceToolConversionServerConstraintPreference/conversion_server_consistency_constraint.xml → master/bt5/slapos_erp5/PropertySheetTemplateItem/portal_property_sheets/PreferenceSlapOSConstraintPreference/conversion_server_consistency_constraint.xml

@@ -42,7 +42,7 @@
         </item>
         <item>
             <key> <string>script_id</string> </key>
-            <value> <string>PreferenceTool_checkConversionServerConsistency</string> </value>
+            <value> <string>SystemPreference_checkConversionServerConsistency</string> </value>
         </item>
       </dictionary>
     </pickle>

master/bt5/slapos_erp5/PropertySheetTemplateItem/portal_property_sheets/PreferenceToolSlapOSConstraintPreference/system_preference_consistency_constraint.xml → master/bt5/slapos_erp5/PropertySheetTemplateItem/portal_property_sheets/PreferenceSlapOSConstraintPreference/system_preference_consistency_constraint.xml

@@ -42,7 +42,7 @@
         </item>
         <item>
             <key> <string>script_id</string> </key>
-            <value> <string>PreferenceTool_checkSystemPreferenceConsistency</string> </value>
+            <value> <string>SystemPreference_checkSystemPreferenceConsistency</string> </value>
         </item>
       </dictionary>
     </pickle>

master/bt5/slapos_erp5/PropertySheetTemplateItem/portal_property_sheets/PreferenceToolConversionServerConstraintPreference.xml

-<?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.xml → master/bt5/slapos_erp5/SkinTemplateItem/portal_skins/slapos_erp5/SystemPreference_checkConversionServerConsistency.xml

@@ -54,7 +54,7 @@
         </item>
         <item>
             <key> <string>id</string> </key>
-            <value> <string>PreferenceTool_checkConversionServerConsistency</string> </value>
+            <value> <string>SystemPreference_checkConversionServerConsistency</string> </value>
         </item>
       </dictionary>
     </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

@@ -6,17 +6,24 @@
 if context.getPortalType() not in ["System Preference"]:
   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":
   return []
 
-error_list = []
-
 if context.getId() != "slapos_default_system_preference":
   error_list.append(
     "The Default System preference globally enabled shouldn't be %s but slapos_default_system_preference" % context.getId())
   if fixit:
     context.disable(comment="Disabled by PreferenceTool_checkSystemPreferenceConsistency")
 
+
 preference_method_list = [
   "getPreferredHateoasUrl",
   "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

@@ -54,7 +54,7 @@
         </item>
         <item>
             <key> <string>id</string> </key>
-            <value> <string>PreferenceTool_checkSystemPreferenceConsistency</string> </value>
+            <value> <string>SystemPreference_checkSystemPreferenceConsistency</string> </value>
         </item>
       </dictionary>
     </pickle>

master/bt5/slapos_erp5/bt/template_property_sheet_id_list

-PreferenceToolSlapOSConstraintPreference
-PreferenceToolConversionServerConstraintPreference
+PreferenceSlapOSConstraintPreference
 CertificateAuthorityToolConsistencyConstraint
 SlapOSModuleIdGeneratorConstraint
 MemcachedToolServerConstraint