Redmine 4.1.1

This commit is contained in:
Manuel Cillero 2020-11-22 21:20:06 +01:00
parent 33e7b881a5
commit 3d976f1b3b
1593 changed files with 36180 additions and 19489 deletions

View file

@ -5,41 +5,51 @@
<div id="query_form_with_buttons" class="hide-when-print">
<div id="query_form_content">
<fieldset id="filters" class="collapsible <%= @query.new_record? ? "" : "collapsed" %>">
<legend onclick="toggleFieldset(this);"><%= l(:label_filter_plural) %></legend>
<legend onclick="toggleFieldset(this);" class="icon icon-<%= @query.new_record? ? "expended" : "collapsed" %>"><%= l(:label_filter_plural) %></legend>
<div style="<%= @query.new_record? ? "" : "display: none;" %>">
<%= render :partial => 'queries/filters', :locals => {:query => @query} %>
</div>
</fieldset>
<fieldset id="options" class="collapsible collapsed">
<legend onclick="toggleFieldset(this);"><%= l(:label_options) %></legend>
<div style="display: none;">
<table>
<tr>
<td class="field"><%= l(:field_column_names) %></td>
<td><%= render_query_columns_selection(@query) %></td>
</tr>
<% if @query.groupable_columns.any? %>
<tr>
<td class="field"><label for='group_by'><%= l(:field_group_by) %></label></td>
<td><%= group_by_column_select_tag(@query) %></td>
</tr>
<% end %>
<% if @query.available_block_columns.any? %>
<tr>
<td class="field"><%= l(:button_show) %></td>
<td><%= available_block_columns_tags(@query) %></td>
</tr>
<% end %>
<% if @query.available_totalable_columns.any? %>
<tr>
<td><%= l(:label_total_plural) %></td>
<td><%= available_totalable_columns_tags(@query) %></td>
</tr>
<% end %>
</table>
</div>
</fieldset>
<% if @query.available_columns.any? %>
<fieldset id="options" class="collapsible collapsed">
<legend onclick="toggleFieldset(this);" class="icon icon-collapsed"><%= l(:label_options) %></legend>
<div class="hidden">
<% if @query.available_display_types.size > 1 %>
<div>
<span class="field"><label for='display_type'><%= l(:label_display_type) %></label></span>
<%= available_display_types_tags(@query) %>
</div>
<% end %>
<table id="list-definition" class="<%= 'hidden' if (@query.display_type != 'list') %>">
<% if @query.available_columns.any? %>
<tr>
<td class="field"><%= l(:field_column_names) %></td>
<td><%= render_query_columns_selection(@query) %></td>
</tr>
<% end %>
<% if @query.groupable_columns.any? %>
<tr>
<td class="field"><label for='group_by'><%= l(:field_group_by) %></label></td>
<td><%= group_by_column_select_tag(@query) %></td>
</tr>
<% end %>
<% if @query.available_block_columns.any? %>
<tr>
<td class="field"><%= l(:button_show) %></td>
<td><%= available_block_columns_tags(@query) %></td>
</tr>
<% end %>
<% if @query.available_totalable_columns.any? %>
<tr>
<td><%= l(:label_total_plural) %></td>
<td><%= available_totalable_columns_tags(@query) %></td>
</tr>
<% end %>
</table>
</div>
</fieldset>
<% end %>
</div>
<p class="buttons">
@ -61,3 +71,17 @@
</div>
<%= error_messages_for @query %>
<%= javascript_tag do %>
$(function ($) {
$('input[name=display_type]').change(function (e) {
if ($("#display_type_list").is(':checked')) {
$('table#list-definition').show();
} else {
$('table#list-definition').hide();
}
})
});
<% end %>