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

Fixes #4084 git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3239 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-12-24 18:25:49 +00:00
parent 62c83bdd2e
commit 9fb40b1a2f
2 changed files with 14 additions and 3 deletions
@@ -626,8 +626,8 @@ class Project < ActiveRecord::Base

  # 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
@@ -657,7 +657,7 @@ class Project < ActiveRecord::Base
    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