[Erp5-report] r43764 luke - in /erp5/trunk/bt5/vifib_base: WorkflowTemplateItem/portal_work...

[nobody at svn.erp5.org]

Author: luke
Date: Fri Feb 25 16:13:08 2011
New Revision: 43764

URL: http://svn.erp5.org?rev=43764&view=rev
Log:
- store and search for software type on source_reference, which is correct property instead of title
- leave differentiation on title

Modified:
    erp5/trunk/bt5/vifib_base/WorkflowTemplateItem/portal_workflow/software_instance_slap_interface_workflow/scripts/SoftwareInstance_requestSoftwareInstance.xml
    erp5/trunk/bt5/vifib_base/bt/revision

Modified: erp5/trunk/bt5/vifib_base/WorkflowTemplateItem/portal_workflow/software_instance_slap_interface_workflow/scripts/SoftwareInstance_requestSoftwareInstance.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/vifib_base/WorkflowTemplateItem/portal_workflow/software_instance_slap_interface_workflow/scripts/SoftwareInstance_requestSoftwareInstance.xml?rev=43764&r1=43763&r2=43764&view=diff
==============================================================================
--- erp5/trunk/bt5/vifib_base/WorkflowTemplateItem/portal_workflow/software_instance_slap_interface_workflow/scripts/SoftwareInstance_requestSoftwareInstance.xml [utf8] (original)
+++ erp5/trunk/bt5/vifib_base/WorkflowTemplateItem/portal_workflow/software_instance_slap_interface_workflow/scripts/SoftwareInstance_requestSoftwareInstance.xml [utf8] Fri Feb 25 16:13:08 2011
@@ -57,7 +57,6 @@ portal = software_instance.getPortalObje
 # Get required arguments\n
 kwargs = state_change.kwargs\n
 software_release_url_string = state_change.kwargs[\'software_release\']\n
-requested_partition_title = kwargs["software_type"]\n
 requested_partition_reference = kwargs["partition_reference"]\n
 shared = kwargs["shared"]\n
 software_type = kwargs["software_type"]\n
@@ -69,16 +68,16 @@ predecessor_software_instance = software
 while (predecessor_software_instance is not None):\n
   root_software_instance = predecessor_software_instance\n
   predecessor_software_instance = predecessor_software_instance.getPredecessorRelatedValue(\n
-    portal_type="Software Instance")\n
+      portal_type="Software Instance")\n
 \n
-tag = "%s_%s_%s_inProgress" % (root_software_instance.getUid(), requested_partition_title, \n
+tag = "%s_%s_%s_inProgress" % (root_software_instance.getUid(), software_type,\n
                                requested_partition_reference)\n
 \n
 # Check if it already exists\n
 request_software_instance = software_instance.portal_catalog.getResultValue(\n
   portal_type=\'Software Instance\',\n
-  title=requested_partition_title,\n
-  source_reference=requested_partition_reference,\n
+  title=requested_partition_reference,\n
+  source_reference=software_type,\n
   root_uid=root_software_instance.getUid(),\n
 )\n
 \n
@@ -93,8 +92,8 @@ if (request_software_instance is None):\
     module = software_instance.getDefaultModule(portal_type="Software Instance")\n
     request_software_instance = module.newContent(\n
       portal_type="Software Instance",\n
-      title=requested_partition_title,\n
-      source_reference=requested_partition_reference,\n
+      title=requested_partition_reference,\n
+      source_reference=software_type,\n
       text_content=instance_xml,\n
       activate_kw={\'tag\': tag},\n
       **portal.Base_getNewSoftwareInstanceCoordinate()\n
@@ -182,7 +181,6 @@ software_instance.edit(\n
                             <string>portal</string>
                             <string>kwargs</string>
                             <string>software_release_url_string</string>
-                            <string>requested_partition_title</string>
                             <string>requested_partition_reference</string>
                             <string>shared</string>
                             <string>software_type</string>

Modified: erp5/trunk/bt5/vifib_base/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/vifib_base/bt/revision?rev=43764&r1=43763&r2=43764&view=diff
==============================================================================
--- erp5/trunk/bt5/vifib_base/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/vifib_base/bt/revision [utf8] Fri Feb 25 16:13:08 2011
@@ -1 +1 @@
-205
\ No newline at end of file
+207
\ No newline at end of file