From 49efe66ff51ef86893e69a60a4bfc2c1e9cdfce9 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Fri, 15 Mar 2019 07:50:50 +0000
Subject: [PATCH] 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
---
 app/controllers/context_menus_controller.rb | 3 +++
 app/views/context_menus/issues.html.erb     | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/app/controllers/context_menus_controller.rb b/app/controllers/context_menus_controller.rb
index 526aaa5a6..ca3cb0ce5 100644
--- 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 43e8ce33e..f957783ab 100644
--- 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 %>
 
-- 
2.39.5