darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-08-20 22:40:31 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1229 from alphagov/redirect-letter-jobs-post

Browse Source 
Redirect after letter-jobs post
This commit is contained in:
kentsanggds
2017-04-13 15:11:31 +01:00
committed by GitHub
parent 8c5ec33825 b02df9ba4b
commit 569cd93c49
2 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
app/main/views/letter_jobs.py
View File

@@ -1,6 +1,6 @@
import datetime import datetime
from flask import render_template, request from flask import redirect, render_template, request, session, url_for
from flask_login import login_required from flask_login import login_required
from app import letter_jobs_client, format_datetime_24h from app import letter_jobs_client, format_datetime_24h
@@ -12,20 +12,27 @@ from app.utils import user_has_permissions
@login_required @login_required
@user_has_permissions(admin_override=True) @user_has_permissions(admin_override=True)
def letter_jobs(): def letter_jobs():
msg = ''
letter_jobs_list = letter_jobs_client.get_letter_jobs() letter_jobs_list = letter_jobs_client.get_letter_jobs()
if request.method == 'POST': if request.method == 'POST':
if len(request.form.getlist('job_id')) > 0: if len(request.form.getlist('job_id')) > 0:
job_ids = request.form.getlist('job_id') job_ids = request.form.getlist('job_id')
session['job_ids'] = job_ids
response = letter_jobs_client.send_letter_jobs(job_ids) response = letter_jobs_client.send_letter_jobs(job_ids)
msg = response['response'] msg = response['response']
for job_id in job_ids:
job = [j for j in letter_jobs_list if job_id == j['id']][0]
job['sending'] = 'sending'
else: else:
msg = 'No jobs selected' msg = 'No jobs selected'
session['msg'] = msg
return redirect(url_for('main.letter_jobs'))
msg = session.pop('msg', None)
job_ids = session.pop('job_ids', None)
if job_ids:
for job_id in job_ids:
job = [j for j in letter_jobs_list if job_id == j['id']][0]
job['sending'] = 'sending'
return render_template('views/letter-jobs.html', letter_jobs_list=letter_jobs_list, message=msg) return render_template('views/letter-jobs.html', letter_jobs_list=letter_jobs_list, message=msg)

5
tests/app/main/views/test_letter_jobs.py
View File

@@ -75,7 +75,8 @@ def test_post_letter_jobs_select_1_letter_job_submits_1_job(logged_in_platform_a
mock_get_letters = mocker.patch('app.letter_jobs_client.get_letter_jobs', return_value=valid_letter_jobs) mock_get_letters = mocker.patch('app.letter_jobs_client.get_letter_jobs', return_value=valid_letter_jobs)
mock_send_letters = mocker.patch('app.letter_jobs_client.send_letter_jobs', return_value=send_letter_jobs_response) mock_send_letters = mocker.patch('app.letter_jobs_client.send_letter_jobs', return_value=send_letter_jobs_response)
response = logged_in_platform_admin_client.post(url_for('main.letter_jobs'), data=letter_jobs_first_selected) response = logged_in_platform_admin_client.post(url_for('main.letter_jobs'), data=letter_jobs_first_selected,
follow_redirects=True)
assert mock_get_letters.called assert mock_get_letters.called
assert mock_send_letters.called assert mock_send_letters.called
@@ -103,7 +104,7 @@ def test_post_letter_jobs_none_selected_shows_message(logged_in_platform_admin_c
mock_get_letters = mocker.patch('app.letter_jobs_client.get_letter_jobs', return_value=valid_letter_jobs) mock_get_letters = mocker.patch('app.letter_jobs_client.get_letter_jobs', return_value=valid_letter_jobs)
mock_send_letters = mocker.patch('app.letter_jobs_client.send_letter_jobs', return_value=send_letter_jobs_response) mock_send_letters = mocker.patch('app.letter_jobs_client.send_letter_jobs', return_value=send_letter_jobs_response)
response = logged_in_platform_admin_client.post(url_for('main.letter_jobs'), data={}) response = logged_in_platform_admin_client.post(url_for('main.letter_jobs'), data={}, follow_redirects=True)
assert mock_get_letters.called assert mock_get_letters.called
assert not mock_send_letters.called assert not mock_send_letters.called