Re: [PATCH] Adds realm support to deployment launch; narrows permission scope

--- src/app/controllers/deployments_controller.rb | 7 ++++--- src/app/views/deployments/_launch_new.haml | 3 +++ src/app/views/deployments/_new.haml | 1 + 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src/app/controllers/deployments_controller.rb b/src/app/controllers/deployments_controller.rb index 39b36d0..31a90d3 100644 --- a/src/app/controllers/deployments_controller.rb +++ b/src/app/controllers/deployments_controller.rb @@ -16,9 +16,10 @@ class DeploymentsController< ApplicationController # It is expected that params[:pool_id] will be set on requests into this method def launch_new - require_privilege(Privilege::CREATE, Deployment) @pool = Pool.find(params[:pool_id]) or raise "Invalid pool" + require_privilege(Privilege::CREATE, Deployment) @deployment = Deployment.new(:pool_id => @pool.id) + init_new_deployment_attrs respond_to do |format| format.js { render :partial => 'launch_new' } format.html @@ -41,9 +42,9 @@ class DeploymentsController< ApplicationController # launch_new will post here, but you can use this RESTfully as well def new - require_privilege(Privilege::CREATE, Deployment) @deployment = Deployment.new(params[:deployment]) @pool = @deployment.pool + require_privilege(Privilege::CREATE, Deployment, @pool) @deployment.import_xml_from_url(params[:deployable][:url]) if params[:deployable]&& params[:deployable][:url] respond_to do |format| format.js { render :partial => 'new' } @@ -75,8 +76,8 @@ class DeploymentsController< ApplicationController end def create - require_privilege(Privilege::CREATE, Deployment) @deployment = Deployment.new(params[:deployment]) + require_privilege(Privilege::CREATE, Deployment, @deployment.pool) @deployment.owner = current_user respond_to do |format| if @deployment.save diff --git a/src/app/views/deployments/_launch_new.haml b/src/app/views/deployments/_launch_new.haml index 238e66f..d5a72d4 100644 --- a/src/app/views/deployments/_launch_new.haml +++ b/src/app/views/deployments/_launch_new.haml @@ -17,6 +17,9 @@ Name your deployment = text_field(:deployment, :name) %span.name_available + %p + Choose a realm + = select :deployment, :realm_id, @realms.map{|r| [r.name, r.id]} = submit_tag('Next') :javascript diff --git a/src/app/views/deployments/_new.haml b/src/app/views/deployments/_new.haml index a0903da..175e5a5 100644 --- a/src/app/views/deployments/_new.haml +++ b/src/app/views/deployments/_new.haml @@ -47,6 +47,7 @@ - form_for @deployment do = hidden_field :deployment, :name = hidden_field :deployment, :pool_id + = hidden_field :deployment, :realm_id -# FIXME: Passing chunks of XML around in hidden form fields doesn't feel right = hidden_field :deployment, :deployable_xml = submit_tag 'Launch'