From fbf30129b0695f79ac692efea3f4d1b415030ba5 Mon Sep 17 00:00:00 2001 From: Nicholas Staples Date: Thu, 28 Apr 2016 14:02:51 +0100 Subject: [PATCH] Update app to the latest notifications_utils. --- app/main/views/send.py | 1 - app/templates/views/check.html | 12 ++++++------ requirements.txt | 2 +- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/app/main/views/send.py b/app/main/views/send.py index 28947bcbb..f18bc8c19 100644 --- a/app/main/views/send.py +++ b/app/main/views/send.py @@ -237,7 +237,6 @@ def check_messages(service_id, template_type, upload_id): session['upload_data']['notification_count'] = len(list(recipients.rows)) session['upload_data']['valid'] = not recipients.has_errors - return render_template( 'views/check.html', recipients=recipients, diff --git a/app/templates/views/check.html b/app/templates/views/check.html index 3ceeb76c7..5cbcbc4ee 100644 --- a/app/templates/views/check.html +++ b/app/templates/views/check.html @@ -109,19 +109,19 @@ ) %} {{ index_field(item.index + 2) }} {% for column in recipients.column_headers %} - {% if item[column].error %} + {% if item['columns'][column].error %} {% call field() %} - {{ item[column].error }} - {{ item[column].data if item[column].data != None }} + {{ item['columns'][column].error }} + {{ item['columns'][column].data if item['columns'][column].data != None }} {% endcall %} - {% elif item[column].ignore %} + {% elif item['columns'][column].ignore %} {% call field(status='default') %} - {{ item[column].data if item[column].data != None }} + {{ item['columns'][column].data if item['columns'][column].data != None }} {% endcall %} {% else %} - {{ text_field(item[column].data) }} + {{ text_field(item['columns'][column].data) }} {% endif %} {% endfor %} {% endcall %} diff --git a/requirements.txt b/requirements.txt index dd73379b3..f05778464 100644 --- a/requirements.txt +++ b/requirements.txt @@ -9,4 +9,4 @@ py-gfm==0.1.2 git+https://github.com/alphagov/notifications-python-client.git@0.5.0#egg=notifications-python-client==0.5.0 -git+https://github.com/alphagov/notifications-utils.git@4.3.0#egg=notifications-utils==4.3.0 +git+https://github.com/alphagov/notifications-utils.git@5.1.0#egg=notifications-utils==5.1.0