OSDN Git Service

'current week' filter fix.
authorJean-Philippe Lang <jp_lang@yahoo.fr>
Thu, 6 Sep 2007 16:24:12 +0000 (16:24 +0000)
committerJean-Philippe Lang <jp_lang@yahoo.fr>
Thu, 6 Sep 2007 16:24:12 +0000 (16:24 +0000)
git-svn-id: http://redmine.rubyforge.org/svn/trunk@709 e93f8b46-1217-0410-a6f0-8f06a7374b81

app/models/query.rb

index 87569fe..9bc15c0 100644 (file)
@@ -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 "!~"