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
Thomas Gambier
slapos.core
Commits
45d96643
Commit
45d96643
authored
12 years ago
by
Łukasz Nowak
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Re-enable slave_instance_list code.
Narrow to only return Slave Instance related delivery lines.
parent
98df019f
master
fix_request_parameters
relicense
supervisor_open_files
translate_console_site
wechat
1.4.23
1.4.22
1.4.21
1.4.20
1.4.19
1.4.17
1.4.16
1.4.15
1.4.14
1.4.12
1.4.11
1.4.10
1.4.9
1.4.8
1.4.7
1.4.6
1.4.5
1.4.4
1.4.3
1.4.2
1.4.1
1.4.0
1.3.18
1.3.17
1.3.16
1.3.15
1.3.14
1.3.13
1.3.12
1.3.11
1.3.10
1.3.9
1.3.8
1.3.7
1.3.6.3
1.3.6.2
1.3.6.1
1.3.6
1.3.5
1.3.4
1.3.3
1.3.2
1.3.1
1.3.0
1.2.4.1
1.2.4
1.2.3.1
1.2.3
1.2.2
1.2.1
1.2.0
1.1.3
1.1.2
1.1.1
1.1.0
1.0.5
1.0.4
1.0.3
1.0.2
1.0.1
1.0.0
1.0.0rc6
1.0.0rc5
1.0.0rc4
1.0.0rc3
1.0.0-rc1
0.35.1
0.34
0.33.1
0.33
0.32.3
0.32.2
0.32
0.31.2
0.31.1
0.31
0.30
0.29
0.28.9
0.28.8
0.28.7
0.28.6
0.28.5
0.28.4
0.28.3
0.28.2
0.28.1
0.28
0.27
0.26.2
0.26.1
0.26
0.25
0.24
master-20180917
jquerymobile.noanimation
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
22 additions
and
22 deletions
+22
-22
master/bt5/vifib_slap/SkinTemplateItem/portal_skins/vifib_slap/SalePackinListLine_asSoftwareInstnaceComputerPartitionMergedDict.xml
...istLine_asSoftwareInstnaceComputerPartitionMergedDict.xml
+21
-21
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/SalePackinListLine_asSoftwareInstnaceComputerPartitionMergedDict.xml
View file @
45d96643
...
@@ -50,7 +50,8 @@
...
@@ -50,7 +50,8 @@
</item>
</item>
<item>
<item>
<key>
<string>
_body
</string>
</key>
<key>
<string>
_body
</string>
</key>
<value>
<string>
sale_packing_list_line = context\n
<value>
<string>
from Products.ZSQLCatalog.SQLCatalog import Query, NegatedQuery, ComplexQuery\n
sale_packing_list_line = context\n
instance_type_list = [\'Software Instance\', \'Slave Instance\']\n
instance_type_list = [\'Software Instance\', \'Slave Instance\']\n
\n
\n
hosting_service = context.restrictedTraverse(\n
hosting_service = context.restrictedTraverse(\n
...
@@ -75,26 +76,25 @@ if computer_partition.getPortalType() == \'Computer Partition\':\n
...
@@ -75,26 +76,25 @@ if computer_partition.getPortalType() == \'Computer Partition\':\n
if software_instance is not None and computer_partition is not None and software_release is not None:\n
if software_instance is not None and computer_partition is not None and software_release is not None:\n
slave_instance_list = []\n
slave_instance_list = []\n
\n
\n
# sale_packing_list_line_list = computer_partition.portal_catalog(\n
sale_packing_list_line_list = computer_partition.portal_catalog(\n
# aggregate_uid=computer_partition.getUid(),\n
aggregate_uid=computer_partition.getUid(),\n
# portal_type="Sale Packing List Line",\n
aggregate_portal_type=\'Slave Instance\',\n
# simulation_state=state_list,\n
portal_type="Sale Packing List Line",\n
# default_resource_uid=service_uid_list)\n
simulation_state=state_list,\n
# for sale_packing_list_line in sale_packing_list_line_list:\n
default_resource_uid=service_uid_list)\n
# instance = sale_packing_list_line.getAggregateValue(portal_type=instance_type_list)\n
\n
# if instance is None:\n
for sale_packing_list_line in sale_packing_list_line_list:\n
# raise NotImplementedError, "Unexpected Sale Packing List without Instance aggregated %s" % sale_packing_list_line.getRelativeUrl()\n
instance = sale_packing_list_line.getAggregateValue(portal_type=\'Slave Instance\')\n
# elif instance.getPortalType() == "Slave Instance":\n
if instance.getUid() == software_instance.getUid():\n
# slave_instance = dict(slave_title=instance.getTitle(),\n
# ignore self\n
# slap_software_type=instance.getSourceReference(),\n
continue\n
# slave_reference=instance.getReference(),\n
slave_instance = dict(slave_title=instance.getTitle(),\n
# xml=instance.getTextContent(),\n
slap_software_type=instance.getSourceReference(),\n
# connection_xml=instance.getConnectionXml(),\n
slave_reference=instance.getReference(),\n
# )\n
xml=instance.getTextContent(),\n
# if slave_instance not in slave_instance_list:\n
connection_xml=instance.getConnectionXml(),\n
# slave_instance_list.append(slave_instance)\n
)\n
# elif instance.getPortalType() == "Software Instance":\n
slave_instance_list.append(slave_instance)\n
# software_instance = instance\n
return {\n
return {\n
\'xml\':software_instance.getTextContent(),\n
\'xml\':software_instance.getTextContent(),\n
\'connection_xml\':software_instance.getConnectionXml(),\n
\'connection_xml\':software_instance.getConnectionXml(),\n
...
...
This diff is collapsed.
Click to expand it.
master/bt5/vifib_slap/bt/revision
View file @
45d96643
660
661
\ No newline at end of file
\ No newline at end of file
This diff is collapsed.
Click to expand it.
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