jro_apps/redmine Commit - r14989:699a75910db7

Filter by issue id (#4806)....

Jean-Philippe Lang -

r14989:699a75910db7

parent child

Context file:

r14989:699a75910db7

Collapse all files

app/models/issue_query.rb +11 0

                  add_available_filter "parent_id", :type => :tree, :label => :field_parent_issue
                  add_available_filter "child_id", :type => :tree, :label => :label_subtask_plural
+                 add_available_filter "issue_id", :type => :integer, :label => :label_issue
                  Tracker.disabled_core_fields(trackers).each {|field|
                    delete_available_filter field
                  }
                  end
                end
+               def sql_for_issue_id_field(field, operator, value)
+                 ids = value.first.to_s.scan(/\d+/).map(&:to_i).join(",")
+                 if ids.present?
+                   "#{Issue.table_name}.id IN (#{ids})"
+                 else
+                   "1=0"
+                 end
+               end
                def sql_for_relations(field, operator, value, options={})
                  relation_options = IssueRelation::TYPES[field]
                  return relation_options unless relation_options

app/models/query.rb +9 -4

                    if values_for(field)
                      case type_for(field)
                      when :integer
-                       add_filter_error(field, :invalid) if values_for(field).detect {|v| v.present? && !v.match(/^[+-]?\d+$/) }
+                       add_filter_error(field, :invalid) if values_for(field).detect {|v| v.present? && !v.match(/\A[+-]?\d+(,[+-]?\d+)*\z/) }
                      when :float
-                       add_filter_error(field, :invalid) if values_for(field).detect {|v| v.present? && !v.match(/^[+-]?\d+(\.\d*)?$/) }
+                       add_filter_error(field, :invalid) if values_for(field).detect {|v| v.present? && !v.match(/\A[+-]?\d+(\.\d*)?\z/) }
                      when :date, :date_past
                        case operator_for(field)
                        when "=", ">=", "<=", "><"
                      when :date, :date_past
                        sql = date_clause(db_table, db_field, parse_date(value.first), parse_date(value.first), is_custom_filter)
                      when :integer
+                       int_values = value.first.to_s.scan(/[+-]?\d+/).map(&:to_i).join(",")
+                       if int_values.present?
                        if is_custom_filter
-                         sql = "(#{db_table}.#{db_field} <> '' AND CAST(CASE #{db_table}.#{db_field} WHEN '' THEN '0' ELSE #{db_table}.#{db_field} END AS decimal(30,3)) = #{value.first.to_i})"
+                           sql = "(#{db_table}.#{db_field} <> '' AND CAST(CASE #{db_table}.#{db_field} WHEN '' THEN '0' ELSE #{db_table}.#{db_field} END AS decimal(30,3)) IN (#{int_values}))"
                        else
-                         sql = "#{db_table}.#{db_field} = #{value.first.to_i}"
+                           sql = "#{db_table}.#{db_field} IN (#{int_values})"
+                         end
+                       else
+                         sql = "1=0"
                        end
                      when :float
                        if is_custom_filter

app/views/context_menus/issues.html.erb +5 0

                <li><%= watcher_link(@issues, User.current) %></li>
              <% end %>
+             <% unless @issue %>
+               <li><%= context_menu_link l(:button_filter), _project_issues_path(@project, :set_filter => 1, :issue_id => @issue_ids.join(",")),
+                       :class => 'icon-list' %></li>
+             <% end %>
              <% if @issue.present? %>
                <% if @can[:log_time] -%>
                <li><%= context_menu_link l(:button_log_time), new_issue_time_entry_path(@issue),

config/locales/en.yml +1 0

                button_close: Close
                button_reopen: Reopen
                button_import: Import
+               button_filter: Filter
                status_active: active
                status_registered: registered

config/locales/fr.yml +1 0

                button_close: Fermer
                button_reopen: Réouvrir
                button_import: Importer
+               button_filter: Filtrer
                status_active: actif
                status_registered: enregistré

public/javascripts/application.js +2 -2

                case "float":
                case "tree":
                  tr.find('td.values').append(
-                   '<span style="display:none;"><input type="text" name="v['+field+'][]" id="values_'+fieldId+'_1" size="6" class="value" /></span>' +
-                   ' <span style="display:none;"><input type="text" name="v['+field+'][]" id="values_'+fieldId+'_2" size="6" class="value" /></span>'
+                   '<span style="display:none;"><input type="text" name="v['+field+'][]" id="values_'+fieldId+'_1" size="14" class="value" /></span>' +
+                   ' <span style="display:none;"><input type="text" name="v['+field+'][]" id="values_'+fieldId+'_2" size="14" class="value" /></span>'
                  );
                  $('#values_'+fieldId+'_1').val(values[0]);
                  $('#values_'+fieldId+'_2').val(values[1]);

public/stylesheets/application.css +1 0

              .icon-ok { background-image: url(../images/true.png); }
              .icon-not-ok { background-image: url(../images/false.png); }
              .icon-link-break { background-image: url(../images/link_break.png); }
+             .icon-list { background-image: url(../images/text_list_bullets.png); }
              .icon-file { background-image: url(../images/files/default.png); }
              .icon-file.text-plain { background-image: url(../images/files/text.png); }

test/unit/query_test.rb +8 0

                  assert_equal 2, issues.first.id
                end
+               def test_operator_is_on_integer_should_accept_comma_separated_values
+                 query = IssueQuery.new(:name => '_')
+                 query.add_filter("issue_id", '=', ['1,3'])
+                 issues = find_issues_with_query(query)
+                 assert_equal 2, issues.size
+                 assert_equal [1,3], issues.map(&:id).sort
+               end
                def test_operator_is_on_integer_custom_field
                  f = IssueCustomField.create!(:name => 'filter', :field_format => 'int', :is_for_all => true, :is_filter => true, :trackers => Tracker.all)
                  CustomValue.create!(:custom_field => f, :customized => Issue.find(1), :value => '7')

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	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