diff options
Diffstat (limited to 'app/helpers')
-rw-r--r-- | app/helpers/profiles_helper.rb | 15 | ||||
-rw-r--r-- | app/helpers/search_helper.rb | 2 | ||||
-rw-r--r-- | app/helpers/ssh_keys_helper.rb | 18 | ||||
-rw-r--r-- | app/helpers/users_helper.rb | 13 |
4 files changed, 31 insertions, 17 deletions
diff --git a/app/helpers/profiles_helper.rb b/app/helpers/profiles_helper.rb index 44d869fbd8f..5a42e581867 100644 --- a/app/helpers/profiles_helper.rb +++ b/app/helpers/profiles_helper.rb @@ -29,19 +29,4 @@ module ProfilesHelper def user_profile? params[:controller] == 'users' end - - def ssh_key_delete_modal_data(key, is_admin) - { - path: path_to_key(key, is_admin), - method: 'delete', - qa_selector: 'delete_ssh_key_button', - modal_attributes: { - 'data-qa-selector': 'ssh_key_delete_modal', - title: _('Are you sure you want to delete this SSH key?'), - message: _('This action cannot be undone, and will permanently delete the %{key} SSH key') % { key: key.title }, - okVariant: 'danger', - okTitle: _('Delete') - } - } - end end diff --git a/app/helpers/search_helper.rb b/app/helpers/search_helper.rb index 63601485daf..a032b1b2bba 100644 --- a/app/helpers/search_helper.rb +++ b/app/helpers/search_helper.rb @@ -100,7 +100,7 @@ module SearchHelper end def search_service - @search_service ||= ::SearchService.new(current_user, params) + @search_service ||= ::SearchService.new(current_user, params.merge(confidential: Gitlab::Utils.to_boolean(params[:confidential]))) end private diff --git a/app/helpers/ssh_keys_helper.rb b/app/helpers/ssh_keys_helper.rb new file mode 100644 index 00000000000..381db893943 --- /dev/null +++ b/app/helpers/ssh_keys_helper.rb @@ -0,0 +1,18 @@ +# frozen_string_literal: true + +module SshKeysHelper + def ssh_key_delete_modal_data(key, path) + { + path: path, + method: 'delete', + qa_selector: 'delete_ssh_key_button', + modal_attributes: { + 'data-qa-selector': 'ssh_key_delete_modal', + title: _('Are you sure you want to delete this SSH key?'), + message: _('This action cannot be undone, and will permanently delete the %{key} SSH key') % { key: key.title }, + okVariant: 'danger', + okTitle: _('Delete') + } + } + end +end diff --git a/app/helpers/users_helper.rb b/app/helpers/users_helper.rb index c1bca6b4c41..f47937e6d57 100644 --- a/app/helpers/users_helper.rb +++ b/app/helpers/users_helper.rb @@ -84,7 +84,7 @@ module UsersHelper def user_badges_in_admin_section(user) [].tap do |badges| - badges << { text: s_('AdminUsers|Blocked'), variant: 'danger' } if user.blocked? + badges << blocked_user_badge(user) if user.blocked? badges << { text: s_('AdminUsers|Admin'), variant: 'success' } if user.admin? badges << { text: s_('AdminUsers|External'), variant: 'secondary' } if user.external? badges << { text: s_("AdminUsers|It's you!"), variant: nil } if current_user == user @@ -106,8 +106,19 @@ module UsersHelper end end + def can_force_email_confirmation?(user) + !user.confirmed? + end + private + def blocked_user_badge(user) + pending_approval_badge = { text: s_('AdminUsers|Pending approval'), variant: 'info' } + return pending_approval_badge if user.blocked_pending_approval? + + { text: s_('AdminUsers|Blocked'), variant: 'danger' } + end + def get_profile_tabs tabs = [] |