Temporarily add generic 'nhs'

This commit is contained in:
Pea Tyczynska
2019-07-19 15:13:24 +01:00
parent aa88252cf7
commit edda816ffa
3 changed files with 3 additions and 2 deletions

View File

@@ -288,7 +288,7 @@ def dao_create_service(
service.crown = organisation.crown
elif service.organisation_type in CROWN_ORGANISATION_TYPES:
service.crown = True
elif service.organisation_type in (NON_CROWN_ORGANISATION_TYPES + ['nhs']):
elif service.organisation_type in NON_CROWN_ORGANISATION_TYPES:
service.crown = False
service.count_as_live = not user.platform_admin

View File

@@ -330,7 +330,7 @@ ORGANISATION_TYPES = [
]
CROWN_ORGANISATION_TYPES = ["nhs_central"]
NON_CROWN_ORGANISATION_TYPES = ["local", "nhs_local", "emergency_service", "school_or_college"]
NON_CROWN_ORGANISATION_TYPES = ["local", "nhs_local", "emergency_service", "school_or_college", "nhs"]
class OrganisationTypes(db.Model):

View File

@@ -29,6 +29,7 @@ def upgrade():
{'name': x, 'is_crown': y, 'annual_free_sms_fragment_limit': z} for x, y, z in [
["central", None, 250000],
["local", False, 25000],
["nhs", None, 25000],
["nhs_central", True, 250000],
["nhs_local", False, 25000],
["emergency_service", False, 25000],