Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
slapos.core
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
slapos.core
Commits
b75d93f2
Commit
b75d93f2
authored
Jan 31, 2012
by
Łukasz Nowak
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Revert "Follow state name change."
This reverts commit
ee2553c6
. Conflicts: master/bt5/vifib_slap/bt/revision
parent
87dd9ed4
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
5 additions
and
5 deletions
+5
-5
master/bt5/vifib_slap/SkinTemplateItem/portal_skins/vifib_slap/HostingSubscription_requestRootSoftwareInstance.xml
..._slap/HostingSubscription_requestRootSoftwareInstance.xml
+1
-1
master/bt5/vifib_slap/WorkflowTemplateItem/portal_workflow/slap_interaction_workflow/scripts/Assignment_createPersonOpenSaleOrder.xml
...workflow/scripts/Assignment_createPersonOpenSaleOrder.xml
+1
-1
master/bt5/vifib_slap/WorkflowTemplateItem/portal_workflow/slap_interaction_workflow/scripts/SalePackingList_requestStoredSoftwareInstanceState.xml
...ts/SalePackingList_requestStoredSoftwareInstanceState.xml
+2
-2
master/bt5/vifib_slap/bt/revision
master/bt5/vifib_slap/bt/revision
+1
-1
No files found.
master/bt5/vifib_slap/SkinTemplateItem/portal_skins/vifib_slap/HostingSubscription_requestRootSoftwareInstance.xml
View file @
b75d93f2
...
@@ -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.get
Payment
State()\n
person_slap_interface_state = person.get
Slap
State()\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
...
...
master/bt5/vifib_slap/WorkflowTemplateItem/portal_workflow/slap_interaction_workflow/scripts/Assignment_createPersonOpenSaleOrder.xml
View file @
b75d93f2
...
@@ -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.get
Payment
State()\n
person_slap_interface_state = person.get
Slap
State()\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
...
...
master/bt5/vifib_slap/WorkflowTemplateItem/portal_workflow/slap_interaction_workflow/scripts/SalePackingList_requestStoredSoftwareInstanceState.xml
View file @
b75d93f2
...
@@ -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.get
Payment
State() == \'start_requested\':\n
if software_instance.get
Slap
State() == \'start_requested\':\n
software_instance.requestStartComputerPartition()\n
software_instance.requestStartComputerPartition()\n
elif software_instance.get
Payment
State() == \'stop_requested\':\n
elif software_instance.get
Slap
State() == \'stop_requested\':\n
software_instance.requestStopComputerPartition()\n
software_instance.requestStopComputerPartition()\n
</string>
</value>
</string>
</value>
</item>
</item>
...
...
master/bt5/vifib_slap/bt/revision
View file @
b75d93f2
515
516
\ No newline at end of file
\ No newline at end of file
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment