Move work packages query form to partial

app/views/work_packages/_query_form.html.erb

@@ -0,0 +1,54 @@
+<%= form_tag({ :controller => '/queries', :action => 'new' }, :id => 'query_form') do %>
+  <%= hidden_field_tag('project_id', project.to_param) if project %>
+  <div id="query_form_content" class="hide-when-print">
+    <fieldset id="filters" class="header_collapsible collapsible <%= query.new_record? ? "" : "collapsed" %>">
+      <legend title="<%=l(:description_filter_toggle)%>", onclick="toggleFieldset(this);"><a href="javascript:"><%= l(:label_filter_plural) %></a></legend>
+      <div class="filter-fields" style="<%= query.new_record? ? "" : "display: none;" %>">
+        <%= render :partial => 'queries/filters', :locals => {:query => query} %>
+      </div>
+    </fieldset>
+    <fieldset id="column_options" class="header_collapsible collapsible collapsed">
+      <legend title="<%=l(:description_option_toggle)%>", onclick="toggleFieldset(this);"><a href="javascript:"><%= l(:label_options) %></a></legend>
+      <div style="display: none;">
+        <table>
+          <tr>
+            <td><%= Query.human_attribute_name(:column_names) %></td>
+            <td><%= render :partial => 'queries/columns', :locals => {:query => query} %></td>
+          </tr>
+          <tr>
+            <td><label for='group_by'><%= Query.human_attribute_name(:group_by) %></label></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>
+          <% if query.any_summable_columns? %>
+            <tr>
+              <td><%= label_tag :display_sums, Query.human_attribute_name(:display_sums) %></td>
+              <td><%= check_box_tag :display_sums, 1, query.display_sums? %></td>
+            </tr>
+          <% end %>
+        </table>
+        <%= call_hook(:view_issue_query_form_options_bottom, :query => query) %>
+      </div>
+    </fieldset>
+  </div>
+  <p class="buttons hide-when-print">
+    <%= link_to_remote l(:button_apply),
+                       { :url => { :set_filter => 1 },
+                         :before => 'selectAllOptions("selected_columns");',
+                         :update => "content",
+                         :method => :get,
+                         :complete => "apply_filters_observer(); resetSelectedMenuItem(); initQuerySelectBehaviour();",
+                         :with => "jQuery('#query_form').serialize()"
+                       }, :class => 'icon icon-yes' %>
+
+    <%= link_to_remote l(:button_clear),
+                       { :url => { :set_filter => 1, :sort => WorkPackagesController::DEFAULT_SORT_ORDER.join(':'), :project_id => project },
+                         :method => :get,
+                         :update => "content",
+                         :complete => 'resetSelectedMenuItem(); initQuerySelectBehaviour();',
+                       }, :class => 'icon icon-undo'  %>
+
+    <% if query.new_record? && User.current.allowed_to?(:save_queries, project, :global => true) %>
+      <%= link_to l(:button_save), {}, :onclick => "selectAllOptions('selected_columns'); jQuery('#query_form').submit(); return false;", :class => 'icon icon-save1' %>
+    <% end %>
+  </p>
+<% end %>

app/views/work_packages/index.html.erb

@@ -62,60 +62,7 @@ See doc/COPYRIGHT.rdoc for more details.
       </div>
     <% end %>
 
-    <%= form_tag({ :controller => '/queries', :action => 'new' }, :id => 'query_form') do %>
+    <%= render partial: 'query_form', locals: { project: project, query: query } %>
-      <%= hidden_field_tag('project_id', project.to_param) if project %>
-      <div id="query_form_content" class="hide-when-print">
-        <fieldset id="filters" class="header_collapsible collapsible <%= query.new_record? ? "" : "collapsed" %>">
-          <legend title="<%=l(:description_filter_toggle)%>", onclick="toggleFieldset(this);"><a href="javascript:"><%= l(:label_filter_plural) %></a></legend>
-          <div class="filter-fields" style="<%= query.new_record? ? "" : "display: none;" %>">
-            <%= render :partial => 'queries/filters', :locals => {:query => query} %>
-          </div>
-        </fieldset>
-        <fieldset id="column_options" class="header_collapsible collapsible collapsed">
-          <legend title="<%=l(:description_option_toggle)%>", onclick="toggleFieldset(this);"><a href="javascript:"><%= l(:label_options) %></a></legend>
-          <div style="display: none;">
-            <table>
-              <tr>
-                <td><%= Query.human_attribute_name(:column_names) %></td>
-                <td><%= render :partial => 'queries/columns', :locals => {:query => query} %></td>
-              </tr>
-              <tr>
-                <td><label for='group_by'><%= Query.human_attribute_name(:group_by) %></label></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>
-              <% if query.any_summable_columns? %>
-                <tr>
-                  <td><%= label_tag :display_sums, Query.human_attribute_name(:display_sums) %></td>
-                  <td><%= check_box_tag :display_sums, 1, query.display_sums? %></td>
-                </tr>
-              <% end %>
-            </table>
-            <%= call_hook(:view_issue_query_form_options_bottom, :query => query) %>
-          </div>
-        </fieldset>
-      </div>
-      <p class="buttons hide-when-print">
-        <%= link_to_remote l(:button_apply),
-                           { :url => { :set_filter => 1 },
-                             :before => 'selectAllOptions("selected_columns");',
-                             :update => "content",
-                             :method => :get,
-                             :complete => "apply_filters_observer(); resetSelectedMenuItem(); initQuerySelectBehaviour();",
-                             :with => "jQuery('#query_form').serialize()"
-                           }, :class => 'icon icon-yes' %>
-
-        <%= link_to_remote l(:button_clear),
-                           { :url => { :set_filter => 1, :sort => WorkPackagesController::DEFAULT_SORT_ORDER.join(':'), :project_id => project },
-                             :method => :get,
-                             :update => "content",
-                             :complete => 'resetSelectedMenuItem(); initQuerySelectBehaviour();',
-                           }, :class => 'icon icon-undo'  %>
-
-        <% if query.new_record? && User.current.allowed_to?(:save_queries, project, :global => true) %>
-          <%= link_to l(:button_save), {}, :onclick => "selectAllOptions('selected_columns'); jQuery('#query_form').submit(); return false;", :class => 'icon icon-save1' %>
-        <% end %>
-      </p>
-    <% end %>
 
   </div><!-- .title-bar-extras -->
 </div><!-- .title-bar -->