Commit 0a0d5580 authored by sfang97's avatar sfang97 Committed by serenafang

Reject button works now

Reject button correctly deletes user, need to make the modal simpler als
make the button email the user
parent b4ee4c56
.card.border-danger
.card-header.bg-danger.gl-text-white
= s_('AdminUsers|This user has requested access')
.card-body
= render partial: 'admin/users/user_reject_effects'
%br
= link_to s_('AdminUsers|Reject request'), approve_admin_user_path(user), method: :put, class: "btn delete-user-button gl-button btn-danger", data: { delete: s_('AdminUsers|Are you sure?') }
...@@ -172,7 +172,17 @@ ...@@ -172,7 +172,17 @@
- if @user.blocked? - if @user.blocked?
- if @user.blocked_pending_approval? - if @user.blocked_pending_approval?
= render 'admin/users/approve_user', user: @user = render 'admin/users/approve_user', user: @user
= render 'admin/users/reject_user', user: @user .card.border-danger
.card-header.bg-danger.gl-text-white
= s_('AdminUsers|This user has requested access')
.card-body
= render partial: 'admin/users/user_reject_effects'
%br
%button.delete-user-button.btn.gl-button.btn-danger{ data: { 'gl-modal-action': 'delete',
delete_user_url: admin_user_path(@user, hard_delete: true),
block_user_url: block_admin_user_path(@user),
username: sanitize_name(@user.name) } }
= s_('AdminUsers|Reject request')
- else - else
.card.border-info .card.border-info
.card-header.gl-bg-blue-500.gl-text-white .card-header.gl-bg-blue-500.gl-text-white
......
---
title: Email user when registration request is rejected
merge_request: 48185
author:
type: added
...@@ -2160,6 +2160,9 @@ msgstr "" ...@@ -2160,6 +2160,9 @@ msgstr ""
msgid "AdminUsers|External users cannot see internal or private projects unless access is explicitly granted. Also, external users cannot create projects, groups, or personal snippets." msgid "AdminUsers|External users cannot see internal or private projects unless access is explicitly granted. Also, external users cannot create projects, groups, or personal snippets."
msgstr "" msgstr ""
msgid "AdminUsers|If you reject the user:"
msgstr ""
msgid "AdminUsers|Is using seat" msgid "AdminUsers|Is using seat"
msgstr "" msgstr ""
...@@ -2196,6 +2199,9 @@ msgstr "" ...@@ -2196,6 +2199,9 @@ msgstr ""
msgid "AdminUsers|Regular users have access to their groups and projects" msgid "AdminUsers|Regular users have access to their groups and projects"
msgstr "" msgstr ""
msgid "AdminUsers|Reject request"
msgstr ""
msgid "AdminUsers|Restore user access to the account, including web, Git and API." msgid "AdminUsers|Restore user access to the account, including web, Git and API."
msgstr "" msgstr ""
...@@ -2211,6 +2217,12 @@ msgstr "" ...@@ -2211,6 +2217,12 @@ msgstr ""
msgid "AdminUsers|Sort by" msgid "AdminUsers|Sort by"
msgstr "" msgstr ""
msgid "AdminUsers|The user can not sign in or access instance information."
msgstr ""
msgid "AdminUsers|The user will be deleted."
msgstr ""
msgid "AdminUsers|The user will be logged out" msgid "AdminUsers|The user will be logged out"
msgstr "" msgstr ""
...@@ -12169,6 +12181,9 @@ msgstr "" ...@@ -12169,6 +12181,9 @@ msgstr ""
msgid "For more information, go to the " msgid "For more information, go to the "
msgstr "" msgstr ""
msgid "For more information, please refer to the %{link_start}user account deletion documentation.%{link_end}"
msgstr ""
msgid "For more information, please review %{link_start_tag}Jaeger's configuration doc%{link_end_tag}" msgid "For more information, please review %{link_start_tag}Jaeger's configuration doc%{link_end_tag}"
msgstr "" msgstr ""
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment