Displaying 2 results from an estimated 2 matches for "efd3cb6".
2009 May 22
1
[PATCH server] fixed smart pool 'save' regression.
...pplicationController
protected
def get_parent_id
- params[:parent_id]
+ params[:hardware_pool] ?
+ params[:hardware_pool][:parent_id] :
+ params[:parent_id]
end
end
diff --git a/src/app/controllers/resources_controller.rb b/src/app/controllers/resources_controller.rb
index efd3cb6..9d1074a 100644
--- a/src/app/controllers/resources_controller.rb
+++ b/src/app/controllers/resources_controller.rb
@@ -66,12 +66,6 @@ class ResourcesController < PoolController
super(:full_items => @pool.vms, :find_opts => {}, :include_pool => :true)
end
- def additional_cre...
2009 May 20
1
[PATCH server] don't add nil key to failures hash for PartialSuccessError handling.
...n => ex
- failures[@permission] = ex.message
+ failures[@permission.nil? ? permission_id : @permission] = ex.message
end
end
unless failures.empty?
diff --git a/src/app/controllers/resources_controller.rb b/src/app/controllers/resources_controller.rb
index 6990df7..efd3cb6 100644
--- a/src/app/controllers/resources_controller.rb
+++ b/src/app/controllers/resources_controller.rb
@@ -80,10 +80,9 @@ class ResourcesController < PoolController
begin
svc_destroy(pool_id)
successes << @pool
- rescue PermissionError => perm_error
-...