From: Jean-Philippe Lang Date: Tue, 17 Mar 2009 17:27:30 +0000 (+0000) Subject: Adds issue count on assigned and reported 'My page' modules (#2986). X-Git-Tag: 0.9.0~566 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=b44317b76255be4c8d8551655f78007c505cf580;p=redmine.git 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 --- diff --git a/app/views/my/blocks/_issuesassignedtome.rhtml b/app/views/my/blocks/_issuesassignedtome.rhtml index f5e2e3e65..507a45be9 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 aa6e0e0eb..affaa1e76 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") %>