Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Simplify organisation selection #3178

Draft
wants to merge 5 commits into
base: main
Choose a base branch
from
Draft

Simplify organisation selection #3178

wants to merge 5 commits into from

Commits on Sep 19, 2024

  1. Remove unused methods 

    These aren't used anywhere and have no tests
    @yndajas
    yndajas committed Sep 19, 2024
    Configuration menu
    Copy the full SHA
    a907047 View commit details
    Browse the repository at this point in the history

  2. Remove organisation policy scope 

    This gives GOV.UK admins access to all organisations and everyone else
access to none, but it's only used in places that are accessible only to
GOV.UK admins (also based on the organisation policy), so this is a bit
of a double-authentication situation
    @yndajas
    yndajas committed Sep 19, 2024
    Configuration menu
    Copy the full SHA
    5bb0840 View commit details
    Browse the repository at this point in the history

  3. Add default scope on Organisation 

    We order them by name in a few places. In the organisations index
they're in whatever order the database returns them in, which feels odd.
This adds a sensible default for now
    @yndajas
    yndajas committed Sep 19, 2024
    Configuration menu
    Copy the full SHA
    aa445dd View commit details
    Browse the repository at this point in the history

  4. Consolidate organisation options methods 

    These are essentially doing the same thing, so there's no need to have
multiple methods for them
    @yndajas
    yndajas committed Sep 19, 2024
    Configuration menu
    Copy the full SHA
    90152a9 View commit details
    Browse the repository at this point in the history

  5. Use Organisation#name_with_abbreviation method 

    This wasn't being used in the organisations index. We had custom logic
which resulted in organisations without abbreviations having empty
brackets after their name, which looked odd. This method separates the
name and abbreviation with a dash rather than putting the abbreviation
in brackets, but there doesn't seem to be an obvious reason why both
uses can't be the same

The dash used in the method was a non-standard character, so that's
fixed here
    @yndajas
    yndajas committed Sep 19, 2024
    Configuration menu
    Copy the full SHA
    4b1f0f7 View commit details
    Browse the repository at this point in the history