jro_apps/redmine Commit - r12579:171581da7e53

Project.activities should always return a ActiveRecord::Relation (#15983)....

Jean-Philippe Lang -

r12579:171581da7e53

parent child

Context file:

r12579:171581da7e53

app/models/project.rb +8 -8

               # Returns the systemwide active activities merged with the project specific overrides
               def system_activities_and_project_overrides(include_inactive=false)
-                if include_inactive
+                t = TimeEntryActivity.table_name
-                  return TimeEntryActivity.shared.
+                scope = TimeEntryActivity.where(
-                    where("id NOT IN (?)", self.time_entry_activities.collect(&:parent_id)).all +
+                  "(#{t}.project_id IS NULL AND #{t}.id NOT IN (?)) OR (#{t}.project_id = ?)",
-                    self.time_entry_activities
+                  time_entry_activities.map(&:parent_id), id
-                else
-                  return TimeEntryActivity.shared.active.
+                unless include_inactive
-                    where("id NOT IN (?)", self.time_entry_activities.collect(&:parent_id)).all +
+                  scope = scope.active
-                    self.time_entry_activities.active
                 end
+                scope
               end
               # Archives subprojects recursively

test/unit/project_test.rb +2 0

               def test_activities_should_use_the_system_activities
                 project = Project.find(1)
                 assert_equal project.activities, TimeEntryActivity.where(:active => true).all
+                assert_kind_of ActiveRecord::Relation, project.activities
               end
                 assert overridden_activity.save!
                 assert project.activities.include?(overridden_activity), "Project specific Activity not found"
+                assert_kind_of ActiveRecord::Relation, project.activities
               end
               def test_activities_should_not_include_the_inactive_project_specific_activities

General Comments 0

You need to be logged in to leave comments. Login now

No TODOs yet

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages