slapos_pdm: drop approveRegistration

master/bt5/slapos_pdm/SkinTemplateItem/portal_skins/slapos_pdm/InstanceTree_createUpgradeDecision.py

@@ -100,6 +100,14 @@ if len(allocation_cell_list) == 1:
       aggregate_value=instance_tree,
     )
 
-    upgrade_decision.approveRegistration()
+    with upgrade_decision.defaultActivateParameterDict({'tag': tag}):
+      if upgrade_decision.getSimulationState() == "draft":
+        upgrade_decision.plan()
+      upgrade_decision.setStartDate(DateTime())
+      if upgrade_decision.getSimulationState() == "planned":
+        upgrade_decision.confirm()
+
+    # Prevent concurrent transaction to create 2 upgrade decision for the same instance_tree
+    instance_tree.serialize()
 
     return upgrade_decision

master/bt5/slapos_pdm/WorkflowTemplateItem/portal_workflow/upgrade_slap_interface_workflow/script_UpgradeDecision_approveRegistration.py

-upgrade_decision = state_change["object"]
-from DateTime import DateTime
-
-portal = upgrade_decision.getPortalObject()
-instance_tree = upgrade_decision.getAggregateValue()
-
-tag = "%s_requestUpgradeDecisionCreation_inProgress" % instance_tree.getUid()
-activate_kw = {'tag': tag}
-if portal.portal_activities.countMessageWithTag(tag) > 0:
-  # nothing to do
-  return
-
-with upgrade_decision.defaultActivateParameterDict(activate_kw):
-  if upgrade_decision.getSimulationState() == "draft":
-    upgrade_decision.plan()
-
-  upgrade_decision.setStartDate(DateTime())
-  if upgrade_decision.getSimulationState() == "planned":
-    upgrade_decision.confirm()
-
-# Prevent concurrent transaction to create 2 upgrade decision for the same instance_tree
-instance_tree.serialize()

master/bt5/slapos_pdm/WorkflowTemplateItem/portal_workflow/upgrade_slap_interface_workflow/script_UpgradeDecision_approveRegistration.xml

-<?xml version="1.0"?>
-<ZopeData>
-  <record id="1" aka="AAAAAAAAAAE=">
-    <pickle>
-      <global name="Workflow Script" module="erp5.portal_type"/>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>_bind_names</string> </key>
-            <value>
-              <object>
-                <klass>
-                  <global name="_reconstructor" module="copy_reg"/>
-                </klass>
-                <tuple>
-                  <global name="NameAssignments" module="Shared.DC.Scripts.Bindings"/>
-                  <global name="object" module="__builtin__"/>
-                  <none/>
-                </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>state_change</string> </value>
-        </item>
-        <item>
-            <key> <string>_proxy_roles</string> </key>
-            <value>
-              <tuple>
-                <string>Manager</string>
-              </tuple>
-            </value>
-        </item>
-        <item>
-            <key> <string>description</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>id</string> </key>
-            <value> <string>script_UpgradeDecision_approveRegistration</string> </value>
-        </item>
-        <item>
-            <key> <string>portal_type</string> </key>
-            <value> <string>Workflow Script</string> </value>
-        </item>
-        <item>
-            <key> <string>title</string> </key>
-            <value> <string>UpgradeDecision_approveRegistration</string> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-</ZopeData>

master/bt5/slapos_pdm/WorkflowTemplateItem/portal_workflow/upgrade_slap_interface_workflow/state_draft.xml

@@ -16,7 +16,6 @@
             <key> <string>categories</string> </key>
             <value>
               <tuple>
-                <string>destination/portal_workflow/upgrade_slap_interface_workflow/transition_approve_registration</string>
                 <string>destination/portal_workflow/upgrade_slap_interface_workflow/transition_notify</string>
               </tuple>
             </value>

master/bt5/slapos_pdm/WorkflowTemplateItem/portal_workflow/upgrade_slap_interface_workflow/transition_approve_registration.xml

-<?xml version="1.0"?>
-<ZopeData>
-  <record id="1" aka="AAAAAAAAAAE=">
-    <pickle>
-      <global name="Workflow Transition" module="erp5.portal_type"/>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>action</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>action_name</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>categories</string> </key>
-            <value>
-              <tuple>
-                <string>action_type/workflow</string>
-                <string>before_script/portal_workflow/upgrade_slap_interface_workflow/script_UpgradeDecision_checkConsistency</string>
-                <string>after_script/portal_workflow/upgrade_slap_interface_workflow/script_UpgradeDecision_approveRegistration</string>
-              </tuple>
-            </value>
-        </item>
-        <item>
-            <key> <string>description</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>guard_permission</string> </key>
-            <value>
-              <tuple/>
-            </value>
-        </item>
-        <item>
-            <key> <string>icon</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>id</string> </key>
-            <value> <string>transition_approve_registration</string> </value>
-        </item>
-        <item>
-            <key> <string>portal_type</string> </key>
-            <value> <string>Workflow Transition</string> </value>
-        </item>
-        <item>
-            <key> <string>title</string> </key>
-            <value> <string>Approve Registration</string> </value>
-        </item>
-        <item>
-            <key> <string>trigger_type</string> </key>
-            <value> <int>2</int> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-</ZopeData>