darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-09-04 12:18:25 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2856 from alphagov/edit-members-who-see-folder

Browse Source 
Edit members who see folder
This commit is contained in:
Pea (Malgorzata Tyczynska)
2019-03-19 14:11:59 +00:00
committed by GitHub
parent 0f9969989a fb5983cc2e
commit c994552fc2
7 changed files with 125 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/main/forms.py
View File

@@ -1285,6 +1285,15 @@ class ReturnedLettersForm(StripWhitespaceForm):
class TemplateFolderForm(StripWhitespaceForm):
def __init__(self, all_service_users=None, *args, **kwargs):
super().__init__(*args, **kwargs)
if all_service_users is not None:
self.users_with_permission.all_service_users = all_service_users
self.users_with_permission.choices = [
(item.id, item.name) for item in all_service_users
]
users_with_permission = MultiCheckboxField('Users who can see this folder:')
name = StringField('Folder name', validators=[DataRequired(message='Can’t be empty')])

15
app/main/views/templates.py
View File

@@ -430,14 +430,19 @@ def action_blocked(service_id, notification_type, return_to, template_id):
@login_required
@user_has_permissions('manage_templates')
def manage_template_folder(service_id, template_folder_id):
current_folder = current_service.get_template_folder(template_folder_id)
form = TemplateFolderForm(
name=current_service.get_template_folder(template_folder_id)['name']
name=current_folder['name'],
users_with_permission=current_folder.get('users_with_permission', None),
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]
template_folder_api_client.update_template_folder(
current_service.id, template_folder_id, name=form.name.data
current_service.id,
template_folder_id,
name=form.name.data,
users_with_permission=users_with_permission
)
return redirect(
url_for('.choose_template', service_id=service_id, template_folder_id=template_folder_id)
@@ -449,7 +454,7 @@ def manage_template_folder(service_id, template_folder_id):
template_folder_path=current_service.get_template_folder_path(template_folder_id),
current_service_id=current_service.id,
template_folder_id=template_folder_id,
template_type="all"
template_type="all",
)