meineerde/redmine
1
0
Fork 0
mirror of https://github.com/meineerde/redmine.git synced 2026-03-10 19:23:06 +00:00
Code Issues Releases Wiki Activity

Merged r22155 from trunk to 5.0-stable (#38286).

Browse Source 
git-svn-id: https://svn.redmine.org/redmine/branches/5.0-stable@22157 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Go MAEDA 2023-03-25 23:50:08 +00:00
parent 2298ac15bd
commit d1e10ee1a9
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/models/project.rb
View File

@ -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

1
test/unit/project_test.rb
View File

@ -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)