From 76b8fa1ce3b03026b750fb68fa9aa5332bd6cd72 Mon Sep 17 00:00:00 2001 From: Hilda Stastna Date: Thu, 4 Jan 2018 18:55:22 +0100 Subject: [PATCH] Enable to add a new Group after first unsuccessful adding Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1523214 Enable to add a new Group after first unsuccessful adding of the Group because of missing Name, in Administrator > Configuration, Access Control tab > Groups. --- app/controllers/ops_controller/ops_rbac.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/controllers/ops_controller/ops_rbac.rb b/app/controllers/ops_controller/ops_rbac.rb index 43361447ed7..d257d6f1ea6 100644 --- a/app/controllers/ops_controller/ops_rbac.rb +++ b/app/controllers/ops_controller/ops_rbac.rb @@ -726,7 +726,7 @@ def rbac_edit_save_or_add(what, rbac_suffix = what) when :group then record = @edit[:group_id] ? MiqGroup.find_by(:id => @edit[:group_id]) : MiqGroup.new validated = rbac_group_validate? - rbac_group_set_record_vars(record) + rbac_group_set_record_vars(record) if validated when :role then record = @edit[:role_id] ? MiqUserRole.find_by(:id => @edit[:role_id]) : MiqUserRole.new validated = rbac_role_validate? @@ -1421,6 +1421,7 @@ def rbac_role_validate? # Validate some of the role fields def rbac_group_validate? + return false if @edit[:new][:description].nil? @assigned_filters = [] if @edit[:new][:filters].empty? || @edit[:new][:use_filter_expression] @filter_expression = [] if @edit[:new][:filter_expression].empty? || @edit[:new][:use_filter_expression] == false if @edit[:new][:role].nil? || @edit[:new][:role] == ""