[Ovirt-devel] [PATCH server 7/8] Produce a human-readable error when deleting a pool fails

[David Lutterkort]

---
 src/app/controllers/storage_controller.rb |    6 ++++--
 src/app/views/errors/simple.xml.builder   |    3 +++
 2 files changed, 7 insertions(+), 2 deletions(-)
 create mode 100644 src/app/views/errors/simple.xml.builder

diff --git a/src/app/controllers/storage_controller.rb b/src/app/controllers/storage_controller.rb
index 3579967..a951656 100644
--- a/src/app/controllers/storage_controller.rb
+++ b/src/app/controllers/storage_controller.rb
@@ -204,10 +204,12 @@ class StorageController < ApplicationController
 
   def destroy
     unless @storage_pool.movable?
+      @error = "Cannot delete storage with associated vms"
       respond_to do |format|
         format.json { render :json => { :object => "storage_pool",
-            :success => false,
-            :alert => "Cannot delete storage with associated vms" } }
+            :success => false, :alert => @error } }
+        format.xml { render :template => "errors/simple", :layout => false,
+          :status => :forbidden }
       end
       return
     end
diff --git a/src/app/views/errors/simple.xml.builder b/src/app/views/errors/simple.xml.builder
new file mode 100644
index 0000000..d8d3c5b
--- /dev/null
+++ b/src/app/views/errors/simple.xml.builder
@@ -0,0 +1,3 @@
+xml.instruct!
+
+xml.error @error
-- 
1.6.0.6