Filters for Projects page (#29482).

Patch by Marius BALTEANU.

git-svn-id: http://svn.redmine.org/redmine/trunk@18761 e93f8b46-1217-0410-a6f0-8f06a7374b81

4 files changed, 77 insertions, 55 deletions

diff --git a/app/views/projects/_sidebar.html.erb b/app/views/projects/_sidebar.html.erb
new file mode 100644
index 000000000..f9518e609
--- /dev/null
+++ b/app/views/projects/_sidebar.html.erb
@@ -0,0 +1,2 @@
+<%= render_sidebar_queries(ProjectQuery, @project) %>
+<%= call_hook(:view_projects_sidebar_queries_bottom) %>
diff --git a/app/views/projects/index.html.erb b/app/views/projects/index.html.erb
index 13e3332c3..3c2543b43 100644
--- a/app/views/projects/index.html.erb
+++ b/app/views/projects/index.html.erb
@@ -1,22 +1,24 @@
-<% content_for :header_tags do %>
-    <%= auto_discovery_link_tag(:atom, {:action => 'index', :format => 'atom', :key => User.current.rss_key}) %>
-<% end %>
-
 <div class="contextual">
   <%= form_tag({}, :method => :get) do %>
-    <label for="closed">
-      <%= check_box_tag 'closed', 1, params[:closed], :onchange => "this.form.submit();" %>
-      <%= l(:label_show_closed_projects) %>
-    </label>
   <% end %>
   <%= render_project_action_links %>
 </div>
 
-<h2><%= l(:label_project_plural) %></h2>
+<h2><%= @query.new_record? ? l(:label_project_plural) : @query.name %></h2>
 
-<div id="projects-index">
-<%= render_project_hierarchy(@projects) %>
-</div>
+<%= form_tag(projects_path(@project, nil), :method => :get, :id => 'query_form') do %>
+<%= render :partial => 'queries/query_form' %>
+<% end %>
+
+<% if @query.valid? %>
+  <% if @projects.empty? %>
+    <p class="nodata"><%= l(:label_no_data) %></p>
+  <% else %>
+    <div id="projects-index">
+      <%= render_project_hierarchy(@projects) %>
+    </div>
+  <% end %>
+<% end %>
 
 <% if User.current.logged? %>
 <p style="text-align:right;">
@@ -24,6 +26,10 @@
 </p>
 <% end %>
 
+<% content_for :sidebar do %>
+  <%= render :partial => 'projects/sidebar' %>
+<% end %>
+
 <% other_formats_links do |f| %>
   <%= f.link_to 'Atom', :url => {:key => User.current.rss_key} %>
 <% end %>
diff --git a/app/views/queries/_form.html.erb b/app/views/queries/_form.html.erb
index f1ef5ecac..a2dd9f589 100644
--- a/app/views/queries/_form.html.erb
+++ b/app/views/queries/_form.html.erb
@@ -7,20 +7,26 @@
 <p><label for="query_name"><%=l(:field_name)%></label>
 <%= text_field 'query', 'name', :size => 80 %></p>
 
-<% if User.current.admin? || User.current.allowed_to?(:manage_public_queries, @query.project) %>
+<% if User.current.admin? ||
+      User.current.allowed_to?(:manage_public_queries, @query.project) ||
+      @query.type == 'ProjectQuery' &&  User.current.allowed_to?(:manage_public_queries, @query.project, :global => true) %>
 <p><label><%=l(:field_visible)%></label>
   <label class="block"><%= radio_button 'query', 'visibility', Query::VISIBILITY_PRIVATE %> <%= l(:label_visibility_private) %></label>
   <label class="block"><%= radio_button 'query', 'visibility', Query::VISIBILITY_PUBLIC %> <%= l(:label_visibility_public) %></label>
-  <label class="block"><%= radio_button 'query', 'visibility', Query::VISIBILITY_ROLES %> <%= l(:label_visibility_roles) %>:</label>
-  <% Role.givable.sorted.each do |role| %>
-    <label class="block role-visibility"><%= check_box_tag 'query[role_ids][]', role.id, @query.roles.include?(role), :id => nil %> <%= role.name %></label>
+  <% unless @query.type == 'ProjectQuery' %>
+    <label class="block"><%= radio_button 'query', 'visibility', Query::VISIBILITY_ROLES %> <%= l(:label_visibility_roles) %>:</label>
+      <% Role.givable.sorted.each do |role| %>
+        <label class="block role-visibility"><%= check_box_tag 'query[role_ids][]', role.id, @query.roles.include?(role), :id => nil %> <%= role.name %></label>
+      <% end %>
+      <%= hidden_field_tag 'query[role_ids][]', '' %>
   <% end %>
-  <%= hidden_field_tag 'query[role_ids][]', '' %>
 </p>
 <% end %>
 
-<p><label for="query_is_for_all"><%=l(:field_is_for_all)%></label>
-<%= check_box_tag 'query_is_for_all', 1, @query.project.nil?, :class => (User.current.admin? ? '' : 'disable-unless-private') %></p>
+<% unless @query.type == 'ProjectQuery' %>
+  <p><label for="query_is_for_all"><%=l(:field_is_for_all)%></label>
+  <%= check_box_tag 'query_is_for_all', 1, @query.project.nil?, :class => (User.current.admin? ? '' : 'disable-unless-private') %></p>
+<% end %>
 
 <fieldset id="options"><legend><%= l(:label_options) %></legend>
 <p><label for="query_default_columns"><%=l(:label_default_columns)%></label>
@@ -28,14 +34,18 @@
       :data => {:disables => "#columns, .block_columns input"} %></p>
 
 <% unless params[:gantt] %>
-<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>
+  <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>
 
-<p class="block_columns"><label><%= l(:button_show) %></label>
-<%= available_block_columns_tags(@query) %></p>
+  <% unless @query.available_block_columns.empty? %>
+    <p class="block_columns"><label><%= l(:button_show) %></label>
+    <%= available_block_columns_tags(@query) %></p>
+  <% end %>
 
-<p><label><%= l(:label_total_plural) %></label>
-<%= available_totalable_columns_tags(@query) %></p>
+  <% unless @query.available_totalable_columns.empty? %>
+    <p class="totable_columns"><label><%= l(:label_total_plural) %></label>
+    <%= available_totalable_columns_tags(@query) %></p>
+  <% end %>
 <% else %>
   <p><label><%= l(:button_show) %></label>
   <%= hidden_field_tag 'query[draw_relations]', '0' %>
@@ -54,7 +64,7 @@
 </fieldset>
 
 <% unless params[:gantt] %>
-<fieldset><legend><%= l(:label_sort) %></legend>
+<fieldset id="sort"><legend><%= l(:label_sort) %></legend>
 <% 3.times do |i| %>
 <%= content_tag(:span, "#{i+1}:", :class => 'query_sort_criteria_count')%>
 <%= label_tag "query_sort_criteria_attribute_" + i.to_s,
diff --git a/app/views/queries/_query_form.html.erb b/app/views/queries/_query_form.html.erb
index c8be6b771..65bcc3eb5 100644
--- a/app/views/queries/_query_form.html.erb
+++ b/app/views/queries/_query_form.html.erb
@@ -11,35 +11,39 @@
     </div>
   </fieldset>
 
-  <fieldset id="options" class="collapsible collapsed">
-    <legend onclick="toggleFieldset(this);" class="icon icon-collapsed"><%= 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 style="display: none;">
+        <table>
+          <% 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">