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
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Xiaowu Zhang
slapos.core
Commits
28102c31
Commit
28102c31
authored
Dec 01, 2011
by
Antoine Catton
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Buxfix on root re-request.
parent
6094126a
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
11 additions
and
4 deletions
+11
-4
master/bt5/vifib_slap/SkinTemplateItem/portal_skins/vifib_slap/HostingSubscription_requestRootSoftwareInstance.xml
..._slap/HostingSubscription_requestRootSoftwareInstance.xml
+8
-1
master/bt5/vifib_slap/WorkflowTemplateItem/portal_workflow/person_slap_interface_workflow/scripts/Person_requestSoftwareInstance.xml
...rface_workflow/scripts/Person_requestSoftwareInstance.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 @
28102c31
...
@@ -103,6 +103,13 @@ if request_software_instance is None:\n
...
@@ -103,6 +103,13 @@ if request_software_instance is None:\n
context.setPredecessorValueList(\n
context.setPredecessorValueList(\n
context.getPredecessorValueList() + [request_software_instance]\n
context.getPredecessorValueList() + [request_software_instance]\n
)\n
)\n
\n
if not person_request:\n
request_software_instance.requestComputerPartition(\n
software_release=context.getRootSoftwareUrl(),\n
hosting_subscription_uid=context.getUid(),\n
software_type=context.getSourceReference(),\n
tag=tag)\n
\n
\n
if context.getRootState() == \'started\':\n
if context.getRootState() == \'started\':\n
request_software_instance.startRequested()\n
request_software_instance.startRequested()\n
...
@@ -129,7 +136,7 @@ return request_software_instance\n
...
@@ -129,7 +136,7 @@ return request_software_instance\n
</item>
</item>
<item>
<item>
<key>
<string>
_params
</string>
</key>
<key>
<string>
_params
</string>
</key>
<value>
<string>
tag
</string>
</value>
<value>
<string>
tag
, person_request=False
</string>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
id
</string>
</key>
<key>
<string>
id
</string>
</key>
...
...
master/bt5/vifib_slap/WorkflowTemplateItem/portal_workflow/person_slap_interface_workflow/scripts/Person_requestSoftwareInstance.xml
View file @
28102c31
...
@@ -119,10 +119,10 @@ if request_hosting_subscription is None:\n
...
@@ -119,10 +119,10 @@ if request_hosting_subscription is None:\n
text_content=instance_xml,\n
text_content=instance_xml,\n
sla_xml=sla_xml,\n
sla_xml=sla_xml,\n
root_state=state,\n
root_state=state,\n
software_release_url=software_release_url_string,\n
root_
software_release_url=software_release_url_string,\n
root_slave=is_slave,\n
root_slave=is_slave,\n
)\n
)\n
software_instance = subscription.HostingSubscription_requestRootSoftwareInstance(tag)\n
software_instance = subscription.HostingSubscription_requestRootSoftwareInstance(tag
, person_request=True
)\n
\n
\n
software_release_document = context.portal_catalog.getResultValue(\n
software_release_document = context.portal_catalog.getResultValue(\n
portal_type=\'Software Release\',\n
portal_type=\'Software Release\',\n
...
...
master/bt5/vifib_slap/bt/revision
View file @
28102c31
452
453
\ 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