diff --git a/app/controllers/organisations_controller.rb b/app/controllers/organisations_controller.rb index 6d9b1f4b5..138baa78c 100644 --- a/app/controllers/organisations_controller.rb +++ b/app/controllers/organisations_controller.rb @@ -161,6 +161,10 @@ class OrganisationsController < ApplicationController redirect_to organisations_path, notice: I18n.t("notification.organisation_deleted", name: @organisation.name) end + def delete_confirmation + authorize @organisation + end + def lettings_logs organisation_logs = LettingsLog.visible.filter_by_organisation(@organisation).filter_by_years_or_nil(FormHandler.instance.years_of_available_lettings_forms) unpaginated_filtered_logs = filter_manager.filtered_logs(organisation_logs, search_term, session_filters) diff --git a/app/helpers/schemes_helper.rb b/app/helpers/schemes_helper.rb index 1cc89d3d5..f96f9e4c8 100644 --- a/app/helpers/schemes_helper.rb +++ b/app/helpers/schemes_helper.rb @@ -20,10 +20,10 @@ module SchemesHelper end def owning_organisation_options(current_user) - all_orgs = Organisation.all.map { |org| OpenStruct.new(id: org.id, name: org.name) } + all_orgs = Organisation.visible.map { |org| OpenStruct.new(id: org.id, name: org.name) } user_org = [OpenStruct.new(id: current_user.organisation_id, name: current_user.organisation.name)] - stock_owners = current_user.organisation.stock_owners.map { |org| OpenStruct.new(id: org.id, name: org.name) } - merged_organisations = current_user.organisation.absorbed_organisations.merged_during_open_collection_period.map { |org| OpenStruct.new(id: org.id, name: org.name) } + stock_owners = current_user.organisation.stock_owners.visible.map { |org| OpenStruct.new(id: org.id, name: org.name) } + merged_organisations = current_user.organisation.absorbed_organisations.visible.merged_during_open_collection_period.map { |org| OpenStruct.new(id: org.id, name: org.name) } current_user.support? ? all_orgs : user_org + stock_owners + merged_organisations end