scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-09-20 23:16:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1796 from Ducz0r/lm-sci-3494

Browse source 
Fix the user.activities association so it works [SCI-3494]
This commit is contained in:
Luka Murn 2019-05-24 14:21:42 +02:00 committed by GitHub
parent d2991bc1d2 8b116d9de7
commit d7fe23c6ce
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/models/user.rb
View file

@ -72,7 +72,7 @@ class User < ApplicationRecord
has_many :user_my_modules, inverse_of: :user has_many :user_my_modules, inverse_of: :user
has_many :my_modules, through: :user_my_modules has_many :my_modules, through: :user_my_modules
has_many :comments, inverse_of: :user has_many :comments, inverse_of: :user
has_many :activities, inverse_of: :owner has_many :activities, inverse_of: :owner, foreign_key: 'owner_id'
has_many :results, inverse_of: :user has_many :results, inverse_of: :user
has_many :samples, inverse_of: :user has_many :samples, inverse_of: :user
has_many :samples_tables, inverse_of: :user, dependent: :destroy has_many :samples_tables, inverse_of: :user, dependent: :destroy