darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-09-02 17:48:50 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2008 from alphagov/template-id-back-in-session

Browse Source 
Put template_id back in the session
This commit is contained in:
Chris Hill-Scott
2018-04-04 15:36:30 +01:00
committed by GitHub
parent fc846cf4a2 b2722a0cd7
commit bf58a4347b
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/main/views/send.py
View File

@@ -547,6 +547,7 @@ def _check_messages(service_id, template_id, upload_id, preview_row, letters_as_
if any(recipients) and not recipients.has_errors: if any(recipients) and not recipients.has_errors:
session['file_uploads'][upload_id]['notification_count'] = len(recipients) session['file_uploads'][upload_id]['notification_count'] = len(recipients)
session['file_uploads'][upload_id]['template_id'] = str(template_id)
session['file_uploads'][upload_id]['valid'] = True session['file_uploads'][upload_id]['valid'] = True
else: else:
session['file_uploads'].pop(upload_id) session['file_uploads'].pop(upload_id)

2
tests/app/main/views/test_send.py
View File

@@ -1443,9 +1443,9 @@ def test_upload_csvfile_with_valid_phone_shows_all_numbers(
follow_redirects=True follow_redirects=True
) )
with logged_in_client.session_transaction() as sess: with logged_in_client.session_transaction() as sess:
assert 'template_id' not in sess['file_uploads'][fake_uuid]
assert 'original_file_name' not in sess['file_uploads'][fake_uuid] assert 'original_file_name' not in sess['file_uploads'][fake_uuid]
assert sess['file_uploads'][fake_uuid]['notification_count'] == 53 assert sess['file_uploads'][fake_uuid]['notification_count'] == 53
assert sess['file_uploads'][fake_uuid]['template_id'] == fake_uuid
assert sess['file_uploads'][fake_uuid]['valid'] is True assert sess['file_uploads'][fake_uuid]['valid'] is True
content = response.get_data(as_text=True) content = response.get_data(as_text=True)