x/tuskar-ui
Code Issues Proposed changes

fixed other nits

Browse Source
This commit is contained in:
Jake Dahn 2011-09-30 15:20:26 -07:00
parent cac45eb883
commit 6572902c5a
1 changed files with 17 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
django-openstack/django_openstack/dash/views/images.py
View File

@ -29,6 +29,7 @@ from django.contrib import messages
from django.contrib.auth.decorators import login_required from django.contrib.auth.decorators import login_required
from django.shortcuts import redirect, render_to_response from django.shortcuts import redirect, render_to_response
from django.utils.text import normalize_newlines from django.utils.text import normalize_newlines
from django.utils.translation import ugettext as _
from django_openstack import api from django_openstack import api
from django_openstack import forms from django_openstack import forms
@ -55,17 +56,17 @@ class UpdateImageForm(forms.SelfHandlingForm):
def handle(self, request, data): def handle(self, request, data):
image_id = data['image_id'] image_id = data['image_id']
tenant_id = request.user.tenant_id tenant_id = request.user.tenant_id
error_retrieving = _('Unable to retreive image info from glance: %s' % image_id)
error_updating = _('Error updating image with id: %s' % image_id)
try: try:
image = api.image_get(request, image_id) image = api.image_get(request, image_id)
except glance_exception.ClientConnectionError, e: except glance_exception.ClientConnectionError, e:
LOG.exception("Error connecting to glance") LOG.exception(_('Error connecting to glance'))
messages.error(request, "Error connecting to glance: %s" messages.error(request, error_retrieving)
% e.message)
except glance_exception.Error, e: except glance_exception.Error, e:
LOG.exception('Error retrieving image with id "%s"', image_id) LOG.exception(error_retrieving)
messages.error(request, "Error retrieving image %s: %s" messages.error(request, error_retrieving)
% (image_id, e.message))
if image.owner == request.user.username: if image.owner == request.user.username:
try: try:
@ -87,23 +88,21 @@ class UpdateImageForm(forms.SelfHandlingForm):
meta['properties']['architecture'] = data['architecture'] meta['properties']['architecture'] = data['architecture']
api.image_update(request, image_id, meta) api.image_update(request, image_id, meta)
messages.success(request, "Image was successfully updated.") messages.success(request, _('Image was successfully updated.'))
except glance_exception.ClientConnectionError, e: except glance_exception.ClientConnectionError, e:
LOG.exception("Error connecting to glance") LOG.exception(_('Error connecting to glance'))
messages.error(request, "Error connecting to glance: %s" messages.error(request, error_retrieving)
% e.message)
except glance_exception.Error, e: except glance_exception.Error, e:
LOG.exception('Error updating image with id "%s"' % image_id) LOG.exception(error_updating)
messages.error(request, "Error updating image: %s" % e.message) messages.error(request, error_updating)
except: except:
LOG.exception('Unspecified Exception in image update') LOG.exception(_('Unspecified Exception in image update'))
messages.error(request, "Image could not be updated, \ messages.error(request, error_updating)
please try again.")
return redirect('dash_images_update', tenant_id, image_id) return redirect('dash_images_update', tenant_id, image_id)
else: else:
messages.info(request, "Unable to update image, you are not its \ messages.info(request, _('Unable to update image. You are not its \
owner.") owner.'))
return redirect('dash_images_update', tenant_id, image_id) return redirect('dash_images_update', tenant_id, image_id)
@ -206,7 +205,7 @@ class DeleteImage(forms.SelfHandlingForm):
@login_required @login_required
def index(request, tenant_id): def index(request, tenant_id):
for f in (DeleteImage, ): for f in (DeleteImage, ):
_, handled = f.maybe_handle(request) unused, handled = f.maybe_handle(request)
if handled: if handled:
return handled return handled
delete_form = DeleteImage() delete_form = DeleteImage()