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
Labels
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Jobs
Commits
Open sidebar
Rafael Monnerat
slapos.core
Commits
c771e9d9
Commit
c771e9d9
authored
Nov 07, 2012
by
Romain Courteaud
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix instance_guid usage.
No need to access the host software instance to correctly filter.
parent
ab18d96d
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
18 deletions
+2
-18
master/bt5/slapos_cloud/SkinTemplateItem/portal_skins/slapos_cloud/Person_findPartition.xml
...teItem/portal_skins/slapos_cloud/Person_findPartition.xml
+1
-17
master/bt5/slapos_cloud/bt/revision
master/bt5/slapos_cloud/bt/revision
+1
-1
No files found.
master/bt5/slapos_cloud/SkinTemplateItem/portal_skins/slapos_cloud/Person_findPartition.xml
View file @
c771e9d9
...
...
@@ -81,23 +81,7 @@ if "instance_guid" in filter_kw:\n
explicit_location = True\n
portal = context.getPortalObject()\n
instance_guid = filter_kw.pop("instance_guid")\n
instance = portal.portal_catalog.getResultValue(portal_type="Software Instance", reference=instance_guid)\n
if instance is None:\n
# XXX Other user do not have access to the instance document...\n
if instance_guid == "SOFTINST-9238":\n
# XXX Let\'s be nice with Cedric and Vincent\n
query_kw["uid"] = "2225067"\n
elif instance_guid == "SOFTINST-11031":\n
# XXX Let\'s be nice with KVM frontend\n
query_kw["uid"] = "2874296"\n
else:\n
query_kw["uid"] = "-1"\n
else:\n
partition_uid = instance.getAggregateUid(portal_type="Computer Partition")\n
if partition_uid:\n
query_kw["uid"] = partition_uid\n
else:\n
query_kw["uid"] = "-1"\n
query_kw["aggregate_related_reference"] = instance_guid\n
\n
if \'network_guid\' in filter_kw:\n
network_guid = filter_kw.pop(\'network_guid\')\n
...
...
master/bt5/slapos_cloud/bt/revision
View file @
c771e9d9
226
\ No newline at end of file
227
\ 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