diff options
Diffstat (limited to 'app/views/issues/index.rhtml')
| -rw-r--r-- | app/views/issues/index.rhtml | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/app/views/issues/index.rhtml b/app/views/issues/index.rhtml index 5eddb7052..5b8fa05a7 100644 --- a/app/views/issues/index.rhtml +++ b/app/views/issues/index.rhtml @@ -20,8 +20,16 @@ <fieldset class="collapsible collapsed"> <legend onclick="toggleFieldset(this);"><%= l(:label_options) %></legend> <div style="display: none;"> - <%= l(:field_group_by) %> - <%= select_tag('group_by', options_for_select([[]] + @query.groupable_columns.collect {|c| [c.caption, c.name.to_s]}, @query.group_by)) %> + <table> + <tr> + <td><%= l(:field_column_names) %></td> + <td><%= render :partial => 'queries/columns', :locals => {:query => @query} %></td> + </tr> + <tr> + <td><%= l(:field_group_by) %></td> + <td><%= select_tag('group_by', options_for_select([[]] + @query.groupable_columns.collect {|c| [c.caption, c.name.to_s]}, @query.group_by)) %></td> + </tr> + </table> </div> </fieldset> </div> @@ -29,6 +37,7 @@ <%= link_to_remote l(:button_apply), { :url => { :set_filter => 1 }, + :before => 'selectAllOptions("selected_columns");', :update => "content", :with => "Form.serialize('query_form')" }, :class => 'icon icon-checked' %> @@ -40,7 +49,7 @@ }, :class => 'icon icon-reload' %> <% if @query.new_record? && User.current.allowed_to?(:save_queries, @project, :global => true) %> - <%= link_to l(:button_save), {}, :onclick => "$('query_form').submit(); return false;", :class => 'icon icon-save' %> + <%= link_to l(:button_save), {}, :onclick => "selectAllOptions('selected_columns'); $('query_form').submit(); return false;", :class => 'icon icon-save' %> <% end %> </p> <% end %> |