NPO-Accounting/houdini
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'master' into p2p_improvements

Browse source
This commit is contained in:
Eric Schultz 2019-01-23 13:20:24 -06:00 committed by GitHub
commit 3b45778225
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/models/supporter.rb
View file

@ -48,6 +48,7 @@ class Supporter < ActiveRecord::Base
has_many :tag_masters, through: :tag_joins has_many :tag_masters, through: :tag_joins
has_many :custom_field_joins, dependent: :destroy has_many :custom_field_joins, dependent: :destroy
has_many :custom_field_masters, through: :custom_field_joins has_many :custom_field_masters, through: :custom_field_joins
belongs_to :merged_into, class_name: 'Supporter', :foreign_key => 'merged_into'
validates :nonprofit, :presence => true validates :nonprofit, :presence => true
scope :not_deleted, -> {where(deleted: false)} scope :not_deleted, -> {where(deleted: false)}