[refs #194] fix issues count

app/controllers/issues_controller.rb

@@ -15,14 +15,18 @@ class IssuesController < ApplicationController
     @is_assigned_to_me = params[:filter] == 'to_me'
     @status = params[:status] == 'closed' ? 'closed' : 'open'
     @labels = params[:labels] || []
-
-    @issues = @project.issues.where(:status => @status)
+    @issues = @project.issues
     @issues = @issues.where(:user_id => current_user.id) if @is_assigned_to_me
     @issues = @issues.joins(:labels).where(:labels => {:name => @labels}) unless @labels == []
 
     if params[:search_issue]
       @issues = @issues.where('issues.title ILIKE ?', "%#{params[:search_issue].mb_chars.downcase}%")
     end
+    @opened_issues = @issues.opened.count
+    @closed_issues = @issues.closed.count
+    @issues = @issues.where(:status => @status)
+
+
     @issues = @issues.includes(:creator, :user).order('serial_id desc').uniq.paginate :per_page => 10, :page => params[:page]
     if status == 200
       render 'index', :layout => request.format == '*/*' ? 'issues' : 'application' # maybe FIXME '*/*'?

app/models/issue.rb

@@ -26,6 +26,9 @@ class Issue < ActiveRecord::Base
   attr_accessible :labelings_attributes, :title, :body, :project, :project_id, :closed_at, :closed_by
   accepts_nested_attributes_for :labelings, :allow_destroy => true
 
+  scope :opened, where(:status => 'open', :closed_by => nil, :closed_at => nil)
+  scope :closed, where(:status => 'closed').where("closed_by is not null and closed_at is not null")
+
   def assign_uname
     user.uname if user
   end

app/views/issues/index.html.haml

@@ -4,9 +4,9 @@
 #closed-switcher.blue-switcher
   =hidden_field_tag :issues_status, @status, :id => 'issues_status'
   .open
-    ="#{t('layout.issues.statuses.open')} (#{@project.issues.where(:status => 'open').count})"
+    ="#{t('layout.issues.statuses.open')} (#{@opened_issues})"
   #closed-tasks.closed
-    ="#{t('layout.issues.statuses.closed')} (#{@project.issues.where(:status => 'closed').count})"
+    ="#{t('layout.issues.statuses.closed')} (#{@closed_issues})"
   #blue-switch-select.selected{:style => "margin-left: #{@status == 'open' ? '0' : '130'}px;"}
   .both
 .both