Simplify organisation selection

app/controllers/organisations_controller.rb

@@ -5,7 +5,7 @@ class OrganisationsController < ApplicationController
 
   def index
     authorize Organisation
-    @organisations = policy_scope(Organisation)
+    @organisations = Organisation.all
   end
 
   def update

app/helpers/organisation_helper.rb

@@ -0,0 +1,9 @@
+module OrganisationHelper
+  def options_for_organisation_select(selected: nil)
+    [{ text: "None", value: nil }] + Organisation.not_closed.map do |organisation|
+      { text: organisation.name_with_abbreviation, value: organisation.id }.tap do |option|
+        option[:selected] = true if option[:value] == selected
+      end
+    end
+  end
+end

app/helpers/users_helper.rb

@@ -27,20 +27,6 @@ def two_step_status_with_requirement(user)
     end
   end
 
-  def organisation_options(form_builder)
-    accessible_organisations = policy_scope(Organisation)
-    options_from_collection_for_select(
-      accessible_organisations,
-      :id,
-      :name_with_abbreviation,
-      selected: form_builder.object.organisation_id,
-    )
-  end
-
-  def organisation_select_options
-    { include_blank: current_user.publishing_manager? ? false : Organisation::NONE }
-  end
-
   def user_email_tokens(user = current_user)
     [user.email] + DeviseZxcvbn::EmailTokeniser.split(user.email)
   end
@@ -84,14 +70,6 @@ def options_for_role_select(selected: nil)
     end
   end
 
-  def options_for_organisation_select(selected: nil)
-    [{ text: "None", value: nil }] + policy_scope(Organisation).not_closed.order(:name).map do |organisation|
-      { text: organisation.name_with_abbreviation, value: organisation.id }.tap do |option|
-        option[:selected] = true if option[:value] == selected
-      end
-    end
-  end
-
   def options_for_permission_option_select(application:, user: nil)
     application.sorted_supported_permissions_grantable_from_ui.map do |permission|
       {

app/models/organisation.rb

@@ -15,9 +15,11 @@ class Organisation < ApplicationRecord
 
   scope :not_closed, -> { where(closed: false) }
 
+  default_scope { order(:name) }
+
   def name_with_abbreviation
     return_value = if abbreviation.present? && abbreviation != name
-                     "#{name} – #{abbreviation}"
+                     "#{name} - #{abbreviation}"
                    else
                      name
                    end

app/policies/organisation_policy.rb

@@ -12,14 +12,4 @@ def can_assign?
   def edit?
     current_user.superadmin?
   end
-
-  class Scope < ::BasePolicy::Scope
-    def resolve
-      if current_user.govuk_admin?
-        scope.all
-      else
-        scope.none
-      end
-    end
-  end
 end

app/views/account/organisations/edit.html.erb

@@ -24,7 +24,7 @@
             id: "user_organisation_id",
             name: "user[organisation_id]",
             label: "Organisation",
-            options: options_for_your_organisation_select(current_user)
+            options: options_for_organisation_select(selected: current_user.organisation_id)
             } %>
         <%= render "govuk_publishing_components/components/button", {
           text: "Change organisation"

app/views/batch_invitations/new.html.erb

@@ -70,8 +70,8 @@
           id: "batch_invitation_organisation_id",
           name: "batch_invitation[organisation_id]",
           label: "Organisation",
-          options: policy_scope(Organisation).not_closed.order(:name).map { |organisation| { text: organisation.name_with_abbreviation, value: organisation.id } }
-          } %>
+          options: options_for_organisation_select
+        } %>
 
     <% end %>
 

app/views/organisations/index.html.erb

@@ -11,7 +11,7 @@
   <%= t.body do %>
     <% @organisations.each do |organisation| %>
       <%= t.row do %>
-        <%= t.cell "#{organisation.name} (#{organisation.abbreviation})" %>
+        <%= t.cell "#{organisation.name_with_abbreviation}" %>
         <%= t.cell organisation.organisation_type %>
         <%= t.cell organisation.slug %>
         <td class="govuk-table__cell">