Add org types table

This commit is contained in:
Pea Tyczynska
2019-07-10 18:17:33 +01:00
parent 663ab6d96b
commit 9dfc550f46
9 changed files with 93 additions and 15 deletions

View File

@@ -101,9 +101,14 @@ def dao_add_service_to_organisation(service, organisation_id):
organisation.services.append(service)
service.organisation_type = organisation.organisation_type
service.crown = organisation.crown
db.session.add(service)
def dao_get_invited_organisation_user(user_id):
return InvitedOrganisationUser.query.filter_by(id=user_id).one()

View File

@@ -41,6 +41,7 @@ from app.models import (
EMAIL_TYPE,
INTERNATIONAL_SMS_TYPE,
KEY_TYPE_TEST,
NON_CROWN_ORGANISATION_TYPES,
SMS_TYPE,
LETTER_TYPE,
)
@@ -282,7 +283,10 @@ def dao_create_service(
service.id = service_id or uuid.uuid4() # must be set now so version history model can use same id
service.active = True
service.research_mode = False
service.crown = service.organisation_type == 'central'
if organisation:
service.crown = organisation.crown
elif service.organisation_type in (NON_CROWN_ORGANISATION_TYPES + ['nhs']):
service.crown = False
service.count_as_live = not user.platform_admin
for permission in service_permissions: