diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2019-03-15 07:54:17 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2019-03-15 07:54:17 +0000 |
| commit | 5cedc4ad3503704ae874523328762a87ca710a82 (patch) | |
| tree | 6efaabd08841db9862a66465b75f8da99c12355c | |
| parent | f914aac12127e0786205cf0cde87e42103075b6d (diff) | |
| download | redmine-5cedc4ad3503704ae874523328762a87ca710a82.tar.gz redmine-5cedc4ad3503704ae874523328762a87ca710a82.zip | |
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
| -rw-r--r-- | app/controllers/context_menus_controller.rb | 2 | ||||
| -rw-r--r-- | app/views/context_menus/issues.html.erb | 2 | ||||
| -rw-r--r-- | app/views/issues/_list.html.erb | 1 |
3 files changed, 4 insertions, 1 deletions
diff --git a/app/controllers/context_menus_controller.rb b/app/controllers/context_menus_controller.rb index bd6977503..3cb9c3a3b 100644 --- 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 7919472af..f979cd0e2 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 %> diff --git a/app/views/issues/_list.html.erb b/app/views/issues/_list.html.erb index d704a58bb..bbd69c4ce 100644 --- 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> |