From 72d81e9b6f4efd5a0c749e2ef7e72c898597de40 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Thu, 26 Jun 2014 19:34:59 +0000
Subject: [PATCH] Merged r13168 (#16747).

git-svn-id: http://svn.redmine.org/redmine/branches/2.5-stable@13192 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/views/queries/_form.html.erb | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/app/views/queries/_form.html.erb b/app/views/queries/_form.html.erb
index c9f710ac0..fc03b857d 100644
--- a/app/views/queries/_form.html.erb
+++ b/app/views/queries/_form.html.erb
@@ -23,6 +23,7 @@
 <%= check_box_tag 'query_is_for_all', 1, @query.project.nil?,
       :disabled => (!@query.new_record? && (@query.project.nil? || (@query.is_public? && !User.current.admin?))) %></p>
 
+<% unless params[:gantt] %>
 <fieldset><legend><%= l(:label_options) %></legend>
 <p><label for="query_default_columns"><%=l(:label_default_columns)%></label>
 <%= check_box_tag 'default_columns', 1, @query.has_default_columns?, :id => 'query_default_columns',
@@ -33,20 +34,22 @@
 
 <p><label><%= l(:button_show) %></label>
 <%= available_block_columns_tags(@query) %></p>
-
-<% if params[:gantt] %>
-  <p><label><%= l(:label_gantt) %></label>
+</fieldset>
+<% else %>
+<fieldset><legend><%= l(:label_options) %></legend>
+  <p><label><%= l(:button_show) %></label>
   <label class="inline"><%= check_box_tag "query[draw_relations]", "1", @query.draw_relations %> <%= l(:label_related_issues) %></label>
   <label class="inline"><%= check_box_tag "query[draw_progress_line]", "1", @query.draw_progress_line %> <%= l(:label_gantt_progress_line) %></label>
   </p>
-<% end %>
 </fieldset>
+<% end %>
 </div>
 
 <fieldset id="filters"><legend><%= l(:label_filter_plural) %></legend>
 <%= render :partial => 'queries/filters', :locals => {:query => query}%>
 </fieldset>
 
+<% unless params[:gantt] %>
 <fieldset><legend><%= l(:label_sort) %></legend>
 <% 3.times do |i| %>
 <%= i+1 %>: 
@@ -63,11 +66,14 @@
 <br />
 <% end %>
 </fieldset>
+<% end %>
 
+<% unless params[:gantt] %>
 <%= content_tag 'fieldset', :id => 'columns', :style => (query.has_default_columns? ? 'display:none;' : nil) do %>
 <legend><%= l(:field_column_names) %></legend>
 <%= render_query_columns_selection(query) %>
 <% end %>
+<% end %>
 
 </div>
 
-- 
2.39.5