Signed-off-by: Jason Guiditta jason.guiditta@gmail.com --- src/app/controllers/instance_controller.rb | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/app/controllers/instance_controller.rb b/src/app/controllers/instance_controller.rb index bba8857..398fdde 100644 --- a/src/app/controllers/instance_controller.rb +++ b/src/app/controllers/instance_controller.rb @@ -13,7 +13,8 @@ class InstanceController < ApplicationController end
def new - _new(params[:provider],params[:id]) + @instance = Instance.new({:portal_pool_id => params[:id]}) + _new(params[:provider]) end
def create @@ -29,11 +30,11 @@ class InstanceController < ApplicationController flash[:notice] = "Instance added." redirect_to :controller => "portal_pool", :action => 'show', :id => @instance.portal_pool_id else - _new(params[:provider_id],params[:instance][:portal_pool_id]) + _new(params[:provider_id]) render :action => 'new' end else - _new(params[:provider_id],params[:instance][:portal_pool_id]) + _new(params[:provider_id]) render :action => 'new' end end @@ -60,11 +61,10 @@ class InstanceController < ApplicationController
private
- def _new(provider, pool) + def _new(provider) @flavors = Flavor.find(:all, :conditions => {:provider_id => provider}) @images = Image.find(:all, :conditions => {:provider_id => provider}) @realms = Realm.find(:all, :conditions => {:provider_id => provider}) - @instance = Instance.new({:portal_pool_id => pool}) @provider_id = provider end
deltacloud-devel@lists.fedorahosted.org