Content modelling/628 organisation by user #9565
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Harriethw
force-pushed
the
content-modelling/628-organisation-by-user
branch
from
ed96457
to
9fc8ed2
Compare
This mimics the default behaviour when viewing all Documents in Whitehall: * if there are no filters provided, then the user's organisation is set as the lead organisation * otherwise we take from the session so that their search is not lost between page navigations. This does make other integration and feature tests a bit complicated - as the first time a user goes to the page their organisation will be set as a filter. In the feature tests I'm checking that and then setting to 'All organisations' to ensure the scope of other tests is set to specific filters.
Harriethw
force-pushed
the
content-modelling/628-organisation-by-user
branch
from
9fc8ed2
to
a56e699
Compare
pezholio
approved these changes
Oct 29, 2024
| } | ||
| end | ||
| end | ||
|
|
||
| def options_for_lead_organisation | ||
| [all_organisations_option].push(*taggable_organisations_options) |
There was a problem hiding this comment.
Would [all_organisations_option, taggable_organisations_options].flatten be more readable here?
again mimic-ing what Whitehall have on their filters, and makes it clearer to the user what they are selecting.
Harriethw
force-pushed
the
content-modelling/628-organisation-by-user
branch
from
a56e699
to
37e6e07
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Follow these steps if you are doing a Rails upgrade.