Drop yet another part of spaghetti.

While *trying* to confirm order *try* to assign partition.

master/bt5/vifib_open_trade/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml

@@ -7,10 +7,6 @@
   <type>Purchase Packing List</type>
   <workflow>vifib_open_order_interaction_workflow</workflow>
  </chain>
- <chain>
-  <type>Sale Order</type>
-  <workflow>vifib_open_order_interaction_workflow</workflow>
- </chain>
  <chain>
   <type>Subscription Item Root Simulation Rule</type>
   <workflow>edit_workflow, rule_validation_workflow</workflow>

master/bt5/vifib_open_trade/WorkflowTemplateItem/portal_workflow/vifib_open_order_interaction_workflow/interactions/assign_computer_partition.xml

-<?xml version="1.0"?>
-<ZopeData>
-  <record id="1" aka="AAAAAAAAAAE=">
-    <pickle>
-      <global name="InteractionDefinition" module="Products.ERP5.Interaction"/>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>actbox_category</string> </key>
-            <value> <string>workflow</string> </value>
-        </item>
-        <item>
-            <key> <string>actbox_name</string> </key>
-            <value> <string></string> </value>
-        </item>
-        <item>
-            <key> <string>actbox_url</string> </key>
-            <value> <string></string> </value>
-        </item>
-        <item>
-            <key> <string>activate_script_name</string> </key>
-            <value>
-              <tuple/>
-            </value>
-        </item>
-        <item>
-            <key> <string>after_script_name</string> </key>
-            <value>
-              <tuple/>
-            </value>
-        </item>
-        <item>
-            <key> <string>before_commit_script_name</string> </key>
-            <value>
-              <tuple/>
-            </value>
-        </item>
-        <item>
-            <key> <string>description</string> </key>
-            <value> <string></string> </value>
-        </item>
-        <item>
-            <key> <string>guard</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>id</string> </key>
-            <value> <string>assign_computer_partition</string> </value>
-        </item>
-        <item>
-            <key> <string>method_id</string> </key>
-            <value>
-              <list>
-                <string>confirm</string>
-              </list>
-            </value>
-        </item>
-        <item>
-            <key> <string>once_per_transaction</string> </key>
-            <value> <int>1</int> </value>
-        </item>
-        <item>
-            <key> <string>portal_type_filter</string> </key>
-            <value>
-              <list>
-                <string>Sale Order</string>
-              </list>
-            </value>
-        </item>
-        <item>
-            <key> <string>script_name</string> </key>
-            <value>
-              <list>
-                <string>Delivery_assignComputerPartition</string>
-              </list>
-            </value>
-        </item>
-        <item>
-            <key> <string>temporary_document_disallowed</string> </key>
-            <value> <int>1</int> </value>
-        </item>
-        <item>
-            <key> <string>title</string> </key>
-            <value> <string></string> </value>
-        </item>
-        <item>
-            <key> <string>trigger_type</string> </key>
-            <value> <int>2</int> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-</ZopeData>

master/bt5/vifib_open_trade/WorkflowTemplateItem/portal_workflow/vifib_open_order_interaction_workflow/scripts/Delivery_assignComputerPartition.xml

-<?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>_body</string> </key>
-            <value> <string>from zExceptions import Unauthorized\n
-portal = context.getPortalObject()\n
-\n
-order = state_change[\'object\']\n
-\n
-setup_service_relative_url = order.portal_preferences.getPreferredInstanceSetupResource()\n
-isTransitionPossible = portal.portal_workflow.isTransitionPossible\n
-\n
-instance_portal_type_list = ["Software Instance","Slave Instance"]\n
-for order_line in order.getMovementList():\n
-  if order_line.getResource() == setup_service_relative_url:\n
-    computer_partition = order_line.getAggregateValue(portal_type="Computer Partition")\n
-    if computer_partition is None:\n
-      if not order.Delivery_isDestinationSectionAllowedToRequest():\n
-        raise Unauthorized(\'Request disallowed\')\n
-      software_release = order_line.getAggregateValue(portal_type="Software Release")\n
-      software_instance = order_line.getAggregateValue(portal_type=instance_portal_type_list)\n
-\n
-      hosting_subscription = order_line.getAggregateValue(portal_type="Hosting Subscription")\n
-      open_order_line = portal.portal_catalog.getResultValue(\n
-        portal_type="Open Sale Order Line",\n
-        validation_state="validated",\n
-        aggregate_relative_url=hosting_subscription.getRelativeUrl(),\n
-        destination_section_relative_url=order.getDestinationSection())\n
-      if open_order_line is not None:\n
-        open_order = open_order_line.getParentValue()\n
-        computer_partition_relative_url = open_order.OpenSaleOrder_restrictMethodAsShadowUser(\n
-          open_order=open_order,\n
-          callable_object=open_order.OpenSaleOrder_findPartition,\n
-          argument_list=[software_release.getUrlString(), software_instance.getSourceReference(),\n
-          software_instance.getPortalType(), software_instance.getSlaXmlAsDict()])\n
-        order_line.edit(\n
-          aggregate_list=order_line.getAggregateList()+[computer_partition_relative_url])\n
-</string> </value>
-        </item>
-        <item>
-            <key> <string>_params</string> </key>
-            <value> <string>state_change, **kw</string> </value>
-        </item>
-        <item>
-            <key> <string>id</string> </key>
-            <value> <string>Delivery_assignComputerPartition</string> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-</ZopeData>

master/bt5/vifib_open_trade/bt/revision

-169
\ No newline at end of file
+170
\ No newline at end of file

master/bt5/vifib_open_trade/bt/template_portal_type_workflow_chain_list

 Hosting Subscription | edit_workflow
 Hosting Subscription | hosting_subscription_workflow
 Purchase Packing List | vifib_open_order_interaction_workflow
-Sale Order | vifib_open_order_interaction_workflow
 Subscription Item Root Simulation Rule | edit_workflow
 Subscription Item Root Simulation Rule | rule_validation_workflow
\ No newline at end of file

master/bt5/vifib_slap/SkinTemplateItem/portal_skins/vifib_slap/SaleOrderLine_tryToAllocatePartition.xml

@@ -53,22 +53,56 @@
             <value> <string>from Products.DCWorkflow.DCWorkflow import ValidationFailed\n
 from zExceptions import Unauthorized\n
 \n
+def assignComputerPartition(order):\n
+  portal = context.getPortalObject()\n
+\n
+  setup_service_relative_url = order.portal_preferences.getPreferredInstanceSetupResource()\n
+  isTransitionPossible = portal.portal_workflow.isTransitionPossible\n
+\n
+  instance_portal_type_list = ["Software Instance","Slave Instance"]\n
+  for order_line in order.getMovementList():\n
+    if order_line.getResource() == setup_service_relative_url:\n
+      computer_partition = order_line.getAggregateValue(portal_type="Computer Partition")\n
+      if computer_partition is None:\n
+        if not order.Delivery_isDestinationSectionAllowedToRequest():\n
+          raise Unauthorized(\'Request disallowed\')\n
+        software_release = order_line.getAggregateValue(portal_type="Software Release")\n
+        software_instance = order_line.getAggregateValue(portal_type=instance_portal_type_list)\n
+\n
+        hosting_subscription = order_line.getAggregateValue(portal_type="Hosting Subscription")\n
+        open_order_line = portal.portal_catalog.getResultValue(\n
+          portal_type="Open Sale Order Line",\n
+          validation_state="validated",\n
+          aggregate_relative_url=hosting_subscription.getRelativeUrl(),\n
+          destination_section_relative_url=order.getDestinationSection())\n
+        if open_order_line is not None:\n
+          open_order = open_order_line.getParentValue()\n
+          computer_partition_relative_url = open_order.OpenSaleOrder_restrictMethodAsShadowUser(\n
+            open_order=open_order,\n
+            callable_object=open_order.OpenSaleOrder_findPartition,\n
+            argument_list=[software_release.getUrlString(), software_instance.getSourceReference(),\n
+            software_instance.getPortalType(), software_instance.getSlaXmlAsDict()])\n
+          order_line.edit(\n
+            aggregate_list=order_line.getAggregateList()+[computer_partition_relative_url])\n
+\n
 sale_order = context.getParentValue()\n
 if sale_order.getSimulationState() == \'ordered\':\n
   try:\n
-    sale_order.Base_checkConsistency()\n
-  except ValidationFailed:\n
-    # order not ready yet\n
+    assignComputerPartition(sale_order)\n
+  except ValueError:\n
+    # It was not possible to find free Computer Partition\n
+    pass\n
+  except Unauthorized:\n
+    # user has bad balance\n
     pass\n
   else:\n
     try:\n
-      sale_order.confirm()\n
-    except ValueError:\n
-      # It was not possible to find free Computer Partition\n
-      pass\n
-    except Unauthorized:\n
-      # user has bad balance\n
+      sale_order.Base_checkConsistency()\n
+    except ValidationFailed:\n
+      # order not ready yet\n
       pass\n
+    else:\n
+      sale_order.confirm()\n
 </string> </value>
         </item>
         <item>

master/bt5/vifib_slap/bt/revision

-624
\ No newline at end of file
+625
\ No newline at end of file