Filtering issues via context menu should not reset selected columns (#26836).

Patch by Vincent Robert.

git-svn-id: http://svn.redmine.org/redmine/trunk@17955 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/app/controllers/context_menus_controller.rb b/app/controllers/context_menus_controller.rb
index 526aaa5a6bca6a8666366d05a75e3b0038c8aad3..ca3cb0ce5897eae7ad4904dfd25b76715512c43e 100644 (file)
--- a/app/controllers/context_menus_controller.rb
+++ b/app/controllers/context_menus_controller.rb
@@ -45,6 +45,9 @@ class ContextMenusController < ApplicationController
     @priorities = IssuePriority.active.reverse
     @back = back_url
 
+    params = CGI.parse(@back)
+    @columns = params["c[]"]
+
     @options_by_custom_field = {}
     if @can[:edit]
       custom_fields = @issues.map(&:editable_custom_fields).reduce(:&).reject(&:multiple?).select {|field| field.format.bulk_edit_supported}

diff --git a/app/views/context_menus/issues.html.erb b/app/views/context_menus/issues.html.erb
index 43e8ce33efc35a61a80649eba4440d378ac3e9c6..f957783ab3fe24873e31d40886ff045b2578e157 100644 (file)
--- a/app/views/context_menus/issues.html.erb
+++ b/app/views/context_menus/issues.html.erb
@@ -134,7 +134,7 @@
 <% end %>
 
 <% unless @issue %>
-  <li><%= context_menu_link l(:button_filter), _project_issues_path(@project, :set_filter => 1, :status_id => "*", :issue_id => @issue_ids.join(",")),
+  <li><%= context_menu_link l(:button_filter), _project_issues_path(@project, :set_filter => 1, :status_id => "*", :issue_id => @issue_ids.join(","), :c => @columns),
           :class => 'icon icon-list' %></li>
 <% end %>