Merge lp:~devcamcar/django-nova/fix_volume_maintenance into lp:django-nova

[Devin Carlen]

Made volume views use the handle_nova_error decorator.

[Devin Carlen (devcamcar)]

approve

review: Approve

=== modified file 'src/django_nova/views/volumes.py'
--- src/django_nova/views/volumes.py	2011-01-18 23:07:26 +0000
+++ src/django_nova/views/volumes.py	2011-01-25 23:18:44 +0000
@@ -24,14 +24,14 @@
 from django.contrib import messages
 from django.contrib.auth.decorators import login_required
 from django.shortcuts import redirect, render_to_response
-from django.views.decorators.cache import never_cache
 from django_nova import exceptions
 from django_nova import forms
-from django_nova.shortcuts import get_project_or_404, get_projects
+from django_nova.exceptions import handle_nova_error
+from django_nova.shortcuts import get_project_or_404
 
 
 @login_required
-@never_cache
+@handle_nova_error
 def index(request, project_id):
     project = get_project_or_404(request, project_id)
     volumes = project.get_volumes()
@@ -46,7 +46,7 @@
 
 
 @login_required
-@never_cache
+@handle_nova_error
 def add(request, project_id):
     project = get_project_or_404(request, project_id)
 
@@ -79,7 +79,7 @@
 
 
 @login_required
-@never_cache
+@handle_nova_error
 def delete(request, project_id, volume_id):
     project = get_project_or_404(request, project_id)
 
@@ -98,7 +98,7 @@
 
 
 @login_required
-@never_cache
+@handle_nova_error
 def attach(request, project_id):
     project = get_project_or_404(request, project_id)
 
@@ -133,7 +133,7 @@
 
 
 @login_required
-@never_cache
+@handle_nova_error
 def detach(request, project_id, volume_id):
     project = get_project_or_404(request, project_id)