From ec0d21b2433262a9bbe7edadce4d2163398d10a0 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Fri, 30 Sep 2016 17:27:30 +0800
Subject: [PATCH] =?UTF-8?q?=E6=88=B4=E5=82=B2=E9=A1=B9=E7=9B=AE=E7=9B=B8?=
 =?UTF-8?q?=E5=85=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/issues/index.html.erb                | 2 +-
 app/views/projects/_development_group.html.erb | 5 +++--
 app/views/users/_resources_list.html.erb       | 2 +-
 app/views/users/_user_resource_info.html.erb   | 2 +-
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/app/views/issues/index.html.erb b/app/views/issues/index.html.erb
index 69de96df6..655f0714a 100644
--- a/app/views/issues/index.html.erb
+++ b/app/views/issues/index.html.erb
@@ -122,7 +122,7 @@
       <a href="<%= new_project_issue_path(@project)%>" class="sy_btn_green  fl mr10">新 增</a>
       <div class="issues_statistics fl">
         <ul>
-          <li>所有<a  class="issues_greycirbg_btn "><%= @project.project_score.issue_num %></a></li>
+          <li>所有<a  class="issues_greycirbg_btn "><%= @issues_filter.count %></a></li>
           <li>开启<a  class="issues_greycirbg_btn "><%#= @issues_filter_assign_count %><%= @issue_open_count  %></a></li>
           <li>关闭<a  class="issues_greycirbg_btn "><%#= @issues_filter_author_count %><%= @issue_close_count  %></a></li>
         </ul>
diff --git a/app/views/projects/_development_group.html.erb b/app/views/projects/_development_group.html.erb
index ad8d9a35a..1ddd9acac 100644
--- a/app/views/projects/_development_group.html.erb
+++ b/app/views/projects/_development_group.html.erb
@@ -1,4 +1,5 @@
 <% project_file_num = Attachment.where(:container_type => "Project", :container_id => @project.id).count %>
+<% project_issue_count =Issue.where(:project_id => @project.id).count%>
 <div class="subNav">
   <%= link_to l(:label_activity), {:controller => 'projects', :action => 'show', :id => @project.id}, :class => "f14 c_blue02" %>
   <% unless ForgeActivity.where("project_id = ?", @project.id).count == 0 %>
@@ -8,8 +9,8 @@
 <% unless @project.enabled_modules.where("name = 'issue_tracking'").empty? %>
   <div class="subNav">
     <%= link_to l(:label_issue_tracking), project_issues_path(@project, :remote => true), :class => "f14 c_blue02" %>
-    <% if @project.project_score.issue_num > 0 %>
-      <a class="subnav_num">(<%= @project.project_score.issue_num %>)</a>
+    <% if project_issue_count > 0 %>
+      <a class="subnav_num">(<%= project_issue_count %>)</a>
     <% end %>
 
     <% if User.current.member_of?(@project) %>
diff --git a/app/views/users/_resources_list.html.erb b/app/views/users/_resources_list.html.erb
index 0190e60dc..3c78e3a0c 100644
--- a/app/views/users/_resources_list.html.erb
+++ b/app/views/users/_resources_list.html.erb
@@ -249,7 +249,7 @@
         }
         line.children().css("background-color", 'white');
         id = line.children().last().html();
-        user_id = line.children().eq(5).html();
+        user_id = line.children().eq(4).html();
         if(user_id === '<%= User.current.id%>') {
             if(line.children().first().children().data('hasHistory') == 'Y'){
                 alert('该资源存在历史版本，不能删除');
diff --git a/app/views/users/_user_resource_info.html.erb b/app/views/users/_user_resource_info.html.erb
index d3b169a17..d5a31bdf7 100644
--- a/app/views/users/_user_resource_info.html.erb
+++ b/app/views/users/_user_resource_info.html.erb
@@ -225,7 +225,7 @@
         document.oncontextmenu = function() {return true;}
         line.children().css("background-color",'white');
         id = line.children().last().html();
-        user_id = line.children().eq(5).html();
+        user_id = line.children().eq(4).html();
         if(user_id === '<%= User.current.id %>') {
             res_name = line.children().eq(1).children().attr('title');
             res_link = line.children().eq(1).html();