diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2008-03-23 16:16:55 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2008-03-23 16:16:55 +0000 |
| commit | 051875429eee26c964208c683ad1f131f6a8c054 (patch) | |
| tree | bf6f13a71fafc16a8ae8ad969a3a68e3b99c6a53 | |
| parent | 6936eb10222c95b15b9303c5c1089b30ef78c0f3 (diff) | |
| download | redmine-051875429eee26c964208c683ad1f131f6a8c054.tar.gz redmine-051875429eee26c964208c683ad1f131f6a8c054.zip | |
Fixed: 'This week' condition in filter consider monday as the first day of the week even if language sets otherwise (closes #913).
git-svn-id: http://redmine.rubyforge.org/svn/trunk@1291 e93f8b46-1217-0410-a6f0-8f06a7374b81
| -rw-r--r-- | app/models/query.rb | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/app/models/query.rb b/app/models/query.rb index 2b708ddda..99d13aa6a 100644 --- a/app/models/query.rb +++ b/app/models/query.rb @@ -339,7 +339,12 @@ 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.yesterday)] + from = l(:general_first_day_of_week) == '7' ? + # week starts on sunday + ((Date.today.cwday == 7) ? Time.now.at_beginning_of_day : Time.now.at_beginning_of_week - 1.day) : + # week starts on monday (Rails default) + Time.now.at_beginning_of_week + sql = sql + "#{db_table}.#{db_field} BETWEEN '%s' AND '%s'" % [connection.quoted_date(from), connection.quoted_date(from + 7.days)] when "~" sql = sql + "#{db_table}.#{db_field} LIKE '%#{connection.quote_string(v.first)}%'" when "!~" |