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

Combine invited and active team members

Browse Source 
Right now these are two separate lists. Which makes it harder to add
improvements that will make large numbers of users easier to manage.
This commit is contained in:
Chris Hill-Scott
2018-01-26 17:14:00 +00:00
parent 73a685eb0a
commit 79ddf657bf
3 changed files with 24 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
app/main/views/manage_users.py
View File

@@ -28,15 +28,18 @@ from app.utils import user_has_permissions
@login_required
@user_has_permissions('view_activity', admin_override=True)
def manage_users(service_id):
users = user_api_client.get_users_for_service(service_id=service_id)
invited_users = [invite for invite in invite_api_client.get_invites_for_service(service_id=service_id)
if invite.status != 'accepted']
users = (
user_api_client.get_users_for_service(service_id=service_id) +
[
invite for invite in invite_api_client.get_invites_for_service(service_id=service_id)
if invite.status != 'accepted'
]
)
return render_template(
'views/manage-users.html',
users=users,
current_user=current_user,
invited_users=invited_users
)