remove the remove-user get method

remove `confirm` from `confirm_remove_user_from_service` as there's
only one action now that the initial confirmation prompt takes place
on the edit permissions page
This commit is contained in:
Leo Hemsted
2019-03-26 15:51:44 +00:00
parent f7f9dd8530
commit f872294235
3 changed files with 26 additions and 42 deletions

View File

@@ -128,22 +128,10 @@ def edit_user_permissions(service_id, user_id):
)
@main.route("/services/<service_id>/users/<user_id>/delete", methods=['GET'])
@login_required
@user_has_permissions('manage_service')
def remove_user_from_service(service_id, user_id):
return redirect(url_for(
'.edit_user_permissions',
service_id=service_id,
user_id=user_id,
delete='yes'
))
@main.route("/services/<service_id>/users/<user_id>/delete", methods=['POST'])
@login_required
@user_has_permissions('manage_service')
def confirm_remove_user_from_service(service_id, user_id):
def remove_user_from_service(service_id, user_id):
try:
service_api_client.remove_user_from_service(service_id, user_id)
except HTTPError as e:

View File

@@ -212,7 +212,6 @@ class HeaderNavigation(Navigation):
'register_from_org_invite',
'registration_continue',
'remove_user_from_organisation',
'confirm_remove_user_from_service',
'remove_user_from_service',
'request_letter_branding',
'request_to_go_live',
@@ -342,7 +341,6 @@ class MainNavigation(Navigation):
'team-members': {
'confirm_edit_user_email',
'confirm_edit_user_mobile_number',
'confirm_remove_user_from_service',
'edit_user_email',
'edit_user_mobile_number',
'edit_user_permissions',
@@ -619,7 +617,6 @@ class CaseworkNavigation(Navigation):
'confirm_edit_user_email',
'confirm_edit_user_mobile_number',
'confirm_redact_template',
'confirm_remove_user_from_service',
'conversation',
'conversation_reply',
'conversation_reply_with_template',
@@ -955,7 +952,6 @@ class OrgNavigation(Navigation):
'register_from_invite',
'register_from_org_invite',
'registration_continue',
'confirm_remove_user_from_service',
'remove_user_from_service',
'request_letter_branding',
'request_to_go_live',