Commit Graph

4059 Commits

Author SHA1 Message Date
Chris Hill-Scott
0092c8bb33 Change manage team layout to fit extra option
We’ve moved from three to four permissions. Four permissions don’t fit
in the exiting horizontal layout.

This commit makes the permissions stack vertically instead.

This approach has some downsides:
- makes the permissions less easy to scan vertically
- makes them take up a lot more space (and at lives services, most of
  them have somewhere around 15 team members)

But I think for now it’s better than any horizontal alternative that I
tried.
2017-08-17 17:53:12 +01:00
Chris Hill-Scott
d591b9aeb9 Add a fourth, ‘manage templates’ permission
We’ve seen from research (a long time ago) that the ‘manage service’
permission is too broad, and gives too much control to someone who only
needs the ability to edit templates. In other words, editing content
should be its own, separate permission, rather than being rolled up
into manage service.

Since this is already disaggregated on the API side, making this change
just means changing the mapping on the admin side and adding an extra
checkbox on the invite/edit page. Which is what this commit does.

So for now, an existing user who has the manage service permission gets
both manage service and manage templates (ie no change to what they can
do). Newly invited users will get to choose if they have both, either,
or neither.
2017-08-17 17:47:30 +01:00
Chris Hill-Scott
aac654cd38 Test that the right permissions in page
This commit makes sure that the right permission choices are shown in
these pages:
- manage team page
- invite a user page
- edit permissions page

This is in order to make changing these pages easier (see subsequent
commits).
2017-08-17 17:45:52 +01:00
Chris Hill-Scott
726e91bebb Make existing tests use ``client_request fixture
This commit makes the existing tests around user permissions less
verbose by using the new `client_request` fixture.

This fixture takes care of:
- setting up a service
- asserting that the response is `200`

It also tests that the page titles, some of which didn’t match with the
`<h1>`s, so this commit also fixes that mismatch.
2017-08-17 17:42:40 +01:00
Chris Hill-Scott
fd5dfdf4ad Refactor form -> permissions function into helper
This functionality was implemented twice, in two different ways. This
commit factors it out into a helper method that can be reused in the
two places. We chose to go with the more explicit implementation because
it’s easier to understand.
2017-08-17 17:39:23 +01:00
Imdad Ahad
8c09d07f76 Merge pull request #1433 from alphagov/imdad-fix-call-correct-endpoint-for-billing-usage
Call the correct endpoint to retrieve yearly billing usage
2017-08-17 16:36:48 +01:00
Imdad Ahad
232912ab3b Call the correct endpoint to retrieve yearly billing usage 2017-08-17 16:02:30 +01:00
Imdad Ahad
fa99af6598 Merge pull request #1432 from alphagov/imdad-feat-make-usage-use-new-endpoints
Update the usage page to use new billing endpoints
2017-08-17 15:37:26 +01:00
Imdad Ahad
32242c4501 Update the usage page to use new billing endpoints
* Create new billing_api_client for separation and remove
older methods in the service_api_client
2017-08-16 16:31:47 +01:00
Venus Bailey
4848f6b5c6 Merge pull request #1431 from alphagov/revert-1427-job-stats-table
Revert "Job stats table" - Data in Job statistics table needs further investigation
2017-08-16 15:37:47 +01:00
Venus Bailey
cbe2df3946 Revert "Job stats table" 2017-08-16 15:25:26 +01:00
Venus Bailey
38e6b8188c Merge pull request #1427 from alphagov/job-stats-table
Update the admin to use new end points in job statistics table
2017-08-16 11:49:39 +01:00
venusbb
d3421423ac package-lock.json revert 2 2017-08-16 11:40:57 +01:00
venusbb
9dc7a22c5d package-lock.json revert 2017-08-16 11:37:53 +01:00
venusbb
62775e8a59 Merge branch 'master' of https://github.com/alphagov/notifications-admin into job-stats-table 2017-08-16 11:16:13 +01:00
Chris Hill-Scott
de44295e58 Merge pull request #1430 from alphagov/pyup-update-coveralls-1.1-to-1.2.0
Update coveralls to 1.2.0
2017-08-16 09:17:15 +01:00
pyup-bot
17267e6dfa Update coveralls from 1.1 to 1.2.0 2017-08-16 04:19:35 +01:00
venusbb
6a483c14f5 change get-jobs to point to new statistics tables 2017-08-15 15:53:26 +01:00
venusbb
3c38d54cf7 Merge branch 'master' of https://github.com/alphagov/notifications-admin 2017-08-15 09:58:30 +01:00
Chris Hill-Scott
fca85537aa Merge pull request #1422 from alphagov/science-technology-facilities-council
Allow Science & Technology Facilities Council
2017-08-14 10:18:28 +01:00
Chris Hill-Scott
e3d26bb2a2 Allow Science & Technology Facilities Council
> STFC is an executive non-departmental public body, sponsored by the
> Department for Business, Energy & Industrial Strategy.
> http://www.stfc.ac.uk/https://www.gov.uk/government/organisations/science-and-technology-facilities-council
2017-08-14 09:52:11 +01:00
Chris Hill-Scott
77452b1b25 Merge pull request #1418 from alphagov/local-email-address-for-local-government
Tell local government folk that they can sign up
2017-08-11 16:20:06 +01:00
Chris Hill-Scott
95258488aa Merge pull request #1420 from alphagov/pyup-update-pytest-xdist-1.19.0-to-1.19.1
Update pytest-xdist to 1.19.1
2017-08-11 16:15:41 +01:00
Chris Hill-Scott
6ba5de753d Merge pull request #1411 from alphagov/pyup-update-pyexcel-io-0.4.3-to-0.4.4
Update pyexcel-io to 0.4.4
2017-08-11 16:15:11 +01:00
venusbb
bf5b4fe4c0 package-lock.json 2017-08-11 10:34:11 +01:00
venusbb
eb881cc0e0 Merge branch 'master' of https://github.com/alphagov/notifications-admin 2017-08-11 09:48:13 +01:00
pyup-bot
dc63fcf034 Update pytest-xdist from 1.19.0 to 1.19.1 2017-08-10 17:03:25 +01:00
Chris Hill-Scott
1d513fff4d Merge pull request #1417 from alphagov/pyup-update-pytest-3.2.0-to-3.2.1
Update pytest to 3.2.1
2017-08-10 15:04:45 +01:00
Chris Hill-Scott
a10e76a9c2 Stop referring to central gov in error messages 2017-08-10 13:51:46 +01:00
Chris Hill-Scott
ab5d203d60 Merge pull request #1419 from alphagov/british-library-domain
Add British Library to email domain whitelist
2017-08-10 13:18:14 +01:00
Katie Smith
d938ed9d03 Merge pull request #1416 from alphagov/check-service-is-unique
Check service name is unique - efficiently
2017-08-10 13:11:43 +01:00
Chris Hill-Scott
01d92fdbb3 Add British Library to email domain whitelist
I think that British Library can use Notify. Need to double check
though.

> BL is an executive non-departmental public body, sponsored by the
> Department for Digital, Culture, Media & Sport.
> https://www.bl.uk/https://www.gov.uk/government/organisations/british-library
2017-08-10 12:47:56 +01:00
Chris Hill-Scott
9e3d60ee58 Tell local government folk that they can sign up
Notify is now available to local government:
https://gds.blog.gov.uk/2017/08/10/local-government-services-to-start-using-gov-uk-notify/

So registration isn’t only for users with central government email 
addresses now.
2017-08-10 12:22:53 +01:00
pyup-bot
3f6996334f Update pytest from 3.2.0 to 3.2.1 2017-08-09 22:09:24 +01:00
Rebecca Law
9b9c6d75dc - Change update service name to check that the name/email_from is unique across all services.
- This is done using a new endpoint in the api.
- Removed the AddServiceForm in favor or using the ServiceNameForm
- Removed ServiceApiClient.find_all_service_email_from
2017-08-09 16:52:10 +01:00
Chris Hill-Scott
955eb5648f Merge pull request #1415 from alphagov/pyup-update-pytest-xdist-1.18.2-to-1.19.0
Update pytest-xdist to 1.19.0
2017-08-09 16:50:06 +01:00
pyup-bot
6f1fd0f2cc Update pytest-xdist from 1.18.2 to 1.19.0 2017-08-09 16:48:23 +01:00
Chris Hill-Scott
14be8dc463 Merge pull request #1413 from alphagov/logo-bucket-name
Fix logo bucket name
2017-08-09 15:29:07 +01:00
Chris Hill-Scott
2eab6bf781 Fix logo bucket name
The app was uploading into ...live but then looking for the logos in ...production.

The existing logos are in ...production
2017-08-09 15:13:36 +01:00
Chris Hill-Scott
5eb2cf859c Merge pull request #1403 from alphagov/ken-admin-orgs
Add pages to create and manage organisation branding for Emails
2017-08-09 13:15:27 +01:00
Chris Hill-Scott
fb1a050e20 Merge pull request #1406 from alphagov/focus-states-navigation
Improve focus states on navigational elements
2017-08-09 13:15:19 +01:00
Chris Hill-Scott
66df44dd31 Merge pull request #1412 from alphagov/move-performance
Moving performance link to the support column in the footer
2017-08-09 13:15:13 +01:00
Pete Herlihy
d881104475 Moving performance link to the support column in the footer
Feels more appropriate here - these are all the live things the about is all the static things.
2017-08-09 10:57:49 +01:00
pyup-bot
ebe8b2b51c Update pyexcel-io from 0.4.3 to 0.4.4 2017-08-08 19:45:24 +01:00
Rebecca Law
fca663c183 Merge pull request #1410 from alphagov/test-deploy
Testing deploy - changing order of requirements
2017-08-08 16:32:29 +01:00
Rebecca Law
48162f46bd Testing deploy - changing order of requirements 2017-08-08 16:09:16 +01:00
Rebecca Law
e3a35965fb Merge pull request #1408 from alphagov/69-70
69-70 and 33-34 for Veterans Welfare (MOD)
2017-08-08 15:30:11 +01:00
Rebecca Law
ad6b44e1ee Merge pull request #1409 from alphagov/let-api-check-unique-email
Let api check unique email
2017-08-08 15:25:38 +01:00
Rebecca Law
98595d8d80 Added an else: raise 2017-08-08 15:04:45 +01:00
Rebecca Law
dbbd70d0ef Revert change to package-lock.json 2017-08-08 14:29:29 +01:00