darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-08-25 16:54:03 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #710 from alphagov/service-name-tidy

Browse Source 
Tidy up ‘change service name’ page
This commit is contained in:
Chris Hill-Scott
2016-06-20 16:23:12 +01:00
committed by GitHub
parent 74b17588a2 e44d9895ce
commit daa626539c
4 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/main/forms.py
View File

@@ -168,7 +168,7 @@ class ServiceNameForm(Form):
super(ServiceNameForm, self).__init__(*args, **kwargs) super(ServiceNameForm, self).__init__(*args, **kwargs)
name = StringField( name = StringField(
u'New name', u'Service name',
validators=[ validators=[
DataRequired(message='Can’t be empty') DataRequired(message='Can’t be empty')
]) ])

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

@@ -42,6 +42,9 @@ def service_settings(service_id):
def service_name_change(service_id): def service_name_change(service_id):
form = ServiceNameForm(service_api_client.find_all_service_email_from) form = ServiceNameForm(service_api_client.find_all_service_email_from)
if request.method == 'GET':
form.name.data = current_service.get('name')
if form.validate_on_submit(): if form.validate_on_submit():
session['service_name_change'] = form.name.data session['service_name_change'] = form.name.data
return redirect(url_for('.service_name_change_confirm', service_id=service_id)) return redirect(url_for('.service_name_change_confirm', service_id=service_id))

13
app/templates/views/service-settings/name.html
View File

@@ -13,12 +13,13 @@
<div class="grid-row"> <div class="grid-row">
<div class="column-three-quarters"> <div class="column-three-quarters">
<p>Users will see your service name:</p> <div class="form-group">
<p>Users will see your service name:</p>
<ul class="list-bullet"> <ul class="list-bullet">
<li>at the start of every text message, eg ‘Vehicle tax: we received your payment, thank you’</li> <li>at the start of every text message, eg ‘Vehicle tax: we received your payment, thank you’</li>
<li>as your email sender name</li> <li>as your email sender name</li>
</ul> </ul>
</div>
<form method="post"> <form method="post">
{{ textbox(form.name) }} {{ textbox(form.name) }}

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

@@ -34,8 +34,9 @@ def test_should_show_service_name(app_,
response = client.get(url_for( response = client.get(url_for(
'main.service_name_change', service_id=service_one['id'])) 'main.service_name_change', service_id=service_one['id']))
assert response.status_code == 200 assert response.status_code == 200
resp_data = response.get_data(as_text=True) page = BeautifulSoup(response.data.decode('utf-8'), 'html.parser')
assert 'Change your service name' in resp_data assert page.find('h1').text == 'Change your service name'
assert page.find('input', attrs={"type": "text"})['value'] == 'service one'
app.service_api_client.get_service.assert_called_with(service_one['id']) app.service_api_client.get_service.assert_called_with(service_one['id'])