From: Go MAEDA Date: Sat, 25 Mar 2023 23:50:08 +0000 (+0000) Subject: Merged r22155 from trunk to 5.0-stable (#38286). X-Git-Tag: 5.0.6~21 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=d1e10ee1a9930eee1e4756f2d710c130bcccfa72;p=redmine.git 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 --- 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 diff --git a/test/unit/project_test.rb b/test/unit/project_test.rb index c83009a72..70c422822 100644 --- a/test/unit/project_test.rb +++ b/test/unit/project_test.rb @@ -236,6 +236,7 @@ class ProjectTest < ActiveSupport::TestCase # generate some dependent objects overridden_activity = TimeEntryActivity.new({:name => "Project", :project => @ecookbook}) assert overridden_activity.save! + TimeEntry.generate!(:project => @ecookbook, :activity_id => overridden_activity.id) query = IssueQuery.generate!(:project => @ecookbook, :visibility => Query::VISIBILITY_ROLES, :roles => Role.where(:id => [1, 3]).to_a)