From f72802f9f2bab98624d1151363c3ede700398440 Mon Sep 17 00:00:00 2001 From: "osboxes.org" Date: Wed, 26 Apr 2017 16:31:44 +0100 Subject: [PATCH 1/2] Tab Teams is highlighted when in Audit trails [fixes SCI-1214] --- app/helpers/user_settings_helper.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/helpers/user_settings_helper.rb b/app/helpers/user_settings_helper.rb index 2de267709..e391254cf 100644 --- a/app/helpers/user_settings_helper.rb +++ b/app/helpers/user_settings_helper.rb @@ -13,7 +13,7 @@ module UserSettingsHelper end def on_settings_team_page? - controller_name == 'teams' && - action_name.in?(%w(index new create show)) + controller_name.in?(%w(teams audits)) && + action_name.in?(%w(index new create show audits_index)) end end From 21a39fc704250729d93399befb84ce739f92e525 Mon Sep 17 00:00:00 2001 From: "osboxes.org" Date: Fri, 28 Apr 2017 10:31:14 +0100 Subject: [PATCH 2/2] Code indentation corrected [fixes SCI-1214] --- app/helpers/user_settings_helper.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/helpers/user_settings_helper.rb b/app/helpers/user_settings_helper.rb index e391254cf..ce06ccf60 100644 --- a/app/helpers/user_settings_helper.rb +++ b/app/helpers/user_settings_helper.rb @@ -13,7 +13,7 @@ module UserSettingsHelper end def on_settings_team_page? - controller_name.in?(%w(teams audits)) && - action_name.in?(%w(index new create show audits_index)) + controller_name.in?(%w(teams audits)) && + action_name.in?(%w(index new create show audits_index)) end end