"storage/maria/ma_ftdefs.h" did not exist on "17ef8ef4443598265bca23d86d04fcc275da7804"
Commit b75d93f2 authored by Łukasz Nowak's avatar Łukasz Nowak

Revert "Follow state name change."

This reverts commit ee2553c6.

Conflicts:

	master/bt5/vifib_slap/bt/revision
parent 87dd9ed4
...@@ -147,7 +147,7 @@ if (request_software_instance is None):\n ...@@ -147,7 +147,7 @@ if (request_software_instance is None):\n
portal_type="Open Sale Order",\n portal_type="Open Sale Order",\n
validation_state="validated")\n validation_state="validated")\n
if open_order is None:\n if open_order is None:\n
person_slap_interface_state = person.getPaymentState()\n person_slap_interface_state = person.getSlapState()\n
if person_slap_interface_state == \'open_order_created\':\n if person_slap_interface_state == \'open_order_created\':\n
open_order_url = context.portal_workflow.getInfoFor(\n open_order_url = context.portal_workflow.getInfoFor(\n
ob=person, name=\'open_order_url\',\n ob=person, name=\'open_order_url\',\n
......
...@@ -57,7 +57,7 @@ open_order = portal.portal_catalog.getResultValue(\n ...@@ -57,7 +57,7 @@ open_order = portal.portal_catalog.getResultValue(\n
portal_type="Open Sale Order",\t \t \n portal_type="Open Sale Order",\t \t \n
validation_state="validated")\n validation_state="validated")\n
if open_order is None:\n if open_order is None:\n
person_slap_interface_state = person.getPaymentState()\n person_slap_interface_state = person.getSlapState()\n
if person_slap_interface_state != \'open_order_created\':\n if person_slap_interface_state != \'open_order_created\':\n
open_order = portal.open_sale_order_module.newContent(\n open_order = portal.open_sale_order_module.newContent(\n
destination_section=person.getRelativeUrl(),\n destination_section=person.getRelativeUrl(),\n
......
...@@ -59,9 +59,9 @@ sale_packing_list_line = sale_packing_list_line_list[0]\n ...@@ -59,9 +59,9 @@ sale_packing_list_line = sale_packing_list_line_list[0]\n
resource = sale_packing_list_line.getResource()\n resource = sale_packing_list_line.getResource()\n
if resource == preference_tool.getPreferredInstanceSetupResource():\n if resource == preference_tool.getPreferredInstanceSetupResource():\n
software_instance = sale_packing_list_line.getAggregateValue(portal_type=[\'Software Instance\', \'Slave Instance\'])\n software_instance = sale_packing_list_line.getAggregateValue(portal_type=[\'Software Instance\', \'Slave Instance\'])\n
if software_instance.getPaymentState() == \'start_requested\':\n if software_instance.getSlapState() == \'start_requested\':\n
software_instance.requestStartComputerPartition()\n software_instance.requestStartComputerPartition()\n
elif software_instance.getPaymentState() == \'stop_requested\':\n elif software_instance.getSlapState() == \'stop_requested\':\n
software_instance.requestStopComputerPartition()\n software_instance.requestStopComputerPartition()\n
</string> </value> </string> </value>
</item> </item>
......
515 516
\ No newline at end of file \ No newline at end of file
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment