"queries" branch merged

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

3 files changed, 22 insertions, 10 deletions

diff --git a/app/views/reports/_details.rhtml b/app/views/reports/_details.rhtml
index be4c82e77..12a16c1e7 100644
--- a/app/views/reports/_details.rhtml
+++ b/app/views/reports/_details.rhtml
@@ -29,17 +29,17 @@
                                                 :controller => 'projects', :action => 'list_issues', :id => @project, 

                                                 :set_filter => 1, 

                                                 "#{field_name}" => row.id,

-                                                "status_id" => "O" %></td>

+                                                "status_id" => "o" %></td>

   <td align="center"><%= link_to (aggregate data, { field_name => row.id, "closed" => 1 }),

                                                 :controller => 'projects', :action => 'list_issues', :id => @project, 

                                                 :set_filter => 1, 

                                                 "#{field_name}" => row.id,

-                                                "status_id" => "C" %></td>

+                                                "status_id" => "c" %></td>

   <td align="center"><%= link_to (aggregate data, { field_name => row.id }),

                                                 :controller => 'projects', :action => 'list_issues', :id => @project, 

                                                 :set_filter => 1, 

                                                 "#{field_name}" => row.id,

-                                                "status_id" => "A" %></td>  

+                                                "status_id" => "*" %></td>  

 <% end %>

 </tr>

 </table>

diff --git a/app/views/reports/_simple.rhtml b/app/views/reports/_simple.rhtml
index 3be1281c5..778b9cbde 100644
--- a/app/views/reports/_simple.rhtml
+++ b/app/views/reports/_simple.rhtml
@@ -18,17 +18,17 @@
                                                 :controller => 'projects', :action => 'list_issues', :id => @project, 

                                                 :set_filter => 1, 

                                                 "#{field_name}" => row.id,

-                                                "status_id" => "O" %></td>

+                                                "status_id" => "o" %></td>

   <td align="center"><%= link_to (aggregate data, { field_name => row.id, "closed" => 1 }),

                                                 :controller => 'projects', :action => 'list_issues', :id => @project, 

                                                 :set_filter => 1, 

                                                 "#{field_name}" => row.id,

-                                                "status_id" => "C" %></td>

+                                                "status_id" => "c" %></td>

   <td align="center"><%= link_to (aggregate data, { field_name => row.id }),

                                                 :controller => 'projects', :action => 'list_issues', :id => @project, 

                                                 :set_filter => 1, 

                                                 "#{field_name}" => row.id,

-                                                "status_id" => "A" %></td>  

+                                                "status_id" => "*" %></td>  

 <% end %>

 </tr>

 </table>

diff --git a/app/views/reports/issue_report.rhtml b/app/views/reports/issue_report.rhtml
index 4927186a9..b4a854f32 100644
--- a/app/views/reports/issue_report.rhtml
+++ b/app/views/reports/issue_report.rhtml
@@ -1,18 +1,30 @@
 <h2><%=l(:label_report_plural)%></h2>

 

+<h3><%= l(:label_query_plural) %></h3>

+<div class="contextual">

+<%= link_to_if_authorized l(:label_query_new), {:controller => 'projects', :action => 'add_query', :id => @project}, :class => 'pic picAdd' %>

+</div>

+

+<% if @queries.empty? %><p><i><%=l(:label_no_data)%></i></p><% end %>

+<ul>

+<% @queries.each do |query| %>

+    <li><%= link_to query.name, :controller => 'projects', :action => 'list_issues', :id => @project, :query_id => query %></li>

+<% end %>

+</ul>

+

 <div class="splitcontentleft">

-<h3><%=l(:field_tracker)%>&nbsp;&nbsp;<%= link_to image_tag('details'), :detail => 'author' %></h3>

+<h3><%=l(:field_tracker)%>&nbsp;&nbsp;<%= link_to image_tag('details'), :detail => 'tracker' %></h3>

 <%= render :partial => 'simple', :locals => { :data => @issues_by_tracker, :field_name => "tracker_id", :rows => @trackers } %>

 <br />

-<h3><%=l(:field_priority)%>&nbsp;&nbsp;<%= link_to image_tag('details'), :detail => 'priority' %></h3>

-<%= render :partial => 'simple', :locals => { :data => @issues_by_priority, :field_name => "priority_id", :rows => @priorities } %>

-<br />

 <h3><%=l(:field_author)%>&nbsp;&nbsp;<%= link_to image_tag('details'), :detail => 'author' %></h3>

 <%= render :partial => 'simple', :locals => { :data => @issues_by_author, :field_name => "author_id", :rows => @authors } %>

 <br />

 </div>

 

 <div class="splitcontentright">

+<h3><%=l(:field_priority)%>&nbsp;&nbsp;<%= link_to image_tag('details'), :detail => 'priority' %></h3>

+<%= render :partial => 'simple', :locals => { :data => @issues_by_priority, :field_name => "priority_id", :rows => @priorities } %>

+<br />

 <h3><%=l(:field_category)%>&nbsp;&nbsp;<%= link_to image_tag('details'), :detail => 'category' %></h3>

 <%= render :partial => 'simple', :locals => { :data => @issues_by_category, :field_name => "category_id", :rows => @categories } %>

 <br />