[Ovirt-devel] [PATCH server 6/8] Remove delete_volumes, since it was not used
David Lutterkort
lutter at redhat.com
Mon Feb 2 20:35:35 UTC 2009
---
src/app/controllers/storage_volume_controller.rb | 49 ----------------------
src/app/views/storage_volume/show.rhtml | 2 +-
2 files changed, 1 insertions(+), 50 deletions(-)
diff --git a/src/app/controllers/storage_volume_controller.rb b/src/app/controllers/storage_volume_controller.rb
index ba486d2..9cde09b 100644
--- a/src/app/controllers/storage_volume_controller.rb
+++ b/src/app/controllers/storage_volume_controller.rb
@@ -118,54 +118,6 @@ class StorageVolumeController < ApplicationController
end
def destroy
- if params[:id]
- delete_volume
- else
- delete_volumes
- end
- end
-
- def delete_volumes
- storage_volume_ids_str = params[:storage_volume_ids]
- storage_volume_ids = storage_volume_ids_str.split(",").collect {|x| x.to_i}
- alerts = []
- status = true
- begin
- StorageVolume.transaction do
- storage = StorageVolume.find(:all, :conditions => "id in (#{storage_volume_ids.join(', ')})")
- unless storage.empty?
- set_perms(storage[0].storage_pool.hardware_pool)
- unless @can_modify and storage[0].storage_pool.user_subdividable
- respond_to do |format|
- format.json { render :json => { :object => "storage_volume",
- :success => false,
- :alert => "You do not have permission to delete this storage volume." } }
- format.xml { head :forbidden }
- end
- else
- storage.each do |storage_volume|
- alert, success = delete_volume_internal(storage_volume)
- alerts << alert
- status = false unless success
- end
- respond_to do |format|
- format.json { render :json => { :object => "storage_volume",
- :success => status, :alert => alerts.join("\n") } }
- format.xml { head(status ? :ok : :method_not_allowed) }
- end
- end
- else
- respond_to do |format|
- format.json { render :json => { :object => "storage_volume",
- :success => false, :alert => "no volumes selected" } }
- format.xml { head(status ? :ok : :method_not_allowed) }
- end
- end
- end
- end
- end
-
- def delete_volume
@storage_volume = StorageVolume.find(params[:id])
set_perms(@storage_volume.storage_pool.hardware_pool)
unless @can_modify and @storage_volume.storage_pool.user_subdividable
@@ -183,7 +135,6 @@ class StorageVolumeController < ApplicationController
format.xml { head(success ? :ok : :method_not_allowed) }
end
end
-
end
def pre_create
diff --git a/src/app/views/storage_volume/show.rhtml b/src/app/views/storage_volume/show.rhtml
index c2434aa..3963a3c 100644
--- a/src/app/views/storage_volume/show.rhtml
+++ b/src/app/views/storage_volume/show.rhtml
@@ -75,7 +75,7 @@
{
$(document).trigger('close.facebox');
$.post('<%= url_for :controller => "storage_volume", :action => "destroy" %>',
- { storage_volume_ids: <%= @storage_volume.id %> },
+ { id: <%= @storage_volume.id %> },
function(data,status) {
// FIXME: reload tree
if (data.alert) {
--
1.6.0.6
More information about the ovirt-devel
mailing list