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:
Pea Tyczynska
2019-04-02 12:26:41 +01:00
parent 9d44c45e90
commit bd66cc220b
3 changed files with 76 additions and 3 deletions

View File

@@ -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]
)
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(
current_service.id,
template_folder_id,

View File

@@ -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)) %}
{{ textbox(form.name) }}
{% 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) }}
{% endif %}
{% endif %}