From 3a7bb3739029aba813864e0fef49c2ee15944c51 Mon Sep 17 00:00:00 2001 From: lgalis Date: Mon, 27 Nov 2017 16:39:53 -0500 Subject: [PATCH] Initialize tag_tree when switching group tabs --- app/controllers/ops_controller/ops_rbac.rb | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/app/controllers/ops_controller/ops_rbac.rb b/app/controllers/ops_controller/ops_rbac.rb index 2f58e91b3fc3..100282010240 100644 --- a/app/controllers/ops_controller/ops_rbac.rb +++ b/app/controllers/ops_controller/ops_rbac.rb @@ -846,9 +846,7 @@ def rbac_field_changed(rec_type) page.replace(@refresh_div, :partial => @refresh_partial, :locals => {:type => "classifications", :action_url => 'rbac_group_field_changed'}) if @refresh_div - page.replace("customer_tags_div", :partial => "ops/rbac_group/customer_tags") if params[:use_filter_expression].present? - # Only update description field value if ldap group user field was selected page << "$('#description').val('#{j_str(@edit[:new][:ldap_groups_user])}');" if params[:ldap_groups_user] @@ -1152,10 +1150,10 @@ def rbac_group_get_form_vars if params[:use_filter_expression] @edit[:new][:use_filter_expression] = params[:use_filter_expression] + @group = MiqGroup.find_by(:id => @edit[:group_id]) + rbac_group_right_tree(@edit[:new][:belongsto].keys) if params[:use_filter_expression] == 'false' @edit[:new][:use_filter_expression] = false - @group = MiqGroup.find_by(:id => @edit[:group_id]) - rbac_group_right_tree(@edit[:new][:belongsto].keys) elsif params[:use_filter_expression] == 'true' @edit[:use_filter_expression] = true end