Commit Graph

398 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
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
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
569f61578e Invited user email is shown on regiser from intive page but is not
editable.
2016-03-07 11:55:18 +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
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
Nicholas Staples
b3249831cf Fix up front end so you can navigate to the edit page. 2016-03-03 15:43:53 +00:00
Chris Hill-Scott
b31c9fbc0d Make job page poll for updates
This is a first go at having the job page update without refreshing.

The approach I’ve taken is to do all the rendering of HTML on the server side,
rather than use a Javascipt templating engine like mustache. This ensures that
we don’t have to maintain two sets of templates.

So the approach is to split the job page into partials. These partials can then:
- be included in the job page to render the whole page
- be rendered indivudually and then returned as a blob of HTML inside a JSON
  response

Then I’ve added a Javascript module which looks for areas of the page that should
be reloaded. For each area of the page it will poll a URL and re-render that
section of the page when it gets new HTML. It implements some throttling so that
API calls will never happen more frequently than 0.67 times/second.
2016-03-03 14:28:36 +00:00
NIcholas Staples
0e663e044f Merge pull request #226 from alphagov/real-data-on-job-page
Put real data on job page
2016-03-03 14:27:10 +00:00
Nicholas Staples
9e710711cb Updated form and fixed existing tests. 2016-03-03 13:00:12 +00:00
Nicholas Staples
8287e1bad1 Fix permission names, all tests passing. 2016-03-03 12:15:24 +00:00
Chris Hill-Scott
d9073862fa Put data from job on job page
The main change is showing the finished time if the job is finished, rather
than the start time.
2016-03-03 11:38:38 +00:00
Chris Hill-Scott
3a3e4258ef Remove template column
As one of our user research participants pointed out, this column is redundant
because we’re showing the template on the page already.
2016-03-03 11:38:38 +00:00
Chris Hill-Scott
a4a93116be Put real notifications on job page 2016-03-03 11:38:38 +00:00
Chris Hill-Scott
542f097b6d Make the template preview work
The template was displaying raw, eg ‘Hello ((name))’

This commit changes it to use the `.formatted_as_markup` property so the
template is rendered with:
- the placeholders as blue lozenges
- the service name prefixing the message
2016-03-03 11:15:50 +00:00
Nicholas Staples
9b31761001 Merge remote-tracking branch 'origin/master' into add_send_permission 2016-03-03 09:20:19 +00:00
Nicholas Staples
1b59e5c7f1 Review comments fixed. All tests passing. 2016-03-03 09:02:56 +00:00
Adam Shimali
6ba13a6513 [WIP] New user can now accept invite and will be made to
register. On succesful register and verfication they
will be added to service and forwarded to dashboard.

Nothing is done yet with the permissions requested in the
invite to the user.
2016-03-02 17:52:32 +00:00
Rebecca Law
8acfc06432 Merge branch 'master' into cancel-invited-user 2016-03-02 17:25:17 +00:00
Rebecca Law
1b64a212ea Change label to exclude the type of message being sent. 2016-03-02 16:49:16 +00:00
Nicholas Staples
dde2fba705 Merge with master again. 2016-03-02 13:53:05 +00:00
NIcholas Staples
f0e0006a7c Merge pull request #213 from alphagov/accept-phone-or-email-column
Accept CSVs with 'email address' or 'phone number'
2016-03-02 11:27:24 +00:00
Chris Hill-Scott
b57ac2f7e5 Accept CSVs with 'email address' or 'phone number'
CSV files currently have ‘to’ as the recipient column. This is changing in
https://github.com/alphagov/notifications-api/pull/109

The admin app also has to validate that the CSV files have the right columns,
because the API expects any CSV that it’s given to have been checked (also we
want things to actually work).

This commit is the minimum code change needed. In the future it should reuse
the same code as the API for processing CSV files. This will need more thinking.
2016-03-02 10:41:35 +00:00
Rebecca Law
0b8b419798 Fix missing import on template for email_message.
https://www.pivotaltracker.com/story/show/113991355
2016-03-02 09:55:59 +00:00
Rebecca Law
65f4506028 Show status of invited user on manage team page. 2016-03-02 09:28:33 +00:00
Rebecca Law
bfea4a42bc Merge branch 'master' into cancel-invited-user
Conflicts:
	app/notify_client/invite_api_client.py
	tests/app/main/views/test_manage_users.py
2016-03-01 18:01:20 +00:00
Adam Shimali
5f02d4cefe [WIP] Post does not need any data
Invites rest module can use invited user object instead
of dict.
2016-03-01 17:23:23 +00:00
Rebecca Law
219c740071 Add button to cancel invitation of invited user. 2016-03-01 16:12:26 +00:00
Nicholas Staples
d3bc390b6c Merge with master. 2016-03-01 15:23:00 +00:00
Adam Shimali
5f3c72729e [WIP] Start of user accepting invite.
This commit only deals with acceptance by
users who are already in system.

Changed invite client to return invited user objects
instead of dictionaries.

Added commented out test. fixed up fixtures to return invited user
object for invites
2016-03-01 14:10:35 +00:00
Martyn Inglis
7b5e8061e2 Slight (bad) hack to ensure that the ticks appear on the manage user page
- changes imports for utils from broken version on previous branch
2016-03-01 10:45:13 +00:00
Nicholas Staples
ffe30c3070 Permissions added for templates and send_messages pages. All tests passing.
Fix up page heading.
2016-02-29 17:18:12 +00:00
Nicholas Staples
58351a094c Merge with master. 2016-02-29 14:59:15 +00:00
Nicholas Staples
48943527ec API keys hooked up and working. All tests passing. 2016-02-29 14:57:07 +00:00