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

Merge pull request #3840 from alphagov/accounts-page-fix

Browse Source 
Fix /accounts page to only show trial services once
This commit is contained in:
Katie Smith
2021-03-17 15:29:07 +00:00
committed by GitHub
parent fb1345494c 82733d615f
commit 776e24a215
4 changed files with 14 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
app/models/user.py
View File

@@ -289,13 +289,6 @@ class User(JSONModel, UserMixin):
if self.belongs_to_organisation(service.organisation_id)
]
@property
def services_without_organisations(self):
return [
service for service in self.services
if not self.belongs_to_organisation(service.organisation_id)
]
@property
def service_ids(self):
return self._dict['services']
@@ -312,12 +305,6 @@ class User(JSONModel, UserMixin):
service for service in self.services if service.live
]
@property
def live_services_not_belonging_to_users_organisations(self):
return self.sort_services(
set(self.live_services).union(self.services_without_organisations)
)
@property
def organisations(self):
return [