From ed4ef24c544d55c9b6184a77a404741a1b859125 Mon Sep 17 00:00:00 2001 From: JG Date: Wed, 29 Jun 2022 13:38:08 +0100 Subject: [PATCH] managing related schems properly via Org --- app/models/organisation.rb | 3 ++- app/models/scheme.rb | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/app/models/organisation.rb b/app/models/organisation.rb index 92102aee9..b010b8ff1 100644 --- a/app/models/organisation.rb +++ b/app/models/organisation.rb @@ -4,7 +4,8 @@ class Organisation < ApplicationRecord has_many :managed_case_logs, class_name: "CaseLog", foreign_key: "managing_organisation_id" has_many :data_protection_confirmations has_many :organisation_rent_periods - has_many :schemes + has_many :owned_schemes, class_name: "Scheme", foreign_key: "stock_owning_organisation_id" + has_many :managed_schemes, class_name: "Scheme", foreign_key: "organisation_id" scope :search_by_name, ->(name) { where("name ILIKE ?", "%#{name}%") } scope :search_by, ->(param) { search_by_name(param) } diff --git a/app/models/scheme.rb b/app/models/scheme.rb index af3950360..44f994428 100644 --- a/app/models/scheme.rb +++ b/app/models/scheme.rb @@ -1,6 +1,6 @@ class Scheme < ApplicationRecord belongs_to :organisation - belongs_to :stock_owning_organisation, optional: true, class_name: "Organisation", foreign_key: "stock_owning_organisation_id" + belongs_to :stock_owning_organisation, optional: true, class_name: "Organisation" has_many :locations has_many :case_logs