On Tue, Sep 18, 2012 at 01:05:00PM -0400, [email protected] wrote: > From: Tzu-Mainn Chen <[email protected]> > > --- > src/app/controllers/deployments_controller.rb | 5 +++++ > 1 files changed, 5 insertions(+), 0 deletions(-) > > diff --git a/src/app/controllers/deployments_controller.rb > b/src/app/controllers/deployments_controller.rb > index 51348a7..ce80df2 100644 > --- a/src/app/controllers/deployments_controller.rb > +++ b/src/app/controllers/deployments_controller.rb > @@ -65,6 +65,11 @@ class DeploymentsController < ApplicationController > @pool = @deployment.pool > init_new_deployment_attrs > > + if @deployable.nil? > + @deployment.errors.add(:base, > t('deployments.flash.warning.deployable_not_selected')) > + render :launch_new and return > + end > + > @deployment.deployable_xml = DeployableXML.new(@deployable.xml) > @deployment.owner = current_user > > -- > 1.7.6.5
ACK. I pushed this to master. The flag on the BZ is still 1.1.0?, not +, so I did _not_ cherry-pick this onto 1.1 -- only master. -- Matt
