Commit 958497fecbc630297f2d0d5f7b64b484966ae907
1 parent
017dfaee
Exists in
master
and in
4 other branches
fix issue count
Showing
2 changed files
with
6 additions
and
2 deletions
Show diff stats
app/models/issue.rb
| @@ -33,6 +33,10 @@ class Issue < ActiveRecord::Base | @@ -33,6 +33,10 @@ class Issue < ActiveRecord::Base | ||
| 33 | 33 | ||
| 34 | acts_as_list | 34 | acts_as_list |
| 35 | 35 | ||
| 36 | + def self.open_for(user) | ||
| 37 | + opened.assigned(user) | ||
| 38 | + end | ||
| 39 | + | ||
| 36 | def today? | 40 | def today? |
| 37 | Date.today == created_at.to_date | 41 | Date.today == created_at.to_date |
| 38 | end | 42 | end |
app/views/layouts/project.html.haml
| @@ -33,8 +33,8 @@ | @@ -33,8 +33,8 @@ | ||
| 33 | %span{ :class => "number" }= @project.users_projects.count | 33 | %span{ :class => "number" }= @project.users_projects.count |
| 34 | = link_to project_issues_filter_path(@project), :class => (controller.controller_name == "issues") ? "current" : nil do | 34 | = link_to project_issues_filter_path(@project), :class => (controller.controller_name == "issues") ? "current" : nil do |
| 35 | Issues | 35 | Issues |
| 36 | - - if @project.issues.assigned(current_user).count > 0 | ||
| 37 | - %span{ :class => "number" }= @project.issues.assigned(current_user).count | 36 | + - if @project.issues.open_for(current_user).count > 0 |
| 37 | + %span{ :class => "number" }= @project.issues.open_for(current_user).count | ||
| 38 | = link_to wall_project_path(@project), :class => current_page?(:controller => "projects", :action => "wall", :id => @project) ? "current" : nil do | 38 | = link_to wall_project_path(@project), :class => current_page?(:controller => "projects", :action => "wall", :id => @project) ? "current" : nil do |
| 39 | Wall | 39 | Wall |
| 40 | - if @project.common_notes.today.count > 0 | 40 | - if @project.common_notes.today.count > 0 |