Chris Hill-Scott
a4d00cf67e
Merge pull request #266 from alphagov/better-placeholder-guidance
...
Fix bugs and gripes with adding and editing templates
2016-03-14 10:45:00 +00:00
Chris Hill-Scott
144de21745
Make nav and page headings reflect permissions
...
> If you have the Edit templates permission but not the Send messages permission, the navigation should read
>
> - Text message templates
> - Email templates
> - Letter templates
>
> The page headings should also read
>
> - Text message templates
> - Email templates
> - Letter templates
respectively
https://www.pivotaltracker.com/story/show/115488955
2016-03-14 10:39:53 +00:00
Chris Hill-Scott
eea8ae5be4
Move ‘new thing’ buttons alongside heading
...
On the send messages and manage team pages we have big green buttons for
adding/inviting a new template or team member.
On the add template page it was at the bottom, and often got missed.
On the manage team page it was at the top, but maybe too prominent because it’s
big and green.
This commit tries putting it in the top right of the page instead (except when
the template page is empty, in which case it’s unchanged).
2016-03-14 10:39:53 +00:00
Chris Hill-Scott
370fd68a2c
Fix innaccurate headings on add/edit template page
...
The same `.html` file is shared between adding a template and editing a
template.
The page heading needs to be contextual to the URL, either ‘add’ or ‘edit’.
Somewhere along the way this got lost; this commit reinstates it.
2016-03-14 10:39:52 +00:00
Chris Hill-Scott
b4e6f734c8
Reword the help text about adding placeholders
...
In research we’ve seen users struggle with this. Often they’d type
((Joe Bloggs)) or ((XX/XX/XXXX)) instead of a sensible name.
Lets see if explaining it differently helps.
2016-03-14 10:39:52 +00:00
Chris Hill-Scott
562fc4e73c
Remove ‘cancel’ links from edit template page
...
Since cancel just takes you back to the list of templates, which is accessible
from the left nav, it’s only adding clutter to the page.
2016-03-14 10:39:52 +00:00
Adam Shimali
164bdad4f2
Change new invite registration flow to only need
...
sms for verification.
This may change again soon with story to split 2 factor
pages, but for now is correct.
2016-03-14 09:43:34 +00:00
NIcholas Staples
f41e762d98
Merge pull request #270 from alphagov/fix-error-styling-invite-page
...
Fix error message spacing on yes/no pattern
2016-03-14 09:43:19 +00:00
NIcholas Staples
cf195b3a16
Merge pull request #271 from alphagov/remove-dao-layer
...
Start to remove the dao layer
2016-03-14 09:42:22 +00:00
NIcholas Staples
bf57124817
Merge pull request #272 from alphagov/remove-sender
...
Remove sender module, code was moved to api.
2016-03-14 09:41:06 +00:00
Chris Hill-Scott
e1e86e4df5
Fix error message spacing on yes/no pattern
...
Error messages were added to the yes/no fields on the invite user page in:
4c323a9a99
2016-03-14 09:13:28 +00:00
Rebecca Law
34e7d21855
Remove sender module, code was moved to api.
2016-03-13 09:39:29 +00:00
Rebecca Law
6e3bf97af4
Remove services_dao.insert_new_service.
...
Update api_client.create_service to return the service id.
Fix unit tests.
2016-03-13 09:37:17 +00:00
Rebecca Law
9d2fbca557
Merge pull request #264 from alphagov/fix-sign-in-tests
...
Fix to sign in test and user model
2016-03-11 14:59:49 +00:00
Chris Hill-Scott
d1e83d1196
Merge pull request #261 from alphagov/unbreak-my-links
...
Fix broken links in yellow box on dashboard
2016-03-11 14:09:44 +00:00
Adam Shimali
f8b212fd21
Merge pull request #265 from alphagov/invite-permissions-fix
...
Bug fix for passing list of empty string if no permissions selected for
2016-03-11 13:55:06 +00:00
Adam Shimali
069a549d57
Bug fix for passing list of empty string if no permissions selected for
...
invite.
Send empty list instead.
2016-03-11 12:50:25 +00:00
Rebecca Law
58c748e703
Noticed that the api was being called when running the unit tests.
...
This also lead me to find the the failed_login_in count was always returning 0.
2016-03-11 11:47:21 +00:00
Rebecca Law
f81dccc513
Merge pull request #263 from alphagov/error-handling
...
Fix bug in error handlers.
2016-03-11 10:52:53 +00:00
Rebecca Law
ccaa5410b3
Removed test as it was not testing the right thing
2016-03-11 10:47:16 +00:00
Rebecca Law
f63a85d003
Fix bug in error handlers.
...
Correct spelling error
2016-03-11 10:16:06 +00:00
Chris Hill-Scott
d9fd1d5117
Fix broken links in yellow box on dashboard
...
Links were missing the double mustaches.
2016-03-11 08:43:45 +00:00
Chris Hill-Scott
02dfb2820d
Merge pull request #256 from alphagov/name-1-not-test-name
...
Use ‘name 1’ when sending yourself a message
2016-03-10 19:41:12 +00:00
Rebecca Law
bb82413718
Merge pull request #260 from alphagov/error-handling
...
Error handling
2016-03-10 16:29:59 +00:00
Adam Shimali
dfcce2545d
Merge pull request #259 from alphagov/verify-code-fix
...
Only actually call api to verify code if both are present in form.
2016-03-10 15:06:34 +00:00
Rebecca Law
4ba801edab
Merge branch 'master' into error-handling
...
Conflicts:
app/main/views/invites.py
2016-03-10 15:03:21 +00:00
Adam Shimali
54f871dfba
Only actually call api to verify code if both are present in form.
2016-03-10 14:57:29 +00:00
Rebecca Law
735ca07dee
Handle HTTPError from API and routing errors from flask.
...
Removed catching the HTTPError where applicable.
2016-03-10 14:56:47 +00:00
NIcholas Staples
8c250a7853
Merge pull request #258 from alphagov/handle_duplicate_service_name
...
Handle duplicate service name
2016-03-10 14:55:35 +00:00
Nicholas Staples
6ea8491b39
Service name uniqueness handled in all cases and tests passing.
2016-03-10 14:29:31 +00:00
Nicholas Staples
adf08fd00e
Merge remote-tracking branch 'origin/master' into handle_duplicate_service_name
2016-03-10 13:14:16 +00:00
Adam Shimali
7b18543f02
Merge pull request #257 from alphagov/double-accept-bugfix
...
Check user invite status not accepted before proceeding with flow.
2016-03-10 12:42:38 +00:00
Chris Hill-Scott
25103aaef0
Use ‘name 1’ when sending yourself a message
...
We reckon this is better than ‘test name’, ‘test date’, etc.
2016-03-10 12:03:26 +00:00
Adam Shimali
986edfa317
Check user invite status not accepted before proceeding with flow.
2016-03-10 11:57:40 +00:00
Rebecca Law
f6d98b63ea
Refactored register_errorhandlers so that it handles HTTPError
...
Remove most cases where we catch HTTPError
2016-03-10 11:53:29 +00:00
Chris Hill-Scott
36cab58864
Merge pull request #254 from alphagov/placeholder-preview-html-fix
...
Fix bug with ‘ghost’ links in template textbox
2016-03-10 09:32:03 +00:00
Adam Shimali
7dd5eb458f
Merge pull request #255 from alphagov/bugfix-permissions-validation
...
Added error message if no permissions chosen
2016-03-09 18:03:10 +00:00
Adam Shimali
4c323a9a99
Added error message on template for failing to choose permissions.
...
For error message over ride from WTF forms radio field created
custom field.
2016-03-09 17:42:47 +00:00
Chris Hill-Scott
836fe77c37
Fix bug with ‘ghost’ links in template textbox
...
This is a bug with the code that highlights placeholders.
It was taking the value of the textbox and copying it straight into the HTML
of the layer that contains the blue lozenges. This meant that any HTML that the
user typed into the textbox was rendered by the browser.
This commit fixes the bug by:
1. taking the contents of the textbox
2. copying it to the _text_ (not inner HTML) of a temporary `<div>`
3. taking the inner HTML of that `<div>` (whose text has been encoded with HTML
entities in step 2., eg `>` becomes `>`)
4. using that for the HTML content of the layer with the blue lozenges
2016-03-09 16:58:51 +00:00
Adam Shimali
47079f1128
Merge pull request #252 from alphagov/same-registration-email-bug-fix
...
Fix for duplicate email registration
2016-03-09 16:34:59 +00:00
Adam Shimali
0095e4b608
Updated from git comments. Return status code 400 for duplicate
...
email address.
2016-03-09 16:05:17 +00:00
Adam Shimali
33c92a4e29
Fix for duplicate email registration that meant flash error not being
...
displayed.
The error message does not specify the error is a duplicate email
address so as not to reveal which emails are current user accounts.
2016-03-09 16:05:17 +00:00
Adam Shimali
eea5bfe749
Merge pull request #253 from alphagov/delete-user-bug-fix
...
Removed links for deleting users. Also removed view function
2016-03-09 16:04:09 +00:00
Adam Shimali
9523e224bc
Removed links for deleting users. Also removed view function
...
that allowed deletion of users.
2016-03-09 15:30:40 +00:00
Adam Shimali
2acc496734
Merge pull request #251 from alphagov/request-golive-bugfix
...
View function for request go live was always calling update service.
2016-03-09 15:15:50 +00:00
minglis
4900528222
Merge pull request #250 from alphagov/change-default-service-limit
...
Default service limit reduced to 50
2016-03-09 15:08:23 +00:00
Adam Shimali
be5aeb0676
View function for request go live was always calling update service.
...
Actually this should be no op until whatever workflow will take place
in the real world is implemented.
For the moment just display flash message to say request being
processed and do nothing.
2016-03-09 15:02:05 +00:00
NIcholas Staples
eeb0c5fdb7
Merge pull request #249 from alphagov/permission_route_tests
...
Permission route tests
2016-03-09 14:58:49 +00:00
Chris Hill-Scott
8e0a043d31
Merge pull request #247 from alphagov/email-flow-fixes
...
Email flow fixes
2016-03-09 14:24:41 +00:00
Martyn Inglis
8a4e8bd3f6
Default service limit reduced to 50
2016-03-09 14:22:35 +00:00
