summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJean-Philippe Lang <jp_lang@yahoo.fr>2007-09-06 16:24:12 +0000
committerJean-Philippe Lang <jp_lang@yahoo.fr>2007-09-06 16:24:12 +0000
commit22c5e0d61481f4d33d4eab48a7007ad49fb00190 (patch)
tree993262eec155436b64f47e2db8546970279481d2
parent22ad806a439e8163895ae029ce4c462dbf9e7d9d (diff)
downloadredmine-22c5e0d61481f4d33d4eab48a7007ad49fb00190.tar.gz
redmine-22c5e0d61481f4d33d4eab48a7007ad49fb00190.zip
'current week' filter fix.
git-svn-id: http://redmine.rubyforge.org/svn/trunk@709 e93f8b46-1217-0410-a6f0-8f06a7374b81
-rw-r--r--app/models/query.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/query.rb b/app/models/query.rb
index 87569fe08..9bc15c0b9 100644
--- a/app/models/query.rb
+++ b/app/models/query.rb
@@ -240,7 +240,7 @@ class Query < ActiveRecord::Base
when "t"
sql = sql + "#{db_table}.#{db_field} BETWEEN '%s' AND '%s'" % [connection.quoted_date(Date.today.to_time), connection.quoted_date((Date.today+1).to_time)]
when "w"
- sql = sql + "#{db_table}.#{db_field} BETWEEN '%s' AND '%s'" % [connection.quoted_date(Time.now.at_beginning_of_week), connection.quoted_date(Time.now.next_week)]
+ sql = sql + "#{db_table}.#{db_field} BETWEEN '%s' AND '%s'" % [connection.quoted_date(Time.now.at_beginning_of_week), connection.quoted_date(Time.now.next_week.yesterday)]
when "~"
sql = sql + "#{db_table}.#{db_field} LIKE '%#{connection.quote_string(v.first)}%'"
when "!~"