diff options
| -rw-r--r-- | app/models/project.rb | 4 | ||||
| -rw-r--r-- | test/unit/project_test.rb | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/app/models/project.rb b/app/models/project.rb index 43a55428e..a50fa8807 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -30,8 +30,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, @@ -44,6 +42,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 43a3bf594..4ee1e1b36 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) |