From c711e29cd58b954083b831a34f7823e8a7747a3d Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Wed, 20 May 2015 09:35:42 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E9=A1=B9=E7=9B=AE=E6=88=90=E5=91=98?=
 =?UTF-8?q?=E5=8F=AF=E4=BB=A5=E6=9F=A5=E7=9C=8B=E9=A1=B9=E7=9B=AE=E7=A7=81?=
 =?UTF-8?q?=E6=9C=89issue=E3=80=82=202=E3=80=81=E5=8C=BA=E5=88=86=E4=B8=8D?=
 =?UTF-8?q?=E5=8F=AF=E8=A7=81=E5=92=8C=E5=8F=AF=E8=A7=81issue=E7=9A=84?=
 =?UTF-8?q?=E6=95=B0=E7=9B=AE=E7=BB=9F=E8=AE=A1=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/issues/index.html.erb                | 4 ++--
 app/views/issues/new.html.erb                  | 2 --
 app/views/projects/_development_group.html.erb | 4 ++--
 app/views/projects/_research_team.html.erb     | 2 +-
 4 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/app/views/issues/index.html.erb b/app/views/issues/index.html.erb
index 5307b3bf6..3abc7101c 100644
--- a/app/views/issues/index.html.erb
+++ b/app/views/issues/index.html.erb
@@ -66,8 +66,8 @@
           </div><!--filter_form end-->
           <div class="cl"></div>
       <%# end %>
-      <p class="problem_p fl" ><%= l(:label_issues_sum) %>：<a href="javascript:void(0)" class="c_red"><%= @project.issues.count %></a>
-        <%= l(:lable_issues_undo) %>：<a href="javascript:void(0)" class="c_red"><%= @project.issues.where('status_id in (1,2,4,6)').count  %> </a>
+      <p class="problem_p fl" ><%= l(:label_issues_sum) %>：<a href="javascript:void(0)" class="c_red"><%= @project.issues.visible.all.count %></a>
+        <%= l(:lable_issues_undo) %>：<a href="javascript:void(0)" class="c_red"><%= @project.issues.where('status_id in (1,2,4,6)').visible.all.count  %> </a>
       </p>
 
       <div class="cl"></div>
diff --git a/app/views/issues/new.html.erb b/app/views/issues/new.html.erb
index 62e6947a7..137e203ef 100644
--- a/app/views/issues/new.html.erb
+++ b/app/views/issues/new.html.erb
@@ -2,7 +2,6 @@
   <h2 class="project_h2"><%= l(:label_issue_new) %></h2>
 </div>
 <%= call_hook(:view_issues_new_top, {:issue => @issue}) %>
-
 <%= labelled_form_for @issue, :url => project_issues_path(@project),
                       :html => {:id => 'issue-form', :multipart => true} do |f| %>
     <%= error_messages_for 'issue' %>
@@ -16,7 +15,6 @@
     </a>
     <%#= preview_link preview_new_issue_path(:project_id => @project), 'issue-form', 'preview', {:class => "blue_btn fl ml10"} %>
 <% end %>
-
 <div id="preview" class="wiki"></div>
 
 <% content_for :header_tags do %>
diff --git a/app/views/projects/_development_group.html.erb b/app/views/projects/_development_group.html.erb
index 7f79fc5f1..676761831 100644
--- a/app/views/projects/_development_group.html.erb
+++ b/app/views/projects/_development_group.html.erb
@@ -8,8 +8,8 @@
 <% unless @project.enabled_modules.where("name = 'issue_tracking'").empty? %>
   <div class="subNav">
     <%= link_to l(:label_issue_tracking), project_issues_path(@project), :class => "f14 c_blue02" %>
-    <% unless @project.issues.count == 0 %>
-      <a class="subnav_num">(<%= @project.issues.count %>)</a>
+    <% unless @project.issues.visible.all.count == 0 %>
+      <a class="subnav_num">(<%= @project.issues.visible.all.count %>)</a>
     <% end %>
     <% if User.current.member_of?(@project) %>
       <%= link_to "+"+l(:label_release_issue), new_project_issue_path(@project) , :class => "subnav_green" %>
diff --git a/app/views/projects/_research_team.html.erb b/app/views/projects/_research_team.html.erb
index 2a0ad1ef3..b2b0e3c33 100644
--- a/app/views/projects/_research_team.html.erb
+++ b/app/views/projects/_research_team.html.erb
@@ -9,7 +9,7 @@
 <div class="subNav">
   <%= link_to l(:label_issue_tracking), project_issues_path(@project), :class => "f14 c_blue02" %>
   <% unless @project.issues.count == 0 %>
-    <a class="subnav_num">(<%= @project.issues.count %>)</a>
+    <a class="subnav_num">(<%= @project.issues.visible.all.count %>)</a>
   <% end %>
   <% if User.current.member_of?(@project) %>
     <%= link_to "+"+l(:label_release_issue), new_project_issue_path(@project) , :class => "subnav_green" %>