x/tuskar-ui
Code Issues Proposed changes

Merge "Ensure existing image properties are not deleted"

Browse Source
This commit is contained in:
Jenkins 2012-06-22 23:07:11 +00:00 committed by Gerrit Code Review
commit cc3f3ff77a
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
horizon/api/glance.py
View File

@ -93,7 +93,7 @@ def snapshot_list_detailed(request, marker=None, extra_filters=None):
images = glanceclient(request).images.list(limit=limit + 1,
marker=marker,
filters=filters)
if(len(images) > limit):
if len(images) > limit:
return (images[0:-1], True)
else:
return (images, False)

3
horizon/dashboards/nova/images_and_snapshots/images/forms.py
View File

@ -142,6 +142,9 @@ class UpdateImageForm(forms.SelfHandlingForm):
meta['properties']['architecture'] = data['architecture']
try:
# Ensure we do not delete properties that have already been
# set on an image.
meta['features'] = {'X-Glance-Registry-Purge-Props': False}
api.image_update(request, image_id, **meta)
messages.success(request, _('Image was successfully updated.'))
except: