mirror of
https://github.com/GSA/notifications-admin.git
synced 2026-08-23 15:57:23 -04:00
User permissions section for a folder noy visible if service only has one user
If no manage users permission then don't pass user folder permissions to api
This commit is contained in:
@@ -460,7 +460,10 @@ def manage_template_folder(service_id, template_folder_id):
|
|||||||
all_service_users=[user for user in current_service.active_users if user.id != current_user.id]
|
all_service_users=[user for user in current_service.active_users if user.id != current_user.id]
|
||||||
)
|
)
|
||||||
if form.validate_on_submit():
|
if form.validate_on_submit():
|
||||||
users_with_permission = form.users_with_permission.data + [current_user.id]
|
if current_user.has_permissions("manage_service") and form.users_with_permission.all_service_users:
|
||||||
|
users_with_permission = form.users_with_permission.data + [current_user.id]
|
||||||
|
else:
|
||||||
|
users_with_permission = None
|
||||||
template_folder_api_client.update_template_folder(
|
template_folder_api_client.update_template_folder(
|
||||||
current_service.id,
|
current_service.id,
|
||||||
template_folder_id,
|
template_folder_id,
|
||||||
|
|||||||
@@ -26,7 +26,7 @@
|
|||||||
{% call form_wrapper(action=url_for('main.manage_template_folder', service_id=current_service.id, template_folder_id=template_folder_id)) %}
|
{% call form_wrapper(action=url_for('main.manage_template_folder', service_id=current_service.id, template_folder_id=template_folder_id)) %}
|
||||||
{{ textbox(form.name) }}
|
{{ textbox(form.name) }}
|
||||||
{% if current_service.has_permission("edit_folder_permissions") %}
|
{% if current_service.has_permission("edit_folder_permissions") %}
|
||||||
{% if current_user.has_permissions("manage_service") %}
|
{% if current_user.has_permissions("manage_service") and form.users_with_permission.all_service_users %}
|
||||||
{{ checkboxes(form.users_with_permission) }}
|
{{ checkboxes(form.users_with_permission) }}
|
||||||
{% endif %}
|
{% endif %}
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
|||||||
@@ -519,6 +519,35 @@ def test_get_manage_folder_viewing_permissions_for_users_not_visible_when_no_man
|
|||||||
assert len(checkboxes) == 0
|
assert len(checkboxes) == 0
|
||||||
|
|
||||||
|
|
||||||
|
def test_get_manage_folder_viewing_permissions_for_users_not_visible_for_services_with_one_user(
|
||||||
|
client_request,
|
||||||
|
active_user_with_permissions,
|
||||||
|
service_one,
|
||||||
|
mock_get_template_folders,
|
||||||
|
mocker
|
||||||
|
):
|
||||||
|
folder_id = str(uuid.uuid4())
|
||||||
|
service_one["permissions"] += ["edit_folder_permissions"]
|
||||||
|
mock_get_template_folders.return_value = [
|
||||||
|
{'id': folder_id, 'name': 'folder_two', 'parent_id': None, 'users_with_permission': [
|
||||||
|
active_user_with_permissions.id
|
||||||
|
]},
|
||||||
|
]
|
||||||
|
mocker.patch('app.models.service.Service.active_users', [active_user_with_permissions])
|
||||||
|
|
||||||
|
page = client_request.get(
|
||||||
|
'main.manage_template_folder',
|
||||||
|
service_id=service_one['id'],
|
||||||
|
template_folder_id=folder_id,
|
||||||
|
_test_page_title=False,
|
||||||
|
)
|
||||||
|
assert normalize_spaces(page.select_one('title').text) == (
|
||||||
|
'folder_two – Templates – service one – GOV.UK Notify'
|
||||||
|
)
|
||||||
|
form_labels = page.select('legend[class=form-label]')
|
||||||
|
assert len(form_labels) == 0
|
||||||
|
|
||||||
|
|
||||||
def test_manage_folder_page_404s(client_request, service_one, mock_get_template_folders):
|
def test_manage_folder_page_404s(client_request, service_one, mock_get_template_folders):
|
||||||
client_request.get(
|
client_request.get(
|
||||||
'main.manage_template_folder',
|
'main.manage_template_folder',
|
||||||
@@ -634,7 +663,7 @@ def test_rename_folder(client_request, active_user_with_permissions, service_one
|
|||||||
service_one['id'],
|
service_one['id'],
|
||||||
folder_id,
|
folder_id,
|
||||||
name="new beautiful name",
|
name="new beautiful name",
|
||||||
users_with_permission=[active_user_with_permissions.id]
|
users_with_permission=None
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
@@ -670,6 +699,47 @@ def test_manage_folder_users(
|
|||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
|
def test_manage_folder_users_doesnt_change_permissions_current_user_cannot_manage_users(
|
||||||
|
client_request, active_user_with_permissions, service_one, mock_get_template_folders, mocker
|
||||||
|
):
|
||||||
|
active_user_with_permissions.permissions[SERVICE_ONE_ID] = [
|
||||||
|
'send_texts',
|
||||||
|
'send_emails',
|
||||||
|
'send_letters',
|
||||||
|
'manage_templates',
|
||||||
|
'manage_settings',
|
||||||
|
'manage_api_keys',
|
||||||
|
'view_activity',
|
||||||
|
]
|
||||||
|
team_member = active_user_view_permissions(str(uuid.uuid4()))
|
||||||
|
mock_update = mocker.patch('app.template_folder_api_client.update_template_folder')
|
||||||
|
folder_id = str(uuid.uuid4())
|
||||||
|
mock_get_template_folders.return_value = [
|
||||||
|
{'id': folder_id, 'name': 'folder_two', 'parent_id': None, 'users_with_permission': [
|
||||||
|
active_user_with_permissions.id, team_member.id
|
||||||
|
]}
|
||||||
|
]
|
||||||
|
mocker.patch('app.models.service.Service.active_users', [active_user_with_permissions, team_member])
|
||||||
|
|
||||||
|
client_request.post(
|
||||||
|
'main.manage_template_folder',
|
||||||
|
service_id=service_one['id'],
|
||||||
|
template_folder_id=folder_id,
|
||||||
|
_data={"name": "new beautiful name", "users_with_permission": []},
|
||||||
|
_expected_redirect=url_for("main.choose_template",
|
||||||
|
service_id=service_one['id'],
|
||||||
|
template_folder_id=folder_id,
|
||||||
|
_external=True)
|
||||||
|
)
|
||||||
|
|
||||||
|
mock_update.assert_called_once_with(
|
||||||
|
service_one['id'],
|
||||||
|
folder_id,
|
||||||
|
name="new beautiful name",
|
||||||
|
users_with_permission=None
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
def test_delete_template_folder_should_request_confirmation(
|
def test_delete_template_folder_should_request_confirmation(
|
||||||
client_request, service_one, mock_get_template_folders, mocker,
|
client_request, service_one, mock_get_template_folders, mocker,
|
||||||
):
|
):
|
||||||
|
|||||||
Reference in New Issue
Block a user