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

Merge branch 'master' into fix-new-jobs-showing-as-deleted

Browse Source
This commit is contained in:
Chris Hill-Scott
2020-01-21 14:24:40 +00:00
committed by GitHub
parent d27d400f53 8a41b63e23
commit 291734b0c4
55 changed files with 1859 additions and 207 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
app/models/user.py
View File

@@ -614,12 +614,9 @@ class AnonymousUser(AnonymousUserMixin):
class Users(ModelList):
client = user_api_client.get_users_for_service
client_method = user_api_client.get_users_for_service
model = User
def __init__(self, service_id):
self.items = self.client(service_id)
def get_name_from_id(self, id):
for user in self:
if user.id == id:
@@ -628,21 +625,21 @@ class Users(ModelList):
class OrganisationUsers(Users):
client = user_api_client.get_users_for_organisation
client_method = user_api_client.get_users_for_organisation
class InvitedUsers(Users):
client = invite_api_client.get_invites_for_service
client_method = invite_api_client.get_invites_for_service
model = InvitedUser
def __init__(self, service_id):
self.items = [
user for user in self.client(service_id)
user for user in self.client_method(service_id)
if user['status'] != 'accepted'
]
class OrganisationInvitedUsers(InvitedUsers):
client = org_invite_api_client.get_invites_for_organisation
client_method = org_invite_api_client.get_invites_for_organisation
model = InvitedOrgUser