summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJean-Philippe Lang <jp_lang@yahoo.fr>2019-03-15 07:50:50 +0000
committerJean-Philippe Lang <jp_lang@yahoo.fr>2019-03-15 07:50:50 +0000
commit49efe66ff51ef86893e69a60a4bfc2c1e9cdfce9 (patch)
tree7f3aa910e4a8cf43998e881fe3d53ca089928321
parent8d6ecfa068fcdc0c9d189ff3fdbb37024c5d72d6 (diff)
downloadredmine-49efe66ff51ef86893e69a60a4bfc2c1e9cdfce9.tar.gz
redmine-49efe66ff51ef86893e69a60a4bfc2c1e9cdfce9.zip
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
-rw-r--r--app/controllers/context_menus_controller.rb3
-rw-r--r--app/views/context_menus/issues.html.erb2
2 files changed, 4 insertions, 1 deletions
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 %>