A missing deployable_id gets caught before this block is even
executed, so its only purpose is to cause @deployment.valid? to
be called. I moved that somewhere more relevant and dropped the
rest since it is now obsolete.
---
src/app/controllers/deployments_controller.rb | 7 +------
1 files changed, 1 insertions(+), 6 deletions(-)
diff --git a/src/app/controllers/deployments_controller.rb
b/src/app/controllers/deployments_controller.rb
index ce80df2..07e1534 100644
--- a/src/app/controllers/deployments_controller.rb
+++ b/src/app/controllers/deployments_controller.rb
@@ -73,17 +73,12 @@ class DeploymentsController < ApplicationController
@deployment.deployable_xml = DeployableXML.new(@deployable.xml)
@deployment.owner = current_user
- unless @deployment.valid? and params.has_key?(:deployable_id)
- @deployment.errors.add(:base,
t('deployments.flash.warning.deployable_not_selected')) unless
params.has_key?(:deployable_id)
- render :launch_new and return
- end
-
require_privilege(Privilege::CREATE, Deployment, @pool)
require_privilege(Privilege::USE, @deployable)
img, img2, missing, d_errors = @deployable.get_image_details
flash[:error] = d_errors unless d_errors.empty?
- unless @deployable && @deployable.xml &&
@deployment.valid_deployable_xml?(@deployable.xml) && d_errors.empty?
+ unless @deployable && @deployable.xml &&
@deployment.valid_deployable_xml?(@deployable.xml) && d_errors.empty? &&
@deployment.valid?
render 'launch_new' and return
end
--
1.7.7.6
