From e2bdb2acee47444f75db2818ec6b636588e136d6 Mon Sep 17 00:00:00 2001 From: Pete Matsyburka Date: Fri, 16 Aug 2024 10:58:51 +0300 Subject: [PATCH] use account_id --- app/models/account.rb | 2 +- app/models/submitter.rb | 2 +- lib/ability.rb | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/models/account.rb b/app/models/account.rb index 1cc9f6b0..6ad1071e 100644 --- a/app/models/account.rb +++ b/app/models/account.rb @@ -29,7 +29,7 @@ class Account < ApplicationRecord has_one :default_template_folder, -> { where(name: TemplateFolder::DEFAULT_NAME) }, class_name: 'TemplateFolder', dependent: :destroy, inverse_of: :account has_many :submissions, dependent: :destroy - has_many :submitters, through: :submissions + has_many :submitters, dependent: :destroy has_many :account_linked_accounts, dependent: :destroy has_many :email_events, dependent: :destroy has_many :webhook_urls, dependent: :destroy diff --git a/app/models/submitter.rb b/app/models/submitter.rb index 96a02945..925cc26d 100644 --- a/app/models/submitter.rb +++ b/app/models/submitter.rb @@ -38,8 +38,8 @@ # class Submitter < ApplicationRecord belongs_to :submission + belongs_to :account has_one :template, through: :submission - has_one :account, through: :submission attribute :values, :string, default: -> { {} } attribute :preferences, :string, default: -> { {} } diff --git a/lib/ability.rb b/lib/ability.rb index b99b79ea..b48e866a 100644 --- a/lib/ability.rb +++ b/lib/ability.rb @@ -14,7 +14,7 @@ class Ability can :manage, TemplateFolder, account_id: user.account_id can :manage, TemplateSharing, template: { account_id: user.account_id } can :manage, Submission, account_id: user.account_id - can :manage, Submitter, submission: { account_id: user.account_id } + can :manage, Submitter, account_id: user.account_id can :manage, User, account_id: user.account_id can :manage, EncryptedConfig, account_id: user.account_id can :manage, EncryptedUserConfig, user_id: user.id