darkhelm/notifications-api
1
0
Fork 0
mirror of https://github.com/GSA/notifications-api.git synced 2026-02-01 15:46:07 -05:00
Code Issues Packages Projects Releases Wiki Activity

Added job_status to marshmallow

Browse Source 
- ensured statues not deleted on test runs
- returns in API call

Merge branch 'add-new-column-to-jobs-for-delayed-sending' into scheduled-delivery-of-jobs

Conflicts:
	app/models.py
This commit is contained in:
Martyn Inglis
2016-08-24 14:35:22 +01:00
parent 48089e21e5 1e10c0485c
commit cf3c14dbbd
5 changed files with 70 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/models.py
View File

@@ -310,7 +310,7 @@ JOB_STATUS_SENDING_LIMITS_EXCEEDED = 'sending limits exceeded'
JOB_STATUS_SCHEDULED = 'scheduled'
class JobStatusTypes(db.Model):
class JobStatus(db.Model):
__tablename__ = 'job_status'
name = db.Column(db.String(255), primary_key=True)