Fixed: unchecking status filter on the issue list has no effect (#6844).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4387 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
@@ -78,10 +78,9 @@ module QueriesHelper
|
||||
# Give it a name, required to be valid
|
||||
@query = Query.new(:name => "_")
|
||||
@query.project = @project
|
||||
if params[:fields] and params[:fields].is_a? Array
|
||||
params[:fields].each do |field|
|
||||
@query.add_filter(field, params[:operators][field], params[:values][field])
|
||||
end
|
||||
if params[:fields]
|
||||
@query.filters = {}
|
||||
@query.add_filters(params[:fields], params[:operators], params[:values])
|
||||
else
|
||||
@query.available_filters.keys.each do |field|
|
||||
@query.add_short_filter(field, params[field]) if params[field]
|
||||
|
||||
+4
-2
@@ -258,8 +258,10 @@ class Query < ActiveRecord::Base
|
||||
|
||||
# Add multiple filters using +add_filter+
|
||||
def add_filters(fields, operators, values)
|
||||
fields.each do |field|
|
||||
add_filter(field, operators[field], values[field])
|
||||
if fields.is_a?(Array) && operators.is_a?(Hash) && values.is_a?(Hash)
|
||||
fields.each do |field|
|
||||
add_filter(field, operators[field], values[field])
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
@@ -114,3 +114,4 @@ Event.observe(document,"dom:loaded", apply_filters_observer);
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
<%= hidden_field_tag 'fields[]', '' %>
|
||||
|
||||
Reference in New Issue
Block a user