jro_apps/redmine Commit - r3125:9fb40b1a2f70

Project#activities should check all overridden activities, not just active ones....

Eric Davis -

r3125:9fb40b1a2f70

parent child

Context file:

r3125:9fb40b1a2f70

app/models/project.rb +3 -3

                # Returns all the active Systemwide and project specific activities
                def active_activities
-                 overridden_activity_ids = self.time_entry_activities.active.collect(&:parent_id)
+                 overridden_activity_ids = self.time_entry_activities.collect(&:parent_id)
                  if overridden_activity_ids.empty?
                    return TimeEntryActivity.shared.active
                  else
                  else
                    return TimeEntryActivity.shared.active.
                      find(:all,
-                          :conditions => ["id NOT IN (?)", self.time_entry_activities.active.collect(&:parent_id)]) +
+                          :conditions => ["id NOT IN (?)", self.time_entry_activities.collect(&:parent_id)]) +
                      self.time_entry_activities.active
                  end
                end

test/unit/project_test.rb +11 0

                  assert project.activities(true).include?(overridden_activity), "Inactive Project specific Activity not found"
                end
+               test 'activities should not include active System activities if the project has an override that is inactive' do
+                 project = Project.find(1)
+                 system_activity = TimeEntryActivity.find_by_name('Design')
+                 assert system_activity.active?
+                 overridden_activity = TimeEntryActivity.generate!(:project => project, :parent => system_activity, :active => false)
+                 assert overridden_activity.save!
+                 assert !project.activities.include?(overridden_activity), "Inactive Project specific Activity not found"
+                 assert !project.activities.include?(system_activity), "System activity found when the project has an inactive override"
+               end
                def test_close_completed_versions
                  Version.update_all("status = 'open'")

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