From a828e2de59091ff764763af504de5408bdc725c7 Mon Sep 17 00:00:00 2001 From: Antoine Catton <acatton@tiolive.com> Date: Wed, 28 Dec 2011 16:07:53 +0100 Subject: [PATCH] Adapt HostingSubscription_requestRootSoftwareInstance to slave_instance_cleanup merge. --- ...bscription_requestRootSoftwareInstance.xml | 35 ++++++++++++++++--- master/bt5/vifib_slap/bt/revision | 2 +- 2 files changed, 31 insertions(+), 6 deletions(-) diff --git a/master/bt5/vifib_slap/SkinTemplateItem/portal_skins/vifib_slap/HostingSubscription_requestRootSoftwareInstance.xml b/master/bt5/vifib_slap/SkinTemplateItem/portal_skins/vifib_slap/HostingSubscription_requestRootSoftwareInstance.xml index 4f54d9bcf..5e2e11b32 100644 --- a/master/bt5/vifib_slap/SkinTemplateItem/portal_skins/vifib_slap/HostingSubscription_requestRootSoftwareInstance.xml +++ b/master/bt5/vifib_slap/SkinTemplateItem/portal_skins/vifib_slap/HostingSubscription_requestRootSoftwareInstance.xml @@ -98,11 +98,36 @@ if request_software_instance is None:\n )\n \n if not person_request:\n - request_software_instance.requestSoftwareInstance(\n - software_release=context.getRootSoftwareReleaseUrl(),\n - hosting_subscription_uid=context.getUid(),\n - software_type=context.getSourceReference(),\n - tag=tag)\n + packing_list_line = software_instance.getAggregateRelatedValue(portal_type="Sale Packing List Line")\n + software_release_document = context.portal_catalog.getResultValue(\n + portal_type=\'Software Release\',\n + url_string=context.getRootSoftwareRelease())\n + base_sale_packing_list = packing_list_line.getParentValue()\n + trade_condition = packing_list_line.getSpecialise(portal_type="Sale Trade Condition")\n + sale_order = portal.getDefaultModule(portal_type="Sale Order").newContent(\n + portal_type="Sale Order",\n + destination=base_sale_packing_list.getDestination(),\n + destination_section=base_sale_packing_list.getDestinationSection(),\n + destination_decision=base_sale_packing_list.getDestinationDecision(),\n + start_date=DateTime(),\n + received_date=DateTime(),\n + # XXX Hardcoded values\n + source="organisation_module/vifib_internet",\n + source_section="organisation_module/vifib_internet",\n + price_currency="currency_module/EUR",\n + activate_kw={\'tag\': tag},\n + )\n +\n + setup_service_relative_url = portal.portal_preferences.getPreferredInstanceSetupResource()\n + sale_order.setSpecialise(trade_condition, portal_type="Sale Trade Condition")\n + sale_order_line = sale_order.newContent(\n + portal_type="Sale Order Line",\n + resource=setup_service_relative_url,\n + quantity=1,\n + aggregate_value_list=[request_software_instance,context,software_release_document],\n + activate_kw={\'tag\': tag},\n + )\n + sale_order.order()\n \n if context.getRootState() == \'started\':\n request_software_instance.startRequested()\n diff --git a/master/bt5/vifib_slap/bt/revision b/master/bt5/vifib_slap/bt/revision index 5c84cf6fd..4f09af713 100644 --- a/master/bt5/vifib_slap/bt/revision +++ b/master/bt5/vifib_slap/bt/revision @@ -1 +1 @@ -491 \ No newline at end of file +492 \ No newline at end of file -- 2.30.9