summaryrefslogtreecommitdiffstats
path: root/app/models/time_entry.rb
diff options
context:
space:
mode:
authorToshi MARUYAMA <marutosijp2@yahoo.co.jp>2012-04-26 23:51:10 +0000
committerToshi MARUYAMA <marutosijp2@yahoo.co.jp>2012-04-26 23:51:10 +0000
commitd0d01d4e704b0d15dfd3ce2d5213ab8b5a6678fb (patch)
tree31a2f938e01ae8032d0e4c19d979f7df575d332e /app/models/time_entry.rb
parent71649ba2f137f3a48af031193af2b7f315519299 (diff)
downloadredmine-d0d01d4e704b0d15dfd3ce2d5213ab8b5a6678fb.tar.gz
redmine-d0d01d4e704b0d15dfd3ce2d5213ab8b5a6678fb.zip
model: replace Rails2 "named_scope" to Rails3 "scope"
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9537 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/models/time_entry.rb')
-rw-r--r--app/models/time_entry.rb8
1 files changed, 4 insertions, 4 deletions
diff --git a/app/models/time_entry.rb b/app/models/time_entry.rb
index 6dbf78413..e6668281f 100644
--- a/app/models/time_entry.rb
+++ b/app/models/time_entry.rb
@@ -42,19 +42,19 @@ class TimeEntry < ActiveRecord::Base
before_validation :set_project_if_nil
validate :validate_time_entry
- named_scope :visible, lambda {|*args| {
+ scope :visible, lambda {|*args| {
:include => :project,
:conditions => Project.allowed_to_condition(args.shift || User.current, :view_time_entries, *args)
}}
- named_scope :on_issue, lambda {|issue| {
+ scope :on_issue, lambda {|issue| {
:include => :issue,
:conditions => "#{Issue.table_name}.root_id = #{issue.root_id} AND #{Issue.table_name}.lft >= #{issue.lft} AND #{Issue.table_name}.rgt <= #{issue.rgt}"
}}
- named_scope :on_project, lambda {|project, include_subprojects| {
+ scope :on_project, lambda {|project, include_subprojects| {
:include => :project,
:conditions => project.project_condition(include_subprojects)
}}
- named_scope :spent_between, lambda {|from, to|
+ scope :spent_between, lambda {|from, to|
if from && to
{:conditions => ["#{TimeEntry.table_name}.spent_on BETWEEN ? AND ?", from, to]}
elsif from