Send columns as a param to context menu instead of parsing back_url (#26836).

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

diff --git a/app/controllers/context_menus_controller.rb b/app/controllers/context_menus_controller.rb
index ca3cb0ce5897eae7ad4904dfd25b76715512c43e..03473e3e55e13e882a70385581f00835c49d1130 100644 (file)
--- a/app/controllers/context_menus_controller.rb
+++ b/app/controllers/context_menus_controller.rb
@@ -45,8 +45,7 @@ class ContextMenusController < ApplicationController
     @priorities = IssuePriority.active.reverse
     @back = back_url
 
-    params = CGI.parse(@back)
-    @columns = params["c[]"]
+    @columns = params[:c]
 
     @options_by_custom_field = {}
     if @can[:edit]

diff --git a/app/views/issues/_list.html.erb b/app/views/issues/_list.html.erb
index 06abc3ea55ca66e47a2b53e649b6fa5ad113fd59..99d9cbceb041905e2109592ab7a3586e7c82a430 100644 (file)
--- a/app/views/issues/_list.html.erb
+++ b/app/views/issues/_list.html.erb
@@ -3,6 +3,7 @@
 
 <%= form_tag({}, :data => {:cm_url => issues_context_menu_path}) do -%>
 <%= hidden_field_tag 'back_url', url_for(:params => request.query_parameters), :id => nil %>
+<%= query_columns_hidden_tags(query) %>
 <div class="autoscroll">
 <table class="list issues odd-even <%= query.css_classes %>">
   <thead>