darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-06-21 13:43:14 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #596 from alphagov/update-deskpro-key-name

Browse Source 
Use correct key to set team in DeskPro
This commit is contained in:
Chris Hill-Scott
2016-05-23 09:32:42 +01:00
parent 5bcd2a6378 228abf4526
commit ab239615c0
4 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/main/views/feedback.py
View File

@@ -11,7 +11,7 @@ def feedback():
data = {
'person_email': current_app.config.get('DESKPRO_PERSON_EMAIL'),
'department_id': current_app.config.get('DESKPRO_DEPT_ID'),
'assigned_agent_team_id': current_app.config.get('DESKPRO_ASSIGNED_AGENT_TEAM_ID'),
'agent_team_id': current_app.config.get('DESKPRO_ASSIGNED_AGENT_TEAM_ID'),
'subject': 'Notify feedback',
'message': 'Environment: {}\n\n{}\n{}\n{}'.format(
url_for('main.index', _external=True),
@@ -35,7 +35,7 @@ def feedback():
resp.json())
)
abort(500, "Feedback submission failed")
flash("Thanks, we've received your feedback", 'default_with_tick')
flash("Thanks, we’ve received your feedback", 'default_with_tick')
return redirect(url_for('.feedback'))
return render_template('views/feedback.html', form=form)

2
app/main/views/service_settings.py
View File

@@ -102,7 +102,7 @@ def service_request_to_go_live(service_id):
data = {
'person_email': current_app.config.get('DESKPRO_PERSON_EMAIL'),
'department_id': current_app.config.get('DESKPRO_DEPT_ID'),
'assigned_agent_team_id': current_app.config.get('DESKPRO_ASSIGNED_AGENT_TEAM_ID'),
'agent_team_id': current_app.config.get('DESKPRO_ASSIGNED_AGENT_TEAM_ID'),
'subject': 'Request to go live',
'message': "From {} <{}> on behalf of {} ({})\n\nUsage estimate\n---\n\n{}".format(
current_user.name,

6
tests/app/main/views/test_feedback.py
View File

@@ -48,7 +48,7 @@ def test_post_feedback_with_no_name_email(app_, mocker):
ANY,
data={
'department_id': ANY,
'assigned_agent_team_id': ANY,
'agent_team_id': ANY,
'subject': 'Notify feedback',
'message': 'Environment: http://localhost/\n\n\n\nblah',
'person_email': ANY},
@@ -70,7 +70,7 @@ def test_post_feedback_with_name_email(app_, mocker):
data={
'subject': 'Notify feedback',
'department_id': ANY,
'assigned_agent_team_id': ANY,
'agent_team_id': ANY,
'message': 'Environment: http://localhost/\n\nSteve Irwin\nrip@gmail.com\nblah',
'person_email': ANY},
headers=ANY)
@@ -96,7 +96,7 @@ def test_log_error_on_post(app_, mocker):
data={
'subject': 'Notify feedback',
'department_id': ANY,
'assigned_agent_team_id': ANY,
'agent_team_id': ANY,
'message': 'Environment: http://localhost/\n\nSteve Irwin\nrip@gmail.com\nblah',
'person_email': ANY},
headers=ANY)

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

@@ -239,7 +239,7 @@ def test_should_redirect_after_request_to_go_live(
data={
'subject': 'Request to go live',
'department_id': ANY,
'assigned_agent_team_id': ANY,
'agent_team_id': ANY,
'message': 'From Test User <test@user.gov.uk> on behalf of Test Service (http://localhost/services/6ce466d0-fd6a-11e5-82f5-e0accb9d11a6/dashboard)\n\nUsage estimate\n---\n\nOne million messages', # noqa
'person_email': ANY
},