Merged code from master / fixed conflicts

This commit is contained in:
Martyn Inglis
2016-09-05 13:39:03 +01:00
parent 1732415b45
commit 5f561001eb

View File

@@ -49,13 +49,17 @@ class JobApiClient(BaseAPIClient):
return self.get(url='/service/{}/job'.format(service_id), params=params)
def create_job(self, job_id, service_id, template_id, original_file_name, notification_count):
def create_job(self, job_id, service_id, template_id, original_file_name, notification_count, scheduled_for=None):
data = {
"id": job_id,
"template": template_id,
"original_file_name": original_file_name,
"notification_count": notification_count
}
if scheduled_for:
data.update({'scheduled_for': scheduled_for})
data = _attach_current_user(data)
job = self.post(url='/service/{}/job'.format(service_id), data=data)