##// END OF EJS Templates
jro_apps » redmine
RSS
Remove useless settings when editing a query from the gantt (#16747)....
Jean-Philippe Lang -
r12893:b189d85dde8b
parent child
Show More
Side by Side Unified
Context file:
r12893:b189d85dde8b Loading diff...:
Show file before | Show file after | Hide comments
@@ -23,6 +23,7
23 <%= check_box_tag 'query_is_for_all', 1, @query.project.nil?,
23 <%= check_box_tag 'query_is_for_all', 1, @query.project.nil?,
24 :disabled => (!@query.new_record? && (@query.project.nil? || (@query.is_public? && !User.current.admin?))) %></p>
24 :disabled => (!@query.new_record? && (@query.project.nil? || (@query.is_public? && !User.current.admin?))) %></p>
25
25
26 <% unless params[:gantt] %>
26 <fieldset><legend><%= l(:label_options) %></legend>
27 <fieldset><legend><%= l(:label_options) %></legend>
27 <p><label for="query_default_columns"><%=l(:label_default_columns)%></label>
28 <p><label for="query_default_columns"><%=l(:label_default_columns)%></label>
28 <%= check_box_tag 'default_columns', 1, @query.has_default_columns?, :id => 'query_default_columns',
29 <%= check_box_tag 'default_columns', 1, @query.has_default_columns?, :id => 'query_default_columns',
@@ -33,20 +34,22
33
34
34 <p><label><%= l(:button_show) %></label>
35 <p><label><%= l(:button_show) %></label>
35 <%= available_block_columns_tags(@query) %></p>
36 <%= available_block_columns_tags(@query) %></p>
36
37 </fieldset>
37 <% if params[:gantt] %>
38 <% else %>
38 <p><label><%= l(:label_gantt) %></label>
39 <fieldset><legend><%= l(:label_options) %></legend>
40 <p><label><%= l(:button_show) %></label>
39 <label class="inline"><%= check_box_tag "query[draw_relations]", "1", @query.draw_relations %> <%= l(:label_related_issues) %></label>
41 <label class="inline"><%= check_box_tag "query[draw_relations]", "1", @query.draw_relations %> <%= l(:label_related_issues) %></label>
40 <label class="inline"><%= check_box_tag "query[draw_progress_line]", "1", @query.draw_progress_line %> <%= l(:label_gantt_progress_line) %></label>
42 <label class="inline"><%= check_box_tag "query[draw_progress_line]", "1", @query.draw_progress_line %> <%= l(:label_gantt_progress_line) %></label>
41 </p>
43 </p>
42 <% end %>
43 </fieldset>
44 </fieldset>
45 <% end %>
44 </div>
46 </div>
45
47
46 <fieldset id="filters"><legend><%= l(:label_filter_plural) %></legend>
48 <fieldset id="filters"><legend><%= l(:label_filter_plural) %></legend>
47 <%= render :partial => 'queries/filters', :locals => {:query => query}%>
49 <%= render :partial => 'queries/filters', :locals => {:query => query}%>
48 </fieldset>
50 </fieldset>
49
51
52 <% unless params[:gantt] %>
50 <fieldset><legend><%= l(:label_sort) %></legend>
53 <fieldset><legend><%= l(:label_sort) %></legend>
51 <% 3.times do |i| %>
54 <% 3.times do |i| %>
52 <%= i+1 %>:
55 <%= i+1 %>:
@@ -63,11 +66,14
63 <br />
66 <br />
64 <% end %>
67 <% end %>
65 </fieldset>
68 </fieldset>
69 <% end %>
66
70
71 <% unless params[:gantt] %>
67 <%= content_tag 'fieldset', :id => 'columns', :style => (query.has_default_columns? ? 'display:none;' : nil) do %>
72 <%= content_tag 'fieldset', :id => 'columns', :style => (query.has_default_columns? ? 'display:none;' : nil) do %>
68 <legend><%= l(:field_column_names) %></legend>
73 <legend><%= l(:field_column_names) %></legend>
69 <%= render_query_columns_selection(query) %>
74 <%= render_query_columns_selection(query) %>
70 <% end %>
75 <% end %>
76 <% end %>
71
77
72 </div>
78 </div>
73
79
General Comments 0
You need to be logged in to leave comments. Login now