WIP refactor preview pdf

This commit is contained in:
Ken Tsang
2018-02-28 14:18:42 +00:00
parent 2b10060e49
commit 6279169b18
3 changed files with 13 additions and 12 deletions

View File

@@ -90,8 +90,6 @@ def view_notification(service_id, notification_id):
@user_has_permissions('view_activity', admin_override=True)
def view_letter_notification_as_preview(service_id, notification_id, filetype):
print("\n\nview_letter_notification_as_preview\n\n")
if filetype not in ('pdf', 'png'):
abort(404)
@@ -113,13 +111,13 @@ def view_letter_notification_as_preview(service_id, notification_id, filetype):
preview = notification_api_client.get_notification_letter_preview(
service_id,
template.id,
notification_id,
filetype,
page=request.args.get('page')
)
return base64.b64decode(preview['content']), preview['status'], ItemsView(dict(preview['headers']))
# return base64.b64decode(preview['content']), preview['status'], ItemsView(dict(preview['headers']))
return base64.b64decode(preview['content'])
@main.route("/services/<service_id>/notification/<notification_id>.json")

View File

@@ -79,11 +79,10 @@ class NotificationApiClient(NotifyAdminAPIClient):
notification['status'] = 'accepted'
return notifications
def get_notification_letter_preview(self, service_id, template_id, notification_id, file_type, page=None):
def get_notification_letter_preview(self, service_id, notification_id, file_type, page=None):
get_url = '/service/{}/template/{}/pdf-preview/{}/{}{}'.format(
get_url = '/service/{}/template/preview/{}/{}{}'.format(
service_id,
template_id,
notification_id,
file_type,
'?page={}'.format(page) if page else ''