From c33bad5031a7a10cae2950ca03a5efa1bb9ae35b Mon Sep 17 00:00:00 2001
From: Marius Balteanu <marius.balteanu@zitec.com>
Date: Tue, 16 Jan 2024 16:35:00 +0000
Subject: [PATCH] Fix query columns selection in admin and my page (#39806).
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Patch by Jens Krämer.

git-svn-id: https://svn.redmine.org/redmine/trunk@22606 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/views/my/blocks/_issues.erb       | 2 ++
 app/views/settings/_issues.html.erb   | 4 ++++
 app/views/settings/_projects.html.erb | 4 ++++
 3 files changed, 10 insertions(+)

diff --git a/app/views/my/blocks/_issues.erb b/app/views/my/blocks/_issues.erb
index d7cff39e6..2b65df34b 100644
--- a/app/views/my/blocks/_issues.erb
+++ b/app/views/my/blocks/_issues.erb
@@ -10,9 +10,11 @@
 
 <div id="<%= block %>-settings" style="display:none;">
   <%= form_tag(my_page_path, :remote => true) do %>
+    <div id="list-definition">
     <div class="box">
       <%= render_query_columns_selection(query, :name => "settings[#{block}][columns]") %>
     </div>
+    </div>
     <p>
       <%= submit_tag l(:button_save) %>
       <%= link_to_function l(:button_cancel), "$('##{block}-settings').toggle();" %>
diff --git a/app/views/settings/_issues.html.erb b/app/views/settings/_issues.html.erb
index 7109e906f..3dc7fe413 100644
--- a/app/views/settings/_issues.html.erb
+++ b/app/views/settings/_issues.html.erb
@@ -39,9 +39,13 @@
 
 <fieldset class="box">
   <legend><%= l(:setting_issue_list_default_columns) %></legend>
+  <div id="list-definition">
+    <div>
   <%= render_query_columns_selection(
         IssueQuery.new(:column_names => Setting.issue_list_default_columns),
         :name => 'settings[issue_list_default_columns]') %>
+    </div>
+  </div>
 
   <p><%= setting_multiselect :issue_list_default_totals,
            IssueQuery.new(:totalable_names => Setting.issue_list_default_totals).available_totalable_columns.map {|c| [c.caption, c.name.to_s]},
diff --git a/app/views/settings/_projects.html.erb b/app/views/settings/_projects.html.erb
index 018a6c4cb..634988e29 100644
--- a/app/views/settings/_projects.html.erb
+++ b/app/views/settings/_projects.html.erb
@@ -26,8 +26,12 @@
       <%= content_tag('label', l(:"label_display_type_#{t}"), :for => "settings_project_list_display_type_#{t}", :class => "inline") %>
     <% end %>
   </p>
+  <div id="list-definition">
+    <div>
   <%= render_query_columns_selection(query,
         :name => 'settings[project_list_defaults][column_names]') %>
+    </div>
+  </div>
 
   <p>
     <label><%= l(:label_default_query) %></label>