Merge branch 'master' into use_new_template_stats_endpoint

Conflicts:
	app/notify_client/template_statistics_api_client.py
This commit is contained in:
Martyn Inglis
2016-08-22 16:47:42 +01:00
9 changed files with 16 additions and 11 deletions

View File

@@ -17,11 +17,16 @@ class TemplateStatisticsApiClient(BaseAPIClient):
if limit_days is not None:
params['limit_days'] = limit_days
return self.get(
response = self.get(
url='/service/{}/template-statistics'.format(service_id),
params=params
)['data']
if len(response) > 0 and 'template' in response[0]:
return response
return []
def get_template_statistics_for_template(self, service_id, template_id):
return self.get(