Commit Graph

499 Commits

Author SHA1 Message Date
Rebecca Law
1871243cc8 Check the uniqueness of the service name ignoring case.
When the service name changes the email_from changes to.
Renamed find_all_service_names to find_all_service_names_lower.
2016-03-31 10:26:03 +01:00
Rebecca Law
ab50ed6368 Merge branch 'master' into email_from_uniqueness 2016-03-31 08:37:11 +01:00
Rebecca Law
0c58d73914 Sort permissions. 2016-03-30 17:50:32 +01:00
Rebecca Law
c4b65d6af9 Fix bug with creating the invited user permission list. 2016-03-30 17:39:19 +01:00
Rebecca Law
677237ba47 Update email_from when the service name is changed.
Update unit tests
Service name is uniqueness is not based on case.
2016-03-30 17:12:00 +01:00
Nicholas Staples
0b2eeb19c5 Fix sent today bug and removed unused file.
Code quality fix.
2016-03-30 12:12:31 +01:00
Rebecca Law
f3507af006 Merge pull request #358 from alphagov/fix-permissions
Add view_activity permissions
2016-03-30 11:36:49 +01:00
Rebecca Law
e67bb5f716 Fix main_nav for platform admin
Renamed or_ to any_
2016-03-30 11:30:18 +01:00
Rebecca Law
953f2a2245 Add comment to describe view_activity 2016-03-30 10:57:03 +01:00
Rebecca Law
542d0f939e Add comment when adding the view_activity permission as a default.
Refactor client.login method so that we can start to migrate to one way to login for unit tests.
2016-03-30 10:53:15 +01:00
Rebecca Law
c99df69025 Merge branch 'master' into fix-permissions
Conflicts:
	app/main/views/jobs.py
	tests/app/main/views/test_manage_users.py
2016-03-30 10:36:55 +01:00
Nicholas Staples
ff9d3d72ad Fixed merge conflicts with master.
Code quality fixes.
2016-03-30 10:26:01 +01:00
Nicholas Staples
48daac7b94 Merging conflict with two_factor.py
Fixed merge mistake with two_factor.py.
2016-03-30 10:11:06 +01:00
Rebecca Law
1cfaeec7b2 Merge branch 'master' into fix-permissions 2016-03-30 09:32:24 +01:00
Nicholas Staples
644336b151 Merge with master. 2016-03-29 22:50:40 +01:00
Rebecca Law
a4629a290a Add view_activity to decorator. 2016-03-29 17:46:53 +01:00
Rebecca Law
99bd94799e Remove access_developer_docs permission, it doesn't make sense to need it.
Add view_activity permission when the permissions are being editted.
2016-03-29 17:33:12 +01:00
Adam Shimali
08d4e13185 Updated to use client instead of dao 2016-03-29 16:59:06 +01:00
Adam Shimali
f3fd5f6b15 After sending sms or email to self or batch then then back button
does not take user to check page, but rather the start of sending
either sms or email.
2016-03-29 16:23:01 +01:00
Rebecca Law
01959b8576 Update invited user to have the view_activity permission.
Update dashboard.html for view_activity
2016-03-29 15:20:43 +01:00
Rebecca Law
b79901fe28 With the addition of has_permissions on the dashboard, jobs, and manage_users pages a platform admin user or a users with no permissions on the service could no longer see the page.
A new permission has been added, view_activity, to resolve this issue.
Another pull request in notifications-admin will be required to update all users with a default permission of view_activity.
2016-03-29 13:23:36 +01:00
Adam Shimali
db24a633c1 Better flash message for users with active accounts who click on
verification link again.
2016-03-29 13:21:51 +01:00
Adam Shimali
352f169fb1 If user is pending it means they have not verified email yet
Added better checking on re use of consumed verification link.
2016-03-29 13:12:06 +01:00
Chris Hill-Scott
eb279c88d4 Only show ‘Choose service’ if multiple services
When the user clicks ‘GOV.UK Notify’ in the header, they should, by
default, be redirected to the dashboard for their service. They should
only see the ‘Choose service’ page if they have multiple services.

This also allows some logic to be factored out of the template, so one
route now handles all this redirection.

In the future we might want to keep the last-used service in the
session, and always redirect to that. But for now, this should fix most
of the confusion for first-time users.
2016-03-29 10:44:50 +01:00
Adam Shimali
3e167c69f2 Clean up config a bit. Get values for config from environment.
Removed some old redundant config.
2016-03-23 15:07:04 +00:00
NIcholas Staples
faaedb318d Merge pull request #338 from alphagov/service_user_permission
Functionality added to existing endpoint without a user_has_permissio…
2016-03-23 14:48:10 +00:00
Nicholas Staples
961ed6b362 Functionality added to existing endpoint without a user_has_permission decorator, tests passing.
Fix tests.
2016-03-23 14:26:12 +00:00
Chris Hill-Scott
45ea12e13f Improve display of failure rates
https://www.pivotaltracker.com/story/show/116052359

- add absolute numbers for failures
- make percentages accurate to 1 decimal place (50.0%)
- make error colour appear if failures go above 3.0%
- make error colour boolean (don’t interpolate between the colours)
2016-03-23 13:47:54 +00:00
Chris Hill-Scott
5c57f5b588 Make dashboard stats update dynamically
https://www.pivotaltracker.com/story/show/115874485

This uses the same component as on the jobs page to make a partial
section of the page update itself periodically.
2016-03-23 13:40:23 +00:00
Chris Hill-Scott
bb08589875 Merge pull request #323 from alphagov/add-terms-of-use
Add Terms of use page
2016-03-23 13:33:45 +00:00
Nicholas Staples
f3689cc113 Functionality added and all tests working.
Update correct use of permissions form.
2016-03-23 10:56:14 +00:00
Henry Hadlow
887c97facd Add Terms of use page 2016-03-23 10:26:21 +00:00
Chris Hill-Scott
0435015211 Merge pull request #332 from alphagov/make-permissions-checkboxes
Set permissions with checkboxes, not yes/no inputs
2016-03-22 17:42:34 +00:00
Chris Hill-Scott
c138a4a5e0 Set permissions with checkboxes, not yes/no inputs
The yes/no pattern didn’t work too well, because:
- it didn’t read naturally as a question and answer
- often users left them completely unclicked if they didn’t want to set
  the permission (rather than clicking no)

This commit changes both the invite and edit user pages to use
checkboxes to set permissions. If also rewords these pages to read more
naturally, and explain what the permissions mean.

This meant changing some of the view logic around invites and
persmissions, and I ended up refactoring a bunch of it because I found
it hard to understand what was going on.
2016-03-22 17:18:43 +00:00
Chris Hill-Scott
bb168c5e8d Merge pull request #325 from alphagov/view_only_team_members
View only team members
2016-03-22 15:53:02 +00:00
Adam Shimali
8fc154d3d2 When user clicks on verification link but doesn't complete
verification, if they try to use link again the code will
have been used. Therefore they will need a new email with new
link to use for verification.
2016-03-22 13:43:44 +00:00
Chris Hill-Scott
823c258d71 Merge pull request #312 from alphagov/remove-service-name-from-email-templates
Only prefix SMS templates with service name
2016-03-22 10:29:47 +00:00
Chris Hill-Scott
8febc39669 Merge pull request #322 from alphagov/use-real-api-endpoints
Use real API endpoints in documentation
2016-03-21 17:33:33 +00:00
Nicholas Staples
42eac5c359 Merge with master. 2016-03-21 16:48:40 +00:00
Chris Hill-Scott
a32fd36b1b Use real API endpoints in documentation
There is no need to make the API endpoints environment-specific. But it
is still useful to know what the endpoint is.

Also fixes a broken link on the integration page.
2016-03-21 16:36:15 +00:00
Rebecca Law
b9528d49c4 Merge branch 'master' into platform-admin 2016-03-21 15:37:35 +00:00
Nicholas Staples
a482fac02a Manage team, now has a view only version of the page which requires no permissions. 2016-03-21 15:25:19 +00:00
Adam Shimali
b775b60633 In registration flow then request resend of sms should
redirect to verify not two-factor.
2016-03-21 14:00:05 +00:00
Rebecca Law
9270d1722b Merge branch 'master' into platform-admin 2016-03-21 13:51:27 +00:00
Adam Shimali
792b42017a Revert "In registration flow If new sms requested then check and send redirected to two factor" 2016-03-21 13:44:53 +00:00
minglis
234fe387df Merge pull request #315 from alphagov/change-column-headings
Few changes to column headings for clarity
2016-03-21 13:40:16 +00:00
Martyn Inglis
07bb074bd3 Remove usnused things from the template call 2016-03-21 13:31:53 +00:00
Rebecca Law
8ab4a5b150 Merge branch 'master' into platform-admin
Conflicts:
	tests/app/main/views/test_dashboard.py
2016-03-21 13:23:46 +00:00
Chris Hill-Scott
304b411bd5 Merge pull request #309 from alphagov/move-documentation-page
Move documentation into footer, not behind login
2016-03-21 13:14:04 +00:00
Adam Shimali
c2c98248a1 If new sms requested, then check and send redirected to two factor
in all cases but should have redirected to verify for pending users.
2016-03-21 12:32:07 +00:00