darkhelm/notifications-api
1
0
Fork 0
mirror of https://github.com/GSA/notifications-api.git synced 2025-12-23 00:41:35 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into remove-nasty-query-from-dashboard

Browse Source 
Conflicts:
	tests/app/service/test_rest.py
This commit is contained in:
Martyn Inglis
2017-06-01 14:47:00 +01:00
parent 7f65aa3eef e068f6815f
commit a60d40bbc0
4 changed files with 70 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/models.py
View File

@@ -190,7 +190,7 @@ class Service(db.Model, Versioned):
created_by_id = db.Column(UUID(as_uuid=True), db.ForeignKey('users.id'), index=True, nullable=False)
reply_to_email_address = db.Column(db.Text, index=False, unique=False, nullable=True)
letter_contact_block = db.Column(db.Text, index=False, unique=False, nullable=True)
sms_sender = db.Column(db.String(11), nullable=True, default=lambda: current_app.config['FROM_NUMBER'])
sms_sender = db.Column(db.String(11), nullable=False, default=lambda: current_app.config['FROM_NUMBER'])
organisation_id = db.Column(UUID(as_uuid=True), db.ForeignKey('organisation.id'), index=True, nullable=True)
organisation = db.relationship('Organisation')
dvla_organisation_id = db.Column(