darkhelm/notifications-api
1
0
Fork 0
mirror of https://github.com/GSA/notifications-api.git synced 2026-07-23 09:29:43 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into add-update-multiple-sms-sender

Browse Source
This commit is contained in:
Rebecca Law
2017-10-18 11:18:44 +01:00
parent edba490c72 92b50a26d3
commit 1a463cba1f
4 changed files with 44 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/models.py
View File

@@ -228,6 +228,10 @@ class Service(db.Model, Versioned):
nullable=False,
default=BRANDING_GOVUK
)
organisation_type = db.Column(
db.String(255),
nullable=True,
)
association_proxy('permissions', 'service_permission_types')

1
app/schemas.py
View File

@@ -177,6 +177,7 @@ class ServiceSchema(BaseSchema):
created_by = field_for(models.Service, 'created_by', required=True)
organisation = field_for(models.Service, 'organisation')
organisation_type = field_for(models.Service, 'organisation_type')
branding = field_for(models.Service, 'branding')
dvla_organisation = field_for(models.Service, 'dvla_organisation')
free_sms_fragment_limit = field_for(models.Service, 'free_sms_fragment_limit')