diff --git a/app/models/issue_query.rb b/app/models/issue_query.rb index 7e70d55c7..c55143ca8 100644 --- a/app/models/issue_query.rb +++ b/app/models/issue_query.rb @@ -137,6 +137,11 @@ class IssueQuery < Query :type => :list_optional, :values => role_values ) unless role_values.empty? + #done_values = [10,20,30,40,50,60,70,80,90,100] + #add_available_filter("done_ratio_111", + # :type => :list_optional, :values => done_values + #) + if versions.any? add_available_filter "fixed_version_id", :type => :list_optional, diff --git a/app/views/queries/_filters.html.erb b/app/views/queries/_filters.html.erb index 795f8075f..b7a18e8fc 100644 --- a/app/views/queries/_filters.html.erb +++ b/app/views/queries/_filters.html.erb @@ -1,28 +1,28 @@ <%= javascript_tag do %> -var operatorLabels = <%= raw_json Query.operators_labels %>; -var operatorByType = <%= raw_json Query.operators_by_filter_type %>; -var availableFilters = <%= raw_json query.available_filters_as_json %>; -var labelDayPlural = <%= raw_json l(:label_day_plural) %>; -var allProjects = <%= raw query.all_projects_values.to_json %>; -$(document).ready(function(){ - initFilters(); - <% query.filters.each do |field, options| %> - addFilter("<%= field %>", <%= raw_json query.operator_for(field) %>, <%= raw_json query.values_for(field) %>); - <% end %> -}); + var operatorLabels = <%= raw_json Query.operators_labels %>; + var operatorByType = <%= raw_json Query.operators_by_filter_type %>; + var availableFilters = <%= raw_json query.available_filters_as_json %>; + var labelDayPlural = <%= raw_json l(:label_day_plural) %>; + var allProjects = <%= raw query.all_projects_values.to_json %>; + $(document).ready(function(){ + initFilters(); + <% query.filters.each do |field, options| %> + addFilter("<%= field %>", <%= raw_json query.operator_for(field) %>, <%= raw_json query.values_for(field) %>); + <% end %> + }); <% end %>
- |
--<%= label_tag('add_filter_select', l(:label_filter_add)) %> -<%= select_tag 'add_filter_select', filters_options_for_select(query), :name => nil %> - | -
+ |
+ + <%= label_tag('add_filter_select', l(:label_filter_add)) %> + <%= select_tag 'add_filter_select', filters_options_for_select(query), :name => nil %> + | +