diff options
| author | Eric Davis <edavis@littlestreamsoftware.com> | 2009-10-21 22:34:39 +0000 |
|---|---|---|
| committer | Eric Davis <edavis@littlestreamsoftware.com> | 2009-10-21 22:34:39 +0000 |
| commit | e615266e9a036811c7f73a471ba48b5bbe27adfe (patch) | |
| tree | 83458d985c737f3cd898278d1066015eac395547 /app/models/enumeration.rb | |
| parent | 29301c8a381aa5995a0ce2e10ad91f210dc6464f (diff) | |
| download | redmine-e615266e9a036811c7f73a471ba48b5bbe27adfe.tar.gz redmine-e615266e9a036811c7f73a471ba48b5bbe27adfe.zip | |
Changed the Timelogs to use both the Systemwide and Project specific TimeEntryActivities
* Added Project#activities to return all the Systemwide and Project specific
activities, excluding Systemwide ones that are overridden.
* Added some tests for TimelogHelper.
#4077
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2948 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/models/enumeration.rb')
| -rw-r--r-- | app/models/enumeration.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/enumeration.rb b/app/models/enumeration.rb index 2d27d2f86..bdb6ddd25 100644 --- a/app/models/enumeration.rb +++ b/app/models/enumeration.rb @@ -62,7 +62,7 @@ class Enumeration < ActiveRecord::Base named_scope :active, lambda { { - :conditions => {:active => true}, + :conditions => {:active => true, :project_id => nil}, :order => 'position' } } |