meineerde/redmine
1
0
Fork 0
mirror of https://github.com/meineerde/redmine.git synced 2025-12-23 00:41:14 +00:00
Code Issues Releases Wiki Activity

Disable description and columns when checking "Default columns" (#24907).

Browse Source 
git-svn-id: http://svn.redmine.org/redmine/trunk@16304 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang 2017-01-29 13:11:37 +00:00
parent 56159412b3
commit 1fefa970d6
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/views/queries/_form.html.erb
View File

@ -26,12 +26,12 @@
<fieldset id="options"><legend><%= l(:label_options) %></legend> <fieldset id="options"><legend><%= l(:label_options) %></legend>
<p><label for="query_default_columns"><%=l(:label_default_columns)%></label> <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', <%= check_box_tag 'default_columns', 1, @query.has_default_columns?, :id => 'query_default_columns',
:onclick => 'if (this.checked) {$("#columns").hide();} else {$("#columns").show();}' %></p> :data => {:disables => "#columns, .block_columns input"} %></p>
<p><label for="query_group_by"><%= l(:field_group_by) %></label> <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> <%= select 'query', 'group_by', @query.groupable_columns.collect {|c| [c.caption, c.name.to_s]}, :include_blank => true %></p>
<p><label><%= l(:button_show) %></label> <p class="block_columns"><label><%= l(:button_show) %></label>
<%= available_block_columns_tags(@query) %></p> <%= available_block_columns_tags(@query) %></p>
<p><label><%= l(:label_total_plural) %></label> <p><label><%= l(:label_total_plural) %></label>
@ -71,7 +71,7 @@
<% end %> <% end %>
<% unless params[:gantt] %> <% unless params[:gantt] %>
<%= content_tag 'fieldset', :id => 'columns', :style => (query.has_default_columns? ? 'display:none;' : nil) do %> <%= content_tag 'fieldset', :id => 'columns' do %>
<legend><%= l(:field_column_names) %></legend> <legend><%= l(:field_column_names) %></legend>
<%= render_query_columns_selection(query) %> <%= render_query_columns_selection(query) %>
<% end %> <% end %>