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

diff --git a/app/views/queries/_columns.html.erb b/app/views/queries/_columns.html.erb
index c5d14190e095635f5d0b0be508bff4af249f4d35..18443de57017bb54fde59cbb4a13a19633ef009d 100644 (file)
--- 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 %>