diff --git a/app/assets/images/user_groups/promo.svg b/app/assets/images/user_groups/promo.svg new file mode 100644 index 000000000..d8cba3029 --- /dev/null +++ b/app/assets/images/user_groups/promo.svg @@ -0,0 +1,100 @@ + diff --git a/app/controllers/users/settings/user_groups_controller.rb b/app/controllers/users/settings/user_groups_controller.rb index 48705aa4a..4f0dc9777 100644 --- a/app/controllers/users/settings/user_groups_controller.rb +++ b/app/controllers/users/settings/user_groups_controller.rb @@ -3,12 +3,12 @@ module Users module Settings class UserGroupsController < ApplicationController - before_action :check_user_groups_enabled before_action :load_team + before_action :set_breadcrumbs_items, only: %i(index show) + before_action :check_user_groups_enabled before_action :load_user_group, except: %i(index unassigned_users actions_toolbar create) before_action :check_read_permissions, only: %i(users) before_action :check_manage_permissions, except: %i(index show unassigned_users actions_toolbar) - before_action :set_breadcrumbs_items, only: %i(index show) def index respond_to do |format| @@ -91,6 +91,7 @@ module Users private def check_user_groups_enabled + @active_tab = :user_groups render '/users/settings/user_groups/promo' unless UserGroup.enabled? end diff --git a/app/views/users/settings/user_groups/promo.html.erb b/app/views/users/settings/user_groups/promo.html.erb index 829c134f3..83a8c19ed 100644 --- a/app/views/users/settings/user_groups/promo.html.erb +++ b/app/views/users/settings/user_groups/promo.html.erb @@ -1,21 +1,16 @@ <% provide(:sidebar_title, t('sidebar.templates.sidebar_title')) %> <% provide(:container_class, "no-second-nav-container") %> - -