From b44317b76255be4c8d8551655f78007c505cf580 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Lang Date: Tue, 17 Mar 2009 17:27:30 +0000 Subject: [PATCH] Adds issue count on assigned and reported 'My page' modules (#2986). git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2595 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- app/views/my/blocks/_issuesassignedtome.rhtml | 7 ++++--- app/views/my/blocks/_issuesreportedbyme.rhtml | 5 +++-- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/app/views/my/blocks/_issuesassignedtome.rhtml b/app/views/my/blocks/_issuesassignedtome.rhtml index f5e2e3e6..507a45be 100644 --- a/app/views/my/blocks/_issuesassignedtome.rhtml +++ b/app/views/my/blocks/_issuesassignedtome.rhtml @@ -1,6 +1,7 @@ -

<%=l(:label_assigned_to_me_issues)%>

-<% assigned_issues = Issue.visible.find(:all, - :conditions => ["assigned_to_id=? AND #{IssueStatus.table_name}.is_closed=?", user.id, false], +

<%=l(:label_assigned_to_me_issues)%> (<%= Issue.visible.open.count(:conditions => {:assigned_to_id => User.current.id})%>)

+ +<% assigned_issues = Issue.visible.open.find(:all, + :conditions => {:assigned_to_id => User.current.id}, :limit => 10, :include => [ :status, :project, :tracker, :priority ], :order => "#{Enumeration.table_name}.position DESC, #{Issue.table_name}.updated_on DESC") %> diff --git a/app/views/my/blocks/_issuesreportedbyme.rhtml b/app/views/my/blocks/_issuesreportedbyme.rhtml index aa6e0e0e..affaa1e7 100644 --- a/app/views/my/blocks/_issuesreportedbyme.rhtml +++ b/app/views/my/blocks/_issuesreportedbyme.rhtml @@ -1,6 +1,7 @@ -

<%=l(:label_reported_issues)%>

+

<%=l(:label_reported_issues)%> (<%= Issue.visible.count(:conditions => { :author_id => User.current.id }) %>)

+ <% reported_issues = Issue.visible.find(:all, - :conditions => { :author_id => user.id }, + :conditions => { :author_id => User.current.id }, :limit => 10, :include => [ :status, :project, :tracker ], :order => "#{Issue.table_name}.updated_on DESC") %> -- 2.11.0