diff --git a/app/controllers/organisation_relationships_controller.rb b/app/controllers/organisation_relationships_controller.rb index 9a6609a27..c414f8853 100644 --- a/app/controllers/organisation_relationships_controller.rb +++ b/app/controllers/organisation_relationships_controller.rb @@ -3,12 +3,6 @@ class OrganisationRelationshipsController < ApplicationController before_action :authenticate_user! - def managing_agents - # kick out if cannot access org - - @managing_agents = organisation.managing_agents - end - def housing_providers @housing_providers = organisation.housing_providers end diff --git a/app/helpers/housing_providers_helper.rb b/app/helpers/housing_providers_helper.rb deleted file mode 100644 index 34586fb27..000000000 --- a/app/helpers/housing_providers_helper.rb +++ /dev/null @@ -1,2 +0,0 @@ -module HousingProvidersHelper -end diff --git a/app/helpers/navigation_items_helper.rb b/app/helpers/navigation_items_helper.rb index e95bcee66..66fbe0f4b 100644 --- a/app/helpers/navigation_items_helper.rb +++ b/app/helpers/navigation_items_helper.rb @@ -103,19 +103,4 @@ private def subnav_details_path?(path) path.include?("/organisations") && path.include?("/details") end - - def managing_agents_path?(path) - path.include?("/managing-agents") - end - - def managing_agents_item(path) - return unless FeatureToggle.managing_agents_enabled? - return unless current_user.organisation.holds_own_stock? - - NavigationItem.new( - "Managing agents", - "/organisations/#{current_user.organisation.id}/managing-agents", - managing_agents_path?(path), - ) - end end diff --git a/app/models/organisation.rb b/app/models/organisation.rb index 093655efe..cc7bb49fd 100644 --- a/app/models/organisation.rb +++ b/app/models/organisation.rb @@ -13,8 +13,6 @@ class Organisation < ApplicationRecord has_many :child_organisation_relationships, foreign_key: :parent_organisation_id, class_name: "OrganisationRelationship" has_many :child_organisations, through: :child_organisation_relationships - has_many :managing_agent_relationships, -> { where(relationship_type: OrganisationRelationship::MANAGING) }, foreign_key: :child_organisation_id, class_name: "OrganisationRelationship" - has_many :managing_agents, through: :managing_agent_relationships, source: :parent_organisation has_many :housing_provider_relationships, -> { where(relationship_type: OrganisationRelationship::OWNING) }, foreign_key: :child_organisation_id, class_name: "OrganisationRelationship" has_many :housing_providers, through: :housing_provider_relationships, source: :parent_organisation diff --git a/app/views/organisation_relationships/managing_agents.html.erb b/app/views/organisation_relationships/managing_agents.html.erb deleted file mode 100644 index a4a8aa6ad..000000000 --- a/app/views/organisation_relationships/managing_agents.html.erb +++ /dev/null @@ -1,8 +0,0 @@ -<% title = format_title(nil, current_user.support? ? "About this organisation" : "Your managing agents", current_user, nil, nil, @organisation.name) %> -<% content_for :title, title %> - -<%= render partial: "organisations/headings", locals: { main: "Your managing agents", sub: nil } %> - -<% @managing_agents.each do |managing_agent|%> - <%= managing_agent.name %> -<% end %> diff --git a/db/migrate/20221018143607_rename_organisations_agents_column.rb b/db/migrate/20221018143607_rename_organisations_agents_column.rb deleted file mode 100644 index 0397f4afd..000000000 --- a/db/migrate/20221018143607_rename_organisations_agents_column.rb +++ /dev/null @@ -1,4 +0,0 @@ -class RenameOrganisationsAgentsColumn < ActiveRecord::Migration[7.0] - def change - end -end diff --git a/db/seeds.rb b/db/seeds.rb index e5e4eacaa..2ad174195 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -8,8 +8,8 @@ # rubocop:disable Rails/Output unless Rails.env.test? - managing_agent = Organisation.find_or_create_by!( - name: "Managing Agent", + housing_provider = Organisation.find_or_create_by!( + name: "Housing Provider", address_line1: "2 Marsham Street", address_line2: "London", postcode: "SW1P 4DF", @@ -24,7 +24,7 @@ unless Rails.env.test? address_line1: "2 Marsham Street", address_line2: "London", postcode: "SW1P 4DF", - holds_own_stock: true, + holds_own_stock: false, other_stock_owners: "None", managing_agents_label: "None", provider_type: "LA", @@ -39,8 +39,8 @@ unless Rails.env.test? OrganisationRelationship.create!( child_organisation: org, - parent_organisation: managing_agent, - relationship_type: OrganisationRelationship::MANAGING, + parent_organisation: housing_provider, + relationship_type: OrganisationRelationship::OWNING, ) if Rails.env.development? && User.count.zero?