Merge lp:~jakedahn/horizon/lp770538 into lp:~hudson-openstack/horizon/trunk

[Jake Dahn]

This branch prevents openstack-dashboard from erroring out when a netadmin tries to modify instance details. It also adds a proper error message for when users who try to terminate instances without permission.

[Devin Carlen (devcamcar)]

lgtm

review: Approve

=== modified file 'django-nova/src/django_nova/views/instances.py'
--- django-nova/src/django_nova/views/instances.py	2011-04-19 12:21:54 +0000
+++ django-nova/src/django_nova/views/instances.py	2011-04-26 00:44:22 +0000
@@ -129,6 +129,8 @@
             messages.error(request,
                            'Unable to terminate %s: %s' %
                            (instance_id, e.message,))
+        except exceptions.NovaUnauthorizedError, e:
+            messages.error(request, 'Permission Denied')
         else:
             messages.success(request,
                              'Instance %s has been terminated.' % instance_id)
@@ -190,6 +192,8 @@
                 messages.error(request,
                                'Unable to update instance %s: %s' %
                                (instance_id, e.message,))
+            except exceptions.NovaUnauthorizedError, e:
+               messages.error(request, 'Permission Denied')
             else:
                 messages.success(request,
                                  'Instance %s has been updated.' % instance_id)