Commit Graph

7373 Commits

Author SHA1 Message Date
pyup-bot
e910a5f28a Update pytest-xdist from 1.26.1 to 1.27.0 2019-03-20 23:27:09 +00:00
Chris Hill-Scott
066a42cc20 Merge pull request #2863 from alphagov/horsham.gov.uk
Mark agreement signed by Horsham Council
2019-03-20 16:46:22 +00:00
Chris Hill-Scott
0cc566a796 Mark agreement signed by Horsham Council 2019-03-20 16:20:58 +00:00
Chris Hill-Scott
4e74c7ffad Merge pull request #2861 from alphagov/pyup-update-coveralls-1.6.0-to-1.7.0
Update coveralls to 1.7.0
2019-03-20 13:48:50 +00:00
Chris Hill-Scott
e32f6a92c1 Merge pull request #2860 from fidejoseph/patch-8
Update email_domains.yml
2019-03-20 13:48:44 +00:00
Rebecca Law
5da0f20869 Merge pull request #2859 from alphagov/make-letter-validation-preview-public
Make the letter-validation-preview URL public.
2019-03-20 12:15:10 +00:00
Rebecca Law
42e63667f7 Updated copy on the page.
Added unit tests.
Added error when file is too big.
2019-03-20 11:31:29 +00:00
pyup-bot
fdd872db48 Update coveralls from 1.6.0 to 1.7.0 2019-03-20 03:24:10 +00:00
fidejoseph
118b6981f2 Update email_domains.yml
Onevoice Wales has been added
2019-03-19 16:34:15 +00:00
Rebecca Law
8fd5fa90ff Make the letter-validation-preview url public.
In the short term I have created a duplicate version of the letter-validation-preview so that people from a service can upload a pdf and see why the letter isnot validating.

It's hard to get a precompiled letter to validate when starting to integrate with Notify. This will return the overlay of the letter validation and is now available to the services.
At the moment they send us a PDF to upload.
This is temporary because there is a story to create a one-off flow to get this overlay, that will replace this page.

There is no navigation to this on purpose.
2019-03-19 16:00:15 +00:00
Pea (Malgorzata Tyczynska)
c994552fc2 Merge pull request #2856 from alphagov/edit-members-who-see-folder
Edit members who see folder
2019-03-19 14:11:59 +00:00
Pea Tyczynska
fb5983cc2e Test manage folder viewing permissions page 2019-03-18 17:58:53 +00:00
Pea Tyczynska
86d8464fa2 Show all users in folder viewing permissions, correct users checked 2019-03-18 17:58:53 +00:00
Pea Tyczynska
e85969f6fa Change folder viewing permissions from manage folder page 2019-03-18 17:52:02 +00:00
Tom Byers
0f9969989a Merge pull request #2855 from alphagov/revert-2843-stop-sticky-overlapping-focus
Revert "Prevent sticky controls overlapping focus"
2019-03-18 16:49:58 +00:00
Tom Byers
4e7e934e25 Revert "Prevent sticky controls overlapping focus" 2019-03-18 16:38:49 +00:00
Chris Hill-Scott
42e3770e65 Merge pull request #2854 from alphagov/bump-utils-non-plussed-lists
Bump utils
2019-03-18 15:37:13 +00:00
Chris Hill-Scott
43c53c6a94 Bump utils
Brings in:
- [ ] https://github.com/alphagov/notifications-utils/pull/592
2019-03-18 14:53:38 +00:00
Tom Byers
1bdf79bd22 Merge pull request #2843 from alphagov/stop-sticky-overlapping-focus
Prevent sticky controls overlapping focus
2019-03-18 13:31:26 +00:00
Chris Hill-Scott
3b6af41660 Merge pull request #2830 from alphagov/put-current-branding-in-branding-request
Put current email branding in new branding request
2019-03-18 12:05:59 +00:00
Chris Hill-Scott
f54aed03ae Merge pull request #2853 from alphagov/wolverhampton.gov.uk
Mark agreement signed by Wolverhampton Council
2019-03-18 12:05:53 +00:00
Tom Byers
3b0fd4a92c Make controls re-render only when state changed
Adds a guard around all calls to `.render()` after
the first one (which sets the initial state) to
prevent DOM manipulation when not needed.

The original behaviour meant the action buttons
were re-rendered when items from the list of
templates/folders were selected/deselected, even
if the state hadn't changed. This meant, in some
cases, focus was shifted to the buttons when you
were still selecting/deselecting.
2019-03-18 11:25:26 +00:00
Tom Byers
b8c5ab5e38 Handle overlaps in scroll areas on focus events
When focus changes in scroll areas, check the
current focused element isn't overlapped by sticky
elements in the area.

If there are overlaps, mimic what browsers do if
focus moves outside the viewport and scroll to
move the focused element into view.
2019-03-18 11:25:26 +00:00
Tom Byers
b13bc158ac Add object to manage scroll areas for stickys 2019-03-18 11:25:26 +00:00
Tom Byers
d0aee7887b Allow setting of scroll area explicitly
Defaults to scroll area being the parent element
of the sticky element, if not set.
2019-03-18 11:25:25 +00:00
Chris Hill-Scott
37042be763 Mark agreement signed by Wolverhampton Council 2019-03-18 10:59:10 +00:00
Chris Hill-Scott
ce1adce97a Put current email branding in new branding request
When we get a request for new branding it’s helpful to quickly see what
the service’s current branding is, so we can get a better sense of why
they want to change it.
2019-03-18 10:50:49 +00:00
Katie Smith
03c1f27947 Merge pull request #2846 from alphagov/change-permissions-data-format
Change permissions data format
2019-03-18 10:49:47 +00:00
Chris Hill-Scott
906d0cbef8 Merge pull request #2852 from alphagov/camden.gov.uk
Mark agreement signed by Camden Council
2019-03-18 10:43:56 +00:00
Chris Hill-Scott
3bbbd6a9e0 Merge pull request #2849 from alphagov/warrington
Updating Warrington with contract signed
2019-03-18 10:43:49 +00:00
Chris Hill-Scott
c034858340 Mark agreement signed by Camden Council 2019-03-18 10:24:25 +00:00
Pete Herlihy
dcc8e3c5d2 Added Gedling Council to signed domains list 2019-03-15 15:12:24 +00:00
Pete Herlihy
6d8a70da51 Updating Warrington with contract signed 2019-03-15 14:59:46 +00:00
Pea Tyczynska
1ab36dd026 Show checkboxes for users with permission to view the managed folder 2019-03-15 14:13:27 +00:00
Rebecca Law
4fdb813679 Merge pull request #2848 from alphagov/add-caa.co.uk
Add caa.co.uk
2019-03-15 12:31:14 +00:00
Rebecca Law
cbc854ff9d Add caa.co.uk 2019-03-15 11:52:24 +00:00
Pea Tyczynska
077a533d81 Subheader for edit users who can see a folder 2019-03-14 17:21:18 +00:00
Katie Smith
d3c256e80a Change format of data sent to api when adding user to service
The endpoint for adding a user to a service in api will now deal with
both user permissions and a user's folder permissions, so this changes
the format of the data we pass through.
2019-03-14 13:36:14 +00:00
Katie Smith
9fbe64bbd7 Allow InvitedUser to be initialised with folder_permissions
The `folder_permissions` property has no effect and is not used yet, but
it needs to be added before we add a `folder_permissions` column to the
`InvitedUser` model in notifications-api. This is because we initialize
the InvitedUser class with the response from notifications-api.
2019-03-14 13:36:00 +00:00
Pea (Malgorzata Tyczynska)
d5a16195d9 Merge pull request #2845 from alphagov/invite-auth-bug
Fix choosing auth type when inviting new user
2019-03-14 13:05:40 +00:00
Pea Tyczynska
a9be6015dc Test if auth type can be chosen while inviting user 2019-03-12 16:53:46 +00:00
Pea Tyczynska
5aa72daf9b Fix bug 2019-03-12 11:41:52 +00:00
Pea (Malgorzata Tyczynska)
2bc6792c5a Merge pull request #2823 from alphagov/hide-folders-when-no-permissions
Only show folders that user has permission to see
2019-03-11 16:26:56 +00:00
Pea Tyczynska
577e25bd52 Explain the workings of get_user_template_folders 2019-03-11 14:30:50 +00:00
Pea Tyczynska
347955a378 Make sure that only templates inside visible folders are considered
When filtering by template type we should ignore any templates that
are inside folders user does not have permission for. Otherwise the
parent folder can show up as empty instead of not showing up at
all. This adds check for user_permissions to is_folder_visible on
the service model in admin.
2019-03-11 14:30:50 +00:00
Pea Tyczynska
33c3b14feb Test how user folder permissions work on the page 2019-03-11 14:30:50 +00:00
Alexey Bezhan
3d401ce856 Hide current folder templates if user doesn't have a folder permission
TemplateList gets a list of templates in a current folder separately,
so we need to make sure `service.get_templates` checks for the
appropriate user permission
2019-03-11 14:30:50 +00:00
Alexey Bezhan
70e6732255 Only display folders the user has permission for
This adds a filter by user permissions to the list of template folders
displayed in:

* the 'choose a template page'
* "Move to" form to choose a destination folder
* "Copy an existing template" selection form
2019-03-11 14:30:50 +00:00
Alexey Bezhan
6638a0aecb Add user_id argument to TemplateList to allow filtering folders by user
Switches TemplateList to use get_user_template_folders by setting the
user_id.
2019-03-11 14:30:50 +00:00
Alexey Bezhan
80bfd8e347 Add space around folder name separator when flattening folder path 2019-03-11 14:30:49 +00:00