From 0081a70d4b34f38cc5b57f18eff4139ecec6185b Mon Sep 17 00:00:00 2001 From: Rebecca Law Date: Thu, 19 Jul 2018 17:09:52 +0100 Subject: [PATCH] Fix the link on the data-retention/edit.html Adding new service_api_client methods to get data for the right amount of days. --- app/notify_client/service_api_client.py | 10 ++++++++-- .../views/service-settings/data-retention.html | 2 +- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/app/notify_client/service_api_client.py b/app/notify_client/service_api_client.py index b2d2f79b5..7f553d983 100644 --- a/app/notify_client/service_api_client.py +++ b/app/notify_client/service_api_client.py @@ -41,8 +41,14 @@ class ServiceAPIClient(NotifyAdminAPIClient): """ return self.get('/service/{0}'.format(service_id)) - def get_service_statistics(self, service_id, today_only): - return self.get('/service/{0}/statistics'.format(service_id), params={'today_only': today_only})['data'] + # def get_service_statistics(self, service_id, today_only): + # return self.get('/service/{0}/statistics'.format(service_id), params={'today_only': today_only})['data'] + + def get_service_statistics(self, service_id, limit_days=7): + return self.get('/service/{0}/statistics'.format(service_id), params={'limit_days': limit_days})['data'] + + def get_service_statistics_for_today(self, service_id): + return self.get('/service/{0}/statistics'.format(service_id), params={'today_only': True})['data'] def get_services(self, params_dict=None): """ diff --git a/app/templates/views/service-settings/data-retention.html b/app/templates/views/service-settings/data-retention.html index 0802ee123..a48dea2cf 100644 --- a/app/templates/views/service-settings/data-retention.html +++ b/app/templates/views/service-settings/data-retention.html @@ -40,7 +40,7 @@ {% call row() %} {{ text_field(item.notification_type | format_notification_type)}} {{ text_field(item.days_of_retention) }} - {{ edit_field('Change', url_for('.link_service_to_organisation', service_id=current_service.id)) }} + {{ edit_field('Change', url_for('.edit_data_retention', service_id=current_service.id, data_retention_id=item.id)) }} {% endcall %} {% endfor %}