darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-02-05 10:53:28 -05:00
Code Issues Packages Projects Releases Wiki Activity
1,092 Commits 51 Branches 59 Tags
f81dccc51384e34f95166f4e16c79ae2e9a77853
Commit Graph

302 Commits

Author SHA1 Message Date
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
Rebecca Law
bb82413718 Merge pull request #260 from alphagov/error-handling 
Error handling
 2016-03-10 16:29:59 +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
Nicholas Staples
6ea8491b39 Service name uniqueness handled in all cases and tests passing. 2016-03-10 14:29:31 +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
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
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
Nicholas Staples
12167b84d1 Fix tests. 2016-03-09 14:11:24 +00:00
Nicholas Staples
c5eaf97669 Tests added for choose_template page. 
Remove indifferent change to file.
 2016-03-09 13:55:40 +00:00
Adam Shimali
208c3cbcf3 Added validation to ensure user can't invite themselves. 
Refactored Invited user form into permissions and invite forms
for use in invite and edit permissions.

Added template for edit permissions.
 2016-03-09 13:00:52 +00:00
Nicholas Staples
d0f113b6bb Merge with master 2016-03-09 12:12:01 +00:00
Nicholas Staples
d832f7aa5f Initial test routes tests added. 2016-03-09 12:10:50 +00:00
Adam Shimali
acc7c6cda3 Display email address that invitee will be registered with. 
Also add flash message for users who already have an account.
 2016-03-09 11:27:26 +00:00
Chris Hill-Scott
131d1bedba Merge pull request #241 from alphagov/utils-csv-processing 
Give the user better error messages for CSV files
 2016-03-09 11:19:20 +00:00
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
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
aa842875fc Merge pull request #245 from alphagov/permission_check_fix 
Exact permissions added.
 2016-03-08 17:17:18 +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
NIcholas Staples
b78a321d90 Merge pull request #238 from alphagov/show-invite-email 
Show invite email
 2016-03-08 08:49:00 +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
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
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
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
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
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