Commit Graph
4142 Commits
Author SHA1 Message Date
Rebecca Law 9a2cb60f5e Update the service name validation in the ServiceNameForm and AddServiceForm to check the email_safe version
of the name against a list of all service email_from fields.
Update find_all_service_names to find_all_service_email_from, which returns the email_from of all services.
2016-03-31 15:17:05 +01:00
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
Adam Shimali 3f57aa917c Updated from git comments 2016-03-31 10:23:13 +01:00
Adam Shimali 5346367866 updated mock expectations 2016-03-31 10:14:49 +01:00
Adam Shimali fc01735d70 Removed some un needed flash messages raised as bugs.
In the process found a couple of edge cases of incorrect
use of invitation links by other users which are now
handled.
2016-03-31 09:44:01 +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
Rebecca Law e67bb5f716 Fix main_nav for platform admin
Renamed or_ to any_
2016-03-30 11:30:18 +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 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
Rebecca Law eb72c6e5bf Refactor unit test 2016-03-30 09:31:53 +01:00
Rebecca Law 017baca5e5 Add proper mocks for the test.
Updated the localhost in the environment_test file so that if the tests fail if a mock is missing.
2016-03-30 08:41:07 +01:00
Nicholas Staples 6ad7be9083 Fix test. 2016-03-29 22:50:51 +01:00
Nicholas Staples 644336b151 Merge with master. 2016-03-29 22:50:40 +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 0bbe35cd7d Reintroduced send sms to self test 2016-03-29 16:52:33 +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 04c5b0187c Test the right url for choose_template 2016-03-29 15:40:33 +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 3f73b4bcdb Merge pull request #350 from alphagov/click-logo-redirect
Only show ‘Choose service’ if multiple services
2016-03-29 11:29:03 +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
Chris Hill-Scott f921a2dcb6 Strip trailing CSV rows, relax phone validation
Implements (and depends on):
- https://github.com/alphagov/notifications-utils/pull/14
- https://github.com/alphagov/notifications-utils/pull/15
2016-03-24 20:34:24 +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
Nicholas Staples f3689cc113 Functionality added and all tests working.
Update correct use of permissions form.
2016-03-23 10:56:14 +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
Nicholas Staples 42eac5c359 Merge with master. 2016-03-21 16:48:40 +00:00
Rebecca Law abef0ae793 Add all-services link for platform admin user on the choose-services page 2016-03-21 16:06:48 +00:00
Rebecca Law 300cdf00bd Added more test for the side nav 2016-03-21 15:36:47 +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
Rebecca Law a66f634d9b Added a test for the all_services view 2016-03-21 13:50:56 +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
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
Martyn Inglis 1f7b3a0ad4 Few changes to column headings for clarity
- Removed "Failed" and "Total costs" on jobs page
- Changed "Sent" to "Processed" on jobs page.
- Removed "sent" from dashboard page on jobs table.
2016-03-21 13:07:12 +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
Rebecca Law a1ef676fab Merge branch 'master' into platform-admin
Conflicts:
	app/main/views/send.py
2016-03-21 12:18:44 +00:00
Chris Hill-Scott 2c3c802d5c Move documentation into footer, not behind login
https://www.pivotaltracker.com/story/show/115775183
2016-03-21 10:39:57 +00:00
Chris Hill-Scott 2d74c89ef2 Merge pull request #306 from alphagov/add-ga
Add Google Analytics
2016-03-21 09:58:12 +00:00