From 691ecf86fb43162f2311fe95023248903e80f3dc Mon Sep 17 00:00:00 2001
From: ishikawa999 <remember929@gmail.com>
Date: Wed, 9 Oct 2019 05:44:45 +0000
Subject: [PATCH 2/2] Fix indentation in queries/_form

---
 app/views/queries/_form.html.erb | 143 ++++++++++++++++++++-------------------
 1 file changed, 73 insertions(+), 70 deletions(-)

diff --git a/app/views/queries/_form.html.erb b/app/views/queries/_form.html.erb
index 372352082..0a05b1e9f 100644
--- a/app/views/queries/_form.html.erb
+++ b/app/views/queries/_form.html.erb
@@ -1,86 +1,89 @@
 <%= error_messages_for 'query' %>
 
 <div class="box">
-<div class="tabular">
-<%= hidden_field_tag 'gantt', '1' if params[:gantt] %>
-<%= hidden_field_tag 'calendar', '1' if params[:calendar] %>
+  <div class="tabular">
+    <%= hidden_field_tag 'gantt', '1' if params[:gantt] %>
+    <%= hidden_field_tag 'calendar', '1' if params[:calendar] %>
 
-<p><label for="query_name"><%=l(:field_name)%></label>
-<%= text_field 'query', 'name', :size => 80 %></p>
+    <p><label for="query_name"><%=l(:field_name)%></label>
+    <%= text_field 'query', 'name', :size => 80 %></p>
 
-<% if User.current.admin? || User.current.allowed_to?(:manage_public_queries, @query.project) %>
-<p><label><%=l(:field_visible)%></label>
-  <label class="block"><%= radio_button 'query', 'visibility', Query::VISIBILITY_PRIVATE %> <%= l(:label_visibility_private) %></label>
-  <label class="block"><%= radio_button 'query', 'visibility', Query::VISIBILITY_PUBLIC %> <%= l(:label_visibility_public) %></label>
-  <label class="block"><%= radio_button 'query', 'visibility', Query::VISIBILITY_ROLES %> <%= l(:label_visibility_roles) %>:</label>
-  <% Role.givable.sorted.each do |role| %>
-    <label class="block role-visibility"><%= check_box_tag 'query[role_ids][]', role.id, @query.roles.include?(role), :id => nil %> <%= role.name %></label>
-  <% end %>
-  <%= hidden_field_tag 'query[role_ids][]', '' %>
-</p>
-<% end %>
+    <% if User.current.admin? || User.current.allowed_to?(:manage_public_queries, @query.project) %>
+      <p>
+        <label><%=l(:field_visible)%></label>
+        <label class="block"><%= radio_button 'query', 'visibility', Query::VISIBILITY_PRIVATE %> <%= l(:label_visibility_private) %></label>
+        <label class="block"><%= radio_button 'query', 'visibility', Query::VISIBILITY_PUBLIC %> <%= l(:label_visibility_public) %></label>
+        <label class="block"><%= radio_button 'query', 'visibility', Query::VISIBILITY_ROLES %> <%= l(:label_visibility_roles) %>:</label>
+        <% Role.givable.sorted.each do |role| %>
+          <label class="block role-visibility"><%= check_box_tag 'query[role_ids][]', role.id, @query.roles.include?(role), :id => nil %> <%= role.name %></label>
+        <% end %>
+        <%= hidden_field_tag 'query[role_ids][]', '' %>
+      </p>
+    <% end %>
 
-<p><label for="query_is_for_all"><%=l(:field_is_for_all)%></label>
-<%= check_box_tag 'query_is_for_all', 1, @query.project.nil?, :class => (User.current.admin? ? '' : 'disable-unless-private') %></p>
+    <p><label for="query_is_for_all"><%=l(:field_is_for_all)%></label>
+    <%= check_box_tag 'query_is_for_all', 1, @query.project.nil?, :class => (User.current.admin? ? '' : 'disable-unless-private') %></p>
 
-<% unless params[:calendar] %>
-<fieldset id="options"><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',
-      :data => {:disables => "#columns, .block_columns input"} %></p>
+    <% if params[:calendar].nil? %>
+      <fieldset id="options">
+        <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',
+              :data => {:disables => "#columns, .block_columns input"} %></p>
 
-<% unless params[:gantt] %>
-<p><label for="query_group_by"><%= l(:field_group_by) %></label>
-<%= select 'query', 'group_by', @query.groupable_columns.collect {|c| [c.caption, c.name.to_s]}, :include_blank => true %></p>
+        <% if params[:gantt].nil? %>
+          <p><label for="query_group_by"><%= l(:field_group_by) %></label>
+          <%= select 'query', 'group_by', @query.groupable_columns.collect {|c| [c.caption, c.name.to_s]}, :include_blank => true %></p>
 
-<p class="block_columns"><label><%= l(:button_show) %></label>
-<%= available_block_columns_tags(@query) %></p>
+          <p class="block_columns"><label><%= l(:button_show) %></label>
+          <%= available_block_columns_tags(@query) %></p>
 
-<p><label><%= l(:label_total_plural) %></label>
-<%= available_totalable_columns_tags(@query) %></p>
-<% else %>
-  <p><label><%= l(:button_show) %></label>
-  <%= hidden_field_tag 'query[draw_relations]', '0' %>
-  <%= hidden_field_tag 'query[draw_progress_line]', '0' %>
-  <%= hidden_field_tag 'query[draw_selected_columns]', '0' %>
-  <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>
-  <label class="inline"><%= check_box_tag "query[draw_selected_columns]", "1", @query.draw_selected_columns, :data => { :enables => 'span.query-columns select, span.query-columns input'} %> <%= l(:description_selected_columns) %></label>
-  </p>
-<% end # unless params[:gantt] %>
-</fieldset>
-<% end # unless params[:calendar] %>
-</div>
+          <p><label><%= l(:label_total_plural) %></label>
+          <%= available_totalable_columns_tags(@query) %></p>
+        <% else %>
+          <p>
+            <label><%= l(:button_show) %></label>
+            <%= hidden_field_tag 'query[draw_relations]', '0' %>
+            <%= hidden_field_tag 'query[draw_progress_line]', '0' %>
+            <%= hidden_field_tag 'query[draw_selected_columns]', '0' %>
+            <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>
+            <label class="inline"><%= check_box_tag "query[draw_selected_columns]", "1", @query.draw_selected_columns, :data => { :enables => 'span.query-columns select, span.query-columns input'} %> <%= l(:description_selected_columns) %></label>
+          </p>
+        <% end %>
+      </fieldset>
+    <% end %>
+  </div>
 
-<fieldset id="filters"><legend><%= l(:label_filter_plural) %></legend>
-<%= render :partial => 'queries/filters', :locals => {:query => query}%>
-</fieldset>
+  <fieldset id="filters"><legend><%= l(:label_filter_plural) %></legend>
+  <%= render :partial => 'queries/filters', :locals => {:query => query}%>
+  </fieldset>
 
-<% unless params[:calendar] %>
-<% unless params[:gantt] %>
-<fieldset><legend><%= l(:label_sort) %></legend>
-<% 3.times do |i| %>
-<%= content_tag(:span, "#{i+1}:", :class => 'query_sort_criteria_count')%>
-<%= label_tag "query_sort_criteria_attribute_" + i.to_s,
-              l(:description_query_sort_criteria_attribute), :class => "hidden-for-sighted" %>
-<%= select_tag("query[sort_criteria][#{i}][]",
-               options_for_select([[]] + query.available_columns.select(&:sortable?).collect {|column| [column.caption, column.name.to_s]}, @query.sort_criteria_key(i)),
-               :id => "query_sort_criteria_attribute_" + i.to_s)%>
-<%= label_tag "query_sort_criteria_direction_" + i.to_s,
-              l(:description_query_sort_criteria_direction), :class => "hidden-for-sighted" %>
-<%= select_tag("query[sort_criteria][#{i}][]",
-                options_for_select([[], [l(:label_ascending), 'asc'], [l(:label_descending), 'desc']], @query.sort_criteria_order(i)),
-                :id => "query_sort_criteria_direction_" + i.to_s) %>
-<br />
-<% end %>
-</fieldset>
-<% end %>
+  <% if params[:gantt].nil? && params[:calendar].nil? %>
+    <fieldset><legend><%= l(:label_sort) %></legend>
+    <% 3.times do |i| %>
+      <%= content_tag(:span, "#{i+1}:", :class => 'query_sort_criteria_count')%>
+      <%= label_tag "query_sort_criteria_attribute_" + i.to_s,
+                    l(:description_query_sort_criteria_attribute), :class => "hidden-for-sighted" %>
+      <%= select_tag("query[sort_criteria][#{i}][]",
+                    options_for_select([[]] + query.available_columns.select(&:sortable?).collect {|column| [column.caption, column.name.to_s]}, @query.sort_criteria_key(i)),
+                    :id => "query_sort_criteria_attribute_" + i.to_s)%>
+      <%= label_tag "query_sort_criteria_direction_" + i.to_s,
+                    l(:description_query_sort_criteria_direction), :class => "hidden-for-sighted" %>
+      <%= select_tag("query[sort_criteria][#{i}][]",
+                      options_for_select([[], [l(:label_ascending), 'asc'], [l(:label_descending), 'desc']], @query.sort_criteria_order(i)),
+                      :id => "query_sort_criteria_direction_" + i.to_s) %>
+      <br />
+    <% end %>
+    </fieldset>
+  <% end %>
 
-<%= content_tag 'fieldset', :id => 'columns' do %>
-<legend><%= l(:field_column_names) %></legend>
-<%= render_query_columns_selection(query) %>
-<% end %>
-<% end # unless params[:calendar] %>
+  <% if params[:calendar].nil? %>
+    <%= content_tag 'fieldset', :id => 'columns' do %>
+      <legend><%= l(:field_column_names) %></legend>
+      <%= render_query_columns_selection(query) %>
+    <% end %>
+  <% end %>
 
 </div>
 
-- 
2.11.0