From: Jan Provaznik jprovazn@redhat.com
When user (w/o JS) was editing template and clicked "add software" and then selected a group of pkgs in left side panel, then id of template was lost. --- .../image_factory/templates_controller.rb | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/app/controllers/image_factory/templates_controller.rb b/src/app/controllers/image_factory/templates_controller.rb index 0317621..ddfd0cf 100644 --- a/src/app/controllers/image_factory/templates_controller.rb +++ b/src/app/controllers/image_factory/templates_controller.rb @@ -245,11 +245,12 @@ class ImageFactory::TemplatesController < ApplicationController end
def set_package_vars(set_all = false) - if params[:id].blank? + id = params[:id] || (params[:tpl] && params[:tpl][:id]) || nil + if id.blank? @tpl = Template.new check_create_permission else - @tpl = Template.find(params[:id]) + @tpl = Template.find(id) check_edit_permission end @tpl.attributes = params[:tpl] unless params[:tpl].nil?