summaryrefslogtreecommitdiffstats
path: root/app/models
diff options
context:
space:
mode:
authorGo MAEDA <maeda@farend.jp>2023-03-25 23:50:08 +0000
committerGo MAEDA <maeda@farend.jp>2023-03-25 23:50:08 +0000
commitd1e10ee1a9930eee1e4756f2d710c130bcccfa72 (patch)
tree620c24cb5fc65776ea44658a64ae3b452c645c94 /app/models
parent2298ac15bdc119dbf7b86707f74097e515302d4c (diff)
downloadredmine-d1e10ee1a9930eee1e4756f2d710c130bcccfa72.tar.gz
redmine-d1e10ee1a9930eee1e4756f2d710c130bcccfa72.zip
Merged r22155 from trunk to 5.0-stable (#38286).
git-svn-id: https://svn.redmine.org/redmine/branches/5.0-stable@22157 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/models')
-rw-r--r--app/models/project.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/models/project.rb b/app/models/project.rb
index 55bac6999..3799e7ef2 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -29,8 +29,6 @@ class Project < ActiveRecord::Base
# Maximum length for project identifiers
IDENTIFIER_MAX_LENGTH = 100
- # Specific overridden Activities
- has_many :time_entry_activities, :dependent => :destroy
has_many :memberships, :class_name => 'Member', :inverse_of => :project
# Memberships of active users only
has_many :members,
@@ -43,6 +41,8 @@ class Project < ActiveRecord::Base
belongs_to :default_version, :class_name => 'Version'
belongs_to :default_assigned_to, :class_name => 'Principal'
has_many :time_entries, :dependent => :destroy
+ # Specific overridden Activities
+ has_many :time_entry_activities, :dependent => :destroy
has_many :queries, :dependent => :destroy
has_many :documents, :dependent => :destroy
has_many :news, lambda {includes(:author)}, :dependent => :destroy