Skip to content

O
OHR Support
Commit 1590ad25 authored by Jean-Philippe Lang's avatar Jean-Philippe Lang
Browse files
Options

Added "% done" in the filter list. 

git-svn-id: http://redmine.rubyforge.org/svn/trunk@721 e93f8b46-1217-0410-a6f0-8f06a7374b81
parent b4d9ca88
Hide whitespace changes
Inline Side-by-side
Showing with 12 additions and 2 deletions
app/models/query.rb
View file @ 1590ad25
...@@ -32,6 +32,8 @@ class Query < ActiveRecord::Base ...@@ -32,6 +32,8 @@ class Query < ActiveRecord::Base
"c" => :label_closed_issues, "c" => :label_closed_issues,
"!*" => :label_none, "!*" => :label_none,
"*" => :label_all, "*" => :label_all,
">=" => '>=',
"<=" => '<=',
"<t+" => :label_in_less_than, "<t+" => :label_in_less_than,
">t+" => :label_in_more_than, ">t+" => :label_in_more_than,
"t+" => :label_in, "t+" => :label_in,
...@@ -52,7 +54,8 @@ class Query < ActiveRecord::Base ...@@ -52,7 +54,8 @@ class Query < ActiveRecord::Base
:date => [ "<t+", ">t+", "t+", "t", "w", ">t-", "<t-", "t-" ], :date => [ "<t+", ">t+", "t+", "t", "w", ">t-", "<t-", "t-" ],
:date_past => [ ">t-", "<t-", "t-", "t", "w" ], :date_past => [ ">t-", "<t-", "t-", "t", "w" ],
:string => [ "=", "~", "!", "!~" ], :string => [ "=", "~", "!", "!~" ],
:text => [ "~", "!~" ] } :text => [ "~", "!~" ],
:integer => [ "=", ">=", "<=" ] }
cattr_reader :operators_by_filter_type cattr_reader :operators_by_filter_type
...@@ -91,7 +94,8 @@ class Query < ActiveRecord::Base ...@@ -91,7 +94,8 @@ class Query < ActiveRecord::Base
"created_on" => { :type => :date_past, :order => 9 }, "created_on" => { :type => :date_past, :order => 9 },
"updated_on" => { :type => :date_past, :order => 10 }, "updated_on" => { :type => :date_past, :order => 10 },
"start_date" => { :type => :date, :order => 11 }, "start_date" => { :type => :date, :order => 11 },
"due_date" => { :type => :date, :order => 12 } } "due_date" => { :type => :date, :order => 12 },
"done_ratio" => { :type => :integer, :order => 13 }}
user_values = [] user_values = []
if project if project
...@@ -221,6 +225,10 @@ class Query < ActiveRecord::Base ...@@ -221,6 +225,10 @@ class Query < ActiveRecord::Base
sql = sql + "#{db_table}.#{db_field} IS NULL" sql = sql + "#{db_table}.#{db_field} IS NULL"
when "*" when "*"
sql = sql + "#{db_table}.#{db_field} IS NOT NULL" sql = sql + "#{db_table}.#{db_field} IS NOT NULL"
when ">="
sql = sql + "#{db_table}.#{db_field} >= #{v.first.to_i}"
when "<="
sql = sql + "#{db_table}.#{db_field} <= #{v.first.to_i}"
when "o" when "o"
sql = sql + "#{IssueStatus.table_name}.is_closed=#{connection.quoted_false}" if field == "status_id" sql = sql + "#{IssueStatus.table_name}.is_closed=#{connection.quoted_false}" if field == "status_id"
when "c" when "c"
......
app/views/queries/_filters.rhtml
View file @ 1590ad25
...@@ -84,6 +84,8 @@ function toggle_multi_select(field) { ...@@ -84,6 +84,8 @@ function toggle_multi_select(field) {
<%= text_field_tag "values[#{field}][]", query.values_for(field), :id => "values_#{field}", :size => 3, :class => "select-small" %> <%= l(:label_day_plural) %> <%= text_field_tag "values[#{field}][]", query.values_for(field), :id => "values_#{field}", :size => 3, :class => "select-small" %> <%= l(:label_day_plural) %>
<% when :string, :text %> <% when :string, :text %>
<%= text_field_tag "values[#{field}][]", query.values_for(field), :id => "values_#{field}", :size => 30, :class => "select-small" %> <%= text_field_tag "values[#{field}][]", query.values_for(field), :id => "values_#{field}", :size => 30, :class => "select-small" %>
<% when :integer %>
<%= text_field_tag "values[#{field}][]", query.values_for(field), :id => "values_#{field}", :size => 3, :class => "select-small" %>
<% end %> <% end %>
</div> </div>
<script type="text/javascript">toggle_filter('<%= field %>');</script> <script type="text/javascript">toggle_filter('<%= field %>');</script>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment