From 6dc4fa27bb10ceed5b31ff5e80f9045ff51ac255 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Nowak?= <luke@nexedi.com> Date: Fri, 25 Feb 2011 15:00:30 +0000 Subject: [PATCH] Fix 43751: * software_instance set to RootSoftwareInstance reserves highest level Software Instance * user provides title by requested_partition_reference parameter which differentiates instances git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@43758 20353a03-c40f-0410-a6d1-a30d3c3de9de --- .../scripts/Person_requestSoftwareInstance.xml | 4 ++-- bt5/vifib_slap/bt/revision | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/bt5/vifib_slap/WorkflowTemplateItem/portal_workflow/person_slap_interface_workflow/scripts/Person_requestSoftwareInstance.xml b/bt5/vifib_slap/WorkflowTemplateItem/portal_workflow/person_slap_interface_workflow/scripts/Person_requestSoftwareInstance.xml index 8e3345f15f..f47b2783c2 100644 --- a/bt5/vifib_slap/WorkflowTemplateItem/portal_workflow/person_slap_interface_workflow/scripts/Person_requestSoftwareInstance.xml +++ b/bt5/vifib_slap/WorkflowTemplateItem/portal_workflow/person_slap_interface_workflow/scripts/Person_requestSoftwareInstance.xml @@ -58,7 +58,7 @@ portal = person.getPortalObject()\n kwargs = state_change.kwargs\n software_release_url_string = state_change.kwargs[\'software_release\']\n requested_partition_reference = kwargs["partition_reference"]\n -software_type = kwargs["software_type"]\n +software_type = "RootSoftwareInstance"\n instance_xml = kwargs["instance_xml"]\n \n sale_order_portal_type = "Sale Order"\n @@ -77,7 +77,7 @@ tag = "%s_%s_%s_inProgress" % (person.getUid(), software_type, \n request_software_instance = portal.portal_catalog.getResultValue(\n portal_type=software_instance_portal_type,\n source_reference=software_type,\n - reference=requested_partition_reference,\n + title=requested_partition_reference,\n )\n if (request_software_instance is None):\n if (portal.portal_activities.countMessageWithTag(tag) > 0):\n diff --git a/bt5/vifib_slap/bt/revision b/bt5/vifib_slap/bt/revision index 91a3d4243d..136c8cacf3 100644 --- a/bt5/vifib_slap/bt/revision +++ b/bt5/vifib_slap/bt/revision @@ -1 +1 @@ -340 \ No newline at end of file +342 \ No newline at end of file -- 2.30.9