Commit Graph

1249 Commits

Author SHA1 Message Date
Rebecca Law
74a85a532b Merge branch 'master' into forgot-password 2016-03-09 10:47:00 +00:00
Rebecca Law
87496aa884 Revert config changes so it doesn't break local dev builds.
Update tests
2016-03-09 09:29:35 +00:00
Chris Hill-Scott
c1bf48f91e Don’t catch exceptions if API fails to create job
There is no good reason why the API should fail to create a job at this point.
If it’s returning a 404, this is an error, and we should be monitoring for it.
So we should let it raise, and throw a 500.
2016-03-08 18:36:23 +00:00
Chris Hill-Scott
93b4419bb2 Store phone number as the user entered it
It’s confusing to the user to have their phone number played back to them in
a format that they didn’t enter it. We’ve seen multiple times that people enter
0781… and then don’t recognise their own phone number when it’s played back as
+44781…

The API can handle phone numbers in any format as of
https://github.com/alphagov/notifications-api/pull/134

So there is no need to reformat the user’s phone number before storing it now.
2016-03-08 18:36:23 +00:00
Chris Hill-Scott
eb3734f1d1 Give the user better error messages for CSV files
Makes uses of the additions to utils in https://github.com/alphagov/notifications-utils/pull/9

This commit strips out a lot of the complex stuff that the views and templates
in this app were doing. There is now a cleaner separation of concerns:

- utils returns the number and type of errors in the csv
- `get_errors_for_csv` helper in this app maps the number and type of errors
  onto human-friendly error messages
- the view and template just doing the glueing-together of all the pieces

This is (hopefully) easier to understand, definitely makes the component
parts easier to test in isolation, and makes it easier to give more specific
error messages.
2016-03-08 18:36:22 +00:00
Chris Hill-Scott
0a5bf0bc44 Update to utils 2.0.0
…and remove the code from this app that has moved into utils.
2016-03-08 17:18:42 +00:00
Chris Hill-Scott
aa842875fc Merge pull request #245 from alphagov/permission_check_fix
Exact permissions added.
2016-03-08 17:17:18 +00:00
Chris Hill-Scott
dcdc9cd412 Merge pull request #244 from alphagov/revert-register-invite-html
Revert the disabled email field on the register-invited-user page
2016-03-08 17:01:38 +00:00
Nicholas Staples
a1c4600b29 Exact permissions added. 2016-03-08 16:54:07 +00:00
Rebecca Law
4678a12d33 Revert the disabled email field on the register-invited-user page, the email address is not being submitted on the form when registering 2016-03-08 16:29:05 +00:00
Rebecca Law
29ddad60e7 Merge branch 'master' into forgot-password
Conflicts:
	app/main/views/two_factor.py
2016-03-08 15:03:25 +00:00
Rebecca Law
e735d772fe Added a test to check that the password is updated when the password exists in the session object on the two-factor page. 2016-03-08 14:58:29 +00:00
Rebecca Law
d3825b253a Merge pull request #242 from alphagov/update_service_name_fix
Change put to post for service update.
2016-03-08 10:47:38 +00:00
Nicholas Staples
eb994ff189 Change put to post for service update. 2016-03-08 10:40:07 +00:00
NIcholas Staples
5f28d943a4 Merge pull request #236 from alphagov/show-completion-of-job
Show how complete a job is on dashboard
2016-03-08 08:55:59 +00:00
NIcholas Staples
b78a321d90 Merge pull request #238 from alphagov/show-invite-email
Show invite email
2016-03-08 08:49:00 +00:00
NIcholas Staples
877b59cf05 Merge pull request #240 from alphagov/invite-flash-messages
Flash message to confirm invitation accepted and user has been
2016-03-08 08:45:54 +00:00
Adam Shimali
9bc5d08d52 Flash message to confirm invitation accepted and user has been
added to service.
2016-03-08 08:18:41 +00:00
Rebecca Law
3e969b3640 Re-implement forgot password 2016-03-07 18:18:52 +00:00
Chris Hill-Scott
614e454186 Merge pull request #239 from alphagov/auto-remember-me
Removed remember me checkbox
2016-03-07 14:53:44 +00:00
Martyn Inglis
5429107f93 Removed remember me checkbox
- remember me functionality always applied.
2016-03-07 14:39:20 +00:00
Adam Shimali
5b37145f61 Wrap un editiable email address for invite in p tag to give
it some space from rest of form.
2016-03-07 14:09:03 +00:00
Adam Shimali
9941d72d4a Merge branch 'filter-invites' into show-invite-email 2016-03-07 14:03:13 +00:00
Adam Shimali
208a586948 Filter out accepted invites in template not client. 2016-03-07 13:59:54 +00:00
Adam Shimali
569f61578e Invited user email is shown on regiser from intive page but is not
editable.
2016-03-07 11:55:18 +00:00
Adam Shimali
ee86f400b0 Filter out accepted invites from manage users page
Added basic test of invite client.
2016-03-07 10:33:36 +00:00
minglis
48a8be9ea4 Merge pull request #234 from alphagov/invite-permissions-status
[WIP] Add call to api to update invitation to accepted.
2016-03-04 16:18:20 +00:00
Martyn Inglis
7e27700ca8 Show how complete a job is on dashboard 2016-03-04 15:59:56 +00:00
Rebecca Law
41b08b7ca1 Added from_user name and service name for the cancelled invitation message. 2016-03-04 15:17:04 +00:00
Rebecca Law
8074c6ea7f Add cancelled-invite html.
If a invited user accepts a cancelled invitation they are directed to a page telling them the invitation is cancelled.
Without this they were able to register and were added to the service.
2016-03-04 14:42:52 +00:00
Martyn Inglis
8a46031203 Merge branch 'staging' 2016-03-04 13:38:33 +00:00
Martyn Inglis
b70fc63a76 Setup travis for staging deploys 2016-03-04 13:27:57 +00:00
Chris Hill-Scott
049004c1b3 Merge pull request #235 from alphagov/fix-bad-first-column
Validate column heading.
2016-03-04 11:38:57 +00:00
Rebecca Law
e1de40429c Merge pull request #231 from alphagov/add_manage_service_permission
Add manage service permission
2016-03-04 11:07:34 +00:00
Rebecca Law
f6db12b094 Merge pull request #227 from alphagov/poll-job-page
Make job page poll for updates
2016-03-04 11:07:14 +00:00
Rebecca Law
e3c692ede7 Validate column heading.
Still need to show that it is the heading that is wrong.
2016-03-04 10:09:46 +00:00
Adam Shimali
a974e6e157 [WIP] Add call to api to update invitation to accepted.
When flow for invited user is complete, that is
when user has been added to service, update invitation
to accepted
2016-03-03 18:13:56 +00:00
Martyn Inglis
b62312ef64 Call update script 2016-03-03 17:07:48 +00:00
Rebecca Law
b9fcafa095 Merge pull request #232 from alphagov/invite-permissions-status
[WIP] Add permissions to invited user
2016-03-03 16:57:13 +00:00
minglis
2059367098 Merge pull request #233 from alphagov/status-page
Status page
2016-03-03 16:55:09 +00:00
Martyn Inglis
82a6c737ec Fixed pep8 2016-03-03 16:50:06 +00:00
Martyn Inglis
76ccb99666 Fixed up the health check page 2016-03-03 16:41:21 +00:00
Adam Shimali
1ff9d671eb [WIP] pass invite instead of permissions to make update of invite easier if all goes well 2016-03-03 16:37:22 +00:00
Rebecca Law
0fd2572b08 Merge pull request #225 from alphagov/revalidate-csv-file
Revalidate file upload
2016-03-03 16:33:30 +00:00
Nicholas Staples
b3249831cf Fix up front end so you can navigate to the edit page. 2016-03-03 15:43:53 +00:00
Rebecca Law
72ec653846 Add mock_has_permissions on new test 2016-03-03 15:39:15 +00:00
Rebecca Law
3e1d60af86 Merge branch 'master' into revalidate-csv-file 2016-03-03 15:38:14 +00:00
Rebecca Law
35c3be5146 Add test.
Remove else since it is not needed.
2016-03-03 15:26:52 +00:00
Nicholas Staples
e5e9db88fd Functionality_added, tests passing. 2016-03-03 14:32:19 +00:00
Chris Hill-Scott
990e626631 Remove tick banner
I’d like to see if we can get away without this now that the page updates. In
research the ‘We’ve started’ part of the message confused people, especially
when they’d only sent one message.
2016-03-03 14:28:36 +00:00