From 30ed1a4be268d5b863ac736176dd275c08a54b2a Mon Sep 17 00:00:00 2001
From: Go MAEDA <maeda@farend.jp>
Date: Tue, 14 Jul 2020 07:57:06 +0000
Subject: [PATCH] Merged r19899 from trunk to 4.1-stable (#33724).

git-svn-id: http://svn.redmine.org/redmine/branches/4.1-stable@19900 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/views/queries/_columns.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/queries/_columns.html.erb b/app/views/queries/_columns.html.erb
index c5d14190e..18443de57 100644
--- a/app/views/queries/_columns.html.erb
+++ b/app/views/queries/_columns.html.erb
@@ -36,7 +36,7 @@
 <%= javascript_tag do %>
 $(document).ready(function(){
   $('.query-columns').closest('form').submit(function(){
-    $('#<%= selected_tag_id %> option').prop('selected', true);
+    $('#<%= selected_tag_id %> option:not(:disabled)').prop('selected', true);
   });
 });
 <% end %>