mirror/growstuff
1
0
Fork 0
mirror of https://github.com/Growstuff/growstuff.git synced 2026-03-29 12:12:57 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2378 from Br3nda/dev

Browse Source 
Resolve dev conflicts
This commit is contained in:
Brenda Wallace
2020-01-14 12:27:22 +13:00
committed by GitHub
parent 88fd0fb91e ae26965144
commit 9ff43a0659
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/models/photo.rb
View File

@@ -11,7 +11,7 @@ class Photo < ApplicationRecord
# This doesn't work, ActiveRecord tries to use the polymoriphinc photographable
# relationship instead.
# has_many :crops, through: :photo_associations
# has_many :crops, through: :photo_associations, counter_cache: true
def crops
Crop.distinct.joins(:photo_associations).where(photo_associations: { photo: self })
end

2
app/models/photo_association.rb
View File

@@ -1,7 +1,7 @@
# frozen_string_literal: true
class PhotoAssociation < ApplicationRecord
belongs_to :photo, touch: true
belongs_to :photo, touch: true, inverse_of: :photo_associations
belongs_to :crop, optional: true, touch: true # , counter_cache: true
belongs_to :photographable, polymorphic: true, touch: true