Merged r17955 and r17956 to 4.0-stable (#26836).

git-svn-id: http://svn.redmine.org/redmine/branches/4.0-stable@17957 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/app/controllers/context_menus_controller.rb b/app/controllers/context_menus_controller.rb
index bd6977503ccf369ceed4735bf4caaf647d3f1396..3cb9c3a3b21bcbede286c9522c29c83cfe090e6b 100644 (file)
--- a/app/controllers/context_menus_controller.rb
+++ b/app/controllers/context_menus_controller.rb
@@ -43,6 +43,8 @@ class ContextMenusController < ApplicationController
     @priorities = IssuePriority.active.reverse
     @back = back_url
 
+    @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 7919472af0e6a22c3c5cb7f84617894b2051e4f6..f979cd0e2f2e4bb268c7d98bc40a389e6356592f 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 %>
 

diff --git a/app/views/issues/_list.html.erb b/app/views/issues/_list.html.erb
index d704a58bbf6e75f82afdc24870e3fea10e6a0e43..bbd69c4ce3e9598824d725076eacb6652e42866f 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>