meineerde/redmine
1
0
Fork 0
mirror of https://github.com/meineerde/redmine.git synced 2025-12-24 01:11:12 +00:00
Code Issues Releases Wiki Activity

Use the same scope for counting.

Browse Source 
git-svn-id: http://svn.redmine.org/redmine/trunk@14719 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang 2015-10-21 16:45:42 +00:00
parent e643ea9b91
commit d6c6c7ac62
4 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/helpers/my_helper.rb
View File

@ -37,8 +37,7 @@ module MyHelper
limit(10).
includes(:status, :project, :tracker, :priority).
references(:status, :project, :tracker, :priority).
order("#{IssuePriority.table_name}.position DESC, #{Issue.table_name}.updated_on DESC").
to_a
order("#{IssuePriority.table_name}.position DESC, #{Issue.table_name}.updated_on DESC")
end
def issuesreportedbyme_items
@ -47,12 +46,11 @@ module MyHelper
limit(10).
includes(:status, :project, :tracker).
references(:status, :project, :tracker).
order("#{Issue.table_name}.updated_on DESC").
to_a
order("#{Issue.table_name}.updated_on DESC")
end
def issueswatched_items
Issue.visible.on_active_project.watched_by(User.current.id).recently_updated.limit(10).to_a
Issue.visible.on_active_project.watched_by(User.current.id).recently_updated.limit(10)
end
def news_items

6
app/views/my/blocks/_issuesassignedtome.html.erb
View File

@ -1,11 +1,11 @@
<% assigned_issues = issuesassignedtome_items %>
<h3>
<%= link_to l(:label_assigned_to_me_issues),
issues_path(:set_filter => 1, :assigned_to_id => 'me', :sort => 'priority:desc,updated_on:desc') %>
(<%= Issue.visible.open.where(:assigned_to_id => ([User.current.id] + User.current.group_ids)).count %>)
(<%= assigned_issues.limit(nil).count %>)
</h3>
<% assigned_issues = issuesassignedtome_items %>
<%= render :partial => 'issues/list_simple', :locals => { :issues => assigned_issues } %>
<%= render :partial => 'issues/list_simple', :locals => { :issues => assigned_issues.to_a } %>
<% content_for :header_tags do %>
<%= auto_discovery_link_tag(:atom,

6
app/views/my/blocks/_issuesreportedbyme.html.erb
View File

@ -1,11 +1,11 @@
<% reported_issues = issuesreportedbyme_items %>
<h3>
<%= link_to l(:label_reported_issues),
issues_path(:set_filter => 1, :status_id => '*', :author_id => 'me', :sort => 'updated_on:desc') %>
(<%= Issue.visible.where(:author_id => User.current.id).count %>)
(<%= reported_issues.limit(nil).count %>)
</h3>
<% reported_issues = issuesreportedbyme_items %>
<%= render :partial => 'issues/list_simple', :locals => { :issues => reported_issues } %>
<%= render :partial => 'issues/list_simple', :locals => { :issues => reported_issues.to_a } %>
<% content_for :header_tags do %>
<%= auto_discovery_link_tag(:atom,

7
app/views/my/blocks/_issueswatched.html.erb
View File

@ -1,8 +1,9 @@
<% watched_issues = issueswatched_items %>
<h3>
<%= link_to l(:label_watched_issues),
issues_path(:set_filter => 1, :watcher_id => 'me', :sort => 'updated_on:desc') %>
(<%= Issue.visible.watched_by(user.id).count %>)
(<%= watched_issues.limit(nil).count %>)
</h3>
<% watched_issues = issueswatched_items %>
<%= render :partial => 'issues/list_simple', :locals => { :issues => watched_issues } %>
<%= render :partial => 'issues/list_simple', :locals => { :issues => watched_issues.to_a } %>