darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-02-05 10:53:28 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'filter-invites' into show-invite-email

Browse Source
This commit is contained in:
Adam Shimali
2016-03-07 14:03:13 +00:00
parent 569f61578e 208a586948
commit 9941d72d4a
4 changed files with 38 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -28,11 +28,15 @@ from app.utils import user_has_permissions
def manage_users(service_id):
users = user_api_client.get_users_for_service(service_id=service_id)
invited_users = invite_api_client.get_invites_for_service(service_id=service_id)
filtered_invites = []
for invite in invited_users:
if invite.status != 'accepted':
filtered_invites.append(invite)
return render_template('views/manage-users.html',
service_id=service_id,
users=users,
current_user=current_user,
invited_users=invited_users)
invited_users=filtered_invites)
@main.route("/services/<service_id>/users/invite", methods=['GET', 'POST'])

5
app/notify_client/invite_api_client.py
View File

@@ -48,7 +48,6 @@ class InviteApiClient(BaseAPIClient):
def _get_invited_users(self, invites):
invited_users = []
for invite in invites:
if invite['status'] != 'accepted':
invited_user = InvitedUser(**invite)
invited_users.append(invited_user)
invited_user = InvitedUser(**invite)
invited_users.append(invited_user)
return invited_users