Rename model to AllOrganisations

This makes it clearer that this model collection isn’t the organisations
for a user or a service or some other entity, like most model
collections are.

It will also lets us make a separate Organisations model, without the
name conflicting.
This commit is contained in:
Chris Hill-Scott
2021-09-28 09:02:15 +01:00
parent cbbc58e649
commit 029682d561
5 changed files with 10 additions and 10 deletions

View File

@@ -3,7 +3,7 @@ from flask_login import current_user
from app import status_api_client
from app.main import main
from app.models.organisation import Organisations
from app.models.organisation import AllOrganisations
from app.utils import PermanentRedirect
from app.utils.user import user_is_logged_in
@@ -24,7 +24,7 @@ def choose_account():
org_count, live_service_count = None, None
if current_user.platform_admin:
org_count, live_service_count = (
len(Organisations()),
len(AllOrganisations()),
status_api_client.get_count_of_live_services_and_organisations()['services'],
)
return render_template(

View File

@@ -41,7 +41,7 @@ from app.main.views.dashboard import (
requested_and_current_financial_year,
)
from app.main.views.service_settings import get_branding_as_value_and_label
from app.models.organisation import Organisation, Organisations
from app.models.organisation import AllOrganisations, Organisation
from app.models.user import InvitedOrgUser, User
from app.utils.user import user_has_permissions, user_is_platform_admin
@@ -51,7 +51,7 @@ from app.utils.user import user_has_permissions, user_is_platform_admin
def organisations():
return render_template(
'views/organisations/index.html',
organisations=Organisations(),
organisations=AllOrganisations(),
search_form=SearchByNameForm(),
)
@@ -116,7 +116,7 @@ def add_organisation_from_nhs_local_service(service_id):
form = AddNHSLocalOrganisationForm(organisation_choices=[
(organisation.id, organisation.name)
for organisation in Organisations()
for organisation in AllOrganisations()
if organisation.organisation_type == Organisation.TYPE_NHS_LOCAL
])

View File

@@ -204,6 +204,6 @@ class Organisation(JSONModel):
return organisations_client.get_services_and_usage(self.id, financial_year)
class Organisations(ModelList):
class AllOrganisations(ModelList):
client_method = organisations_client.get_organisations
model = Organisation