Commit Graph

1179 Commits

Author SHA1 Message Date
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 `&gt;`)
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
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
4d5dc0f36b Merge pull request #248 from alphagov/cannot-invite-yourself
Added validation to ensure user can't invite themselves.
2016-03-09 13:13:20 +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
Chris Hill-Scott
91e9cd37b1 Make text of ‘send’ button say ‘email’ or ‘text…’
Previously the send button on the ‘Check and confirm’ page always said
‘Send x messages’, irrespective of whether you were sending emails or text
messages.

This commit makes it say one of
- Send 1 email
- Send 29 emails
- Send 1 text message
- Send 999 text messages
2016-03-09 12:28:22 +00:00
Chris Hill-Scott
b93a1e89c8 Fix bug which prevented viewing an email job
The template for viewing a job was not getting all the variables it needed in
order to display an email template. Hadn’t noticed this before, because email
templates require more variables than SMS templates.

This commit fixes that bug.
2016-03-09 12:25:33 +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
2dbfff4730 Merge pull request #246 from alphagov/flash-message-and-bug-fix
Display email address that invitee will be registered with.
2016-03-09 11:48:22 +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
110608d1f9 Merge pull request #243 from alphagov/forgot-password
Forgot password
2016-03-09 10:52:26 +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
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