From 8ed55e8d7ac953b2f057a160726c1e19fce8c1de Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sat, 6 Jan 2007 12:18:29 +0000
Subject: [PATCH] added total number of issues per tracker on projects/show

git-svn-id: http://redmine.rubyforge.org/svn/trunk@152 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/controllers/projects_controller.rb | 4 +++-
 app/views/projects/show.rhtml          | 5 ++---
 lang/de.yml                            | 1 +
 lang/en.yml                            | 1 +
 lang/es.yml                            | 1 +
 lang/fr.yml                            | 1 +
 6 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index c3d54dfe9..68dc1a661 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -79,7 +79,9 @@ class ProjectsController < ApplicationController
     @members = @project.members.find(:all, :include => [:user, :role])
     @subprojects = @project.children if @project.children_count > 0
     @news = @project.news.find(:all, :limit => 5, :include => [ :author, :project ], :order => "news.created_on DESC")
-    @trackers = Tracker.find(:all)
+    @trackers = Tracker.find(:all)
+    @open_issues_by_tracker = Issue.count(:group => :tracker, :joins => "INNER JOIN issue_statuses ON issue_statuses.id = issues.status_id", :conditions => ["project_id=? and issue_statuses.is_closed=?", @project.id, false])
+    @total_issues_by_tracker = Issue.count(:group => :tracker, :conditions => ["project_id=?", @project.id])
   end
 
   def settings
diff --git a/app/views/projects/show.rhtml b/app/views/projects/show.rhtml
index be5b67abb..212e10f99 100644
--- a/app/views/projects/show.rhtml
+++ b/app/views/projects/show.rhtml
@@ -22,9 +22,8 @@
       <li><%= link_to tracker.name, :controller => 'projects', :action => 'list_issues', :id => @project, 
                                                 :set_filter => 1, 
                                                 "tracker_id" => tracker.id %>:
-      <%= issue_count = Issue.count(:conditions => ["project_id=? and tracker_id=? and issue_statuses.is_closed=?", @project.id, tracker.id, false], :include => :status) %>
-      <%= lwr(:label_open_issues, issue_count) %>
-      </li>
+      <%= @open_issues_by_tracker[tracker] || 0 %> <%= lwr(:label_open_issues, @open_issues_by_tracker[tracker] || 0) %>
+      <%= l(:label_on) %> <%= @total_issues_by_tracker[tracker] || 0 %></li>
     <% end %>
     </ul>
     <p class="textcenter"><small><%= link_to l(:label_issue_view_all), :controller => 'projects', :action => 'list_issues', :id => @project, :set_filter => 1 %></small></p>
diff --git a/lang/de.yml b/lang/de.yml
index d74c7d81c..d34a311e6 100644
--- a/lang/de.yml
+++ b/lang/de.yml
@@ -296,6 +296,7 @@ label_deleted: gelöscht
 label_latest_revision: Neueste Neuausgabe
 label_view_revisions: Die Neuausgaben ansehen
 label_max_size: Maximale Größe
+label_on: auf
 
 button_login: Einloggen
 button_submit: Einreichen
diff --git a/lang/en.yml b/lang/en.yml
index 38f1fe9fb..bfa34586a 100644
--- a/lang/en.yml
+++ b/lang/en.yml
@@ -296,6 +296,7 @@ label_deleted: deleted
 label_latest_revision: Latest revision
 label_view_revisions: View revisions
 label_max_size: Maximum size
+label_on: 'on'
 
 button_login: Login
 button_submit: Submit
diff --git a/lang/es.yml b/lang/es.yml
index 32dedfb88..a62744326 100644
--- a/lang/es.yml
+++ b/lang/es.yml
@@ -296,6 +296,7 @@ label_deleted: suprimido
 label_latest_revision: La revisión más última
 label_view_revisions: Ver las revisiones
 label_max_size: Tamaño máximo
+label_on: en
 
 button_login: Conexión
 button_submit: Someter
diff --git a/lang/fr.yml b/lang/fr.yml
index cde28e6dd..34170d753 100644
--- a/lang/fr.yml
+++ b/lang/fr.yml
@@ -297,6 +297,7 @@ label_deleted: supprimé
 label_latest_revision: Dernière révision
 label_view_revisions: Voir les révisions
 label_max_size: Taille maximale
+label_on: sur
 
 button_login: Connexion
 button_submit: Soumettre