darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-07-26 02:49:16 -04:00
Code Issues Packages Projects Releases Wiki Activity

Show all users in folder viewing permissions, correct users checked

Browse Source
This commit is contained in:
Pea Tyczynska
2019-03-18 16:12:12 +00:00
parent e85969f6fa
commit 86d8464fa2
4 changed files with 21 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/main/forms.py
View File

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

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

@@ -431,19 +431,18 @@ def action_blocked(service_id, notification_type, return_to, template_id):
@user_has_permissions('manage_templates')
def manage_template_folder(service_id, template_folder_id):
current_folder = current_service.get_template_folder(template_folder_id)
users_with_folder_permission = [
current_service.get_team_member(user_id) for user_id in current_folder['users_with_permission']
]
form = TemplateFolderForm(
name=current_folder['name'],
users_with_permission=users_with_folder_permission
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,
users_with_permission=form.viewing_permissions.data
users_with_permission=users_with_permission
)
return redirect(
url_for('.choose_template', service_id=service_id, template_folder_id=template_folder_id)