jro_apps/redmine Commit - r693:c27106d8595c

app/models/query.rb +6 -3

                               ">t+" => :label_in_more_than,
                               "t+"  => :label_in,
                               "t"   => :label_today,
+                              "w"   => :label_this_week,
                               ">t-" => :label_less_than_ago,
                               "<t-" => :label_more_than_ago,
                               "t-"  => :label_ago,
                                              :list_status => [ "o", "=", "!", "c", "*" ],
                                              :list_optional => [ "=", "!", "!*", "*" ],
                                              :list_one_or_more => [ "*", "=" ],
-                                             :date => [ "<t+", ">t+", "t+", "t", ">t-", "<t-", "t-" ],
+                                             :date => [ "<t+", ">t+", "t+", "t", "w", ">t-", "<t-", "t-" ],
-                                             :date_past => [ ">t-", "<t-", "t-", "t" ],
+                                             :date_past => [ ">t-", "<t-", "t-", "t", "w" ],
                                              :string => [ "=", "~", "!", "!~" ],
                                              :text => [  "~", "!~" ] }
                       # filter requires one or more values
                       (values_for(field) and !values_for(field).first.empty?) or
                       # filter doesn't require any value
-                      ["o", "c", "!*", "*", "t"].include? operator_for(field)
+                      ["o", "c", "!*", "*", "t", "w"].include? operator_for(field)
                 end if filters
               end
                     sql = sql + "#{db_table}.#{db_field} BETWEEN '%s' AND '%s'" % [connection.quoted_date((Date.today + v.first.to_i).to_time), connection.quoted_date((Date.today + v.first.to_i + 1).to_time)]
                   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)]
                   when "~"
                     sql = sql + "#{db_table}.#{db_field} LIKE '%#{connection.quote_string(v.first)}%'"
                   when "!~"

app/views/queries/_filters.rhtml +1 0

                 case "!*":
                 case "*":
                 case "t":
+                case "w":
                 case "o":
                 case "c":
                   Element.hide("div_values_" + field);

lang/bg.yml +1 0

             label_in_more_than: повече от
             label_in: в следващите
             label_today: днес
+            label_this_week: this week
             label_less_than_ago: преди по-малко от
             label_more_than_ago: преди повече от
             label_ago: преди дни

lang/de.yml +1 0

             label_in_more_than: in mehr als
             label_in: an
             label_today: heute
+            label_this_week: this week
             label_less_than_ago: vor weniger als
             label_more_than_ago: vor mehr als
             label_ago: vor

lang/en.yml +1 0

             label_in_more_than: in more than
             label_in: in
             label_today: today
+            label_this_week: this week
             label_less_than_ago: less than days ago
             label_more_than_ago: more than days ago
             label_ago: days ago

lang/es.yml +1 0

             label_in_more_than: en más que
             label_in: en
             label_today: hoy
+            label_this_week: this week
             label_less_than_ago: hace menos de
             label_more_than_ago: hace más de
             label_ago: hace

lang/fr.yml +1 0

             label_in_more_than: dans plus de
             label_in: dans
             label_today: aujourd'hui
+            label_this_week: cette semaine
             label_less_than_ago: il y a moins de
             label_more_than_ago: il y a plus de
             label_ago: il y a

lang/it.yml +1 0

             label_in_more_than: è maggiore di
             label_in: in
             label_today: oggi
+            label_this_week: this week
             label_less_than_ago: meno di giorni fa
             label_more_than_ago: più di giorni fa
             label_ago: giorni fa

lang/ja.yml +1 0

             label_in_more_than: 残日数がこれより少ない
             label_in: 残日数
             label_today: 今日
+            label_this_week: this week
             label_less_than_ago: 経過日数がこれより少ない
             label_more_than_ago: 経過日数がこれより多い
             label_ago: 日前

lang/nl.yml +1 0

             label_in_more_than: in meer dan
             label_in: in
             label_today: vandaag
+            label_this_week: this week
             label_less_than_ago: minder dan dagen geleden
             label_more_than_ago: meer dan dagen geleden
             label_ago: dagen geleden

lang/pt-br.yml +1 0

             label_in_more_than: e menor que
             label_in: em
             label_today: hoje
+            label_this_week: this week
             label_less_than_ago: faz menos de
             label_more_than_ago: faz mais de
             label_ago: dias atras

lang/pt.yml +1 0

             label_in_more_than: é menor que
             label_in: em
             label_today: hoje
+            label_this_week: this week
             label_less_than_ago: faz menos de
             label_more_than_ago: faz mais de
             label_ago: dias atrás

lang/sv.yml +1 0

             label_in_more_than: i mer än
             label_in: i
             label_today: idag
+            label_this_week: this week
             label_less_than_ago: mindre än dagar sedan
             label_more_than_ago: mer än dagar sedan
             label_ago: dagar sedan

lang/zh.yml +1 0

             label_in_more_than: 剩余天数大于
             label_in: 剩余天数
             label_today: 今天
+            label_this_week: this week
             label_less_than_ago: 之前天数少于
             label_more_than_ago: 之前天数大于
             label_ago: 之前天数

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages