Merge branch 'master' into research-mode-implementation

This commit is contained in:
Martyn Inglis
2016-06-02 09:28:35 +01:00
5 changed files with 93 additions and 47 deletions

View File

@@ -335,7 +335,7 @@ def sample_notification(notify_db,
notification_id = uuid.uuid4()
if provider_name is None:
provider = mmg_provider() if template.template_type == 'sms' else ses_provider()
provider_name = mmg_provider().identifier if template.template_type == 'sms' else ses_provider().identifier
if to_field:
to = to_field
@@ -359,7 +359,7 @@ def sample_notification(notify_db,
data['job_row_number'] = job_row_number
notification = Notification(**data)
if create:
dao_create_notification(notification, template.template_type, provider.identifier)
dao_create_notification(notification, template.template_type, provider_name)
return notification