From 9a89590ca95333d4900e7a58554f26825876de7f Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Wed, 28 Sep 2016 09:33:31 +0800
Subject: [PATCH] =?UTF-8?q?issue=E6=80=BB=E6=95=B0=E5=AE=9E=E6=97=B6?=
 =?UTF-8?q?=E5=88=B7=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/issues/_issue_filter_all.html.erb |  1 +
 app/views/issues/index.html.erb             | 10 +++-------
 app/views/issues/index.js.erb               |  1 +
 3 files changed, 5 insertions(+), 7 deletions(-)
 create mode 100644 app/views/issues/_issue_filter_all.html.erb

diff --git a/app/views/issues/_issue_filter_all.html.erb b/app/views/issues/_issue_filter_all.html.erb
new file mode 100644
index 000000000..64242df9b
--- /dev/null
+++ b/app/views/issues/_issue_filter_all.html.erb
@@ -0,0 +1 @@
+<span class="issues_nav_tag ml5" ><%= @issue_count %></span>
\ No newline at end of file
diff --git a/app/views/issues/index.html.erb b/app/views/issues/index.html.erb
index 73decbf95..5e7669a25 100644
--- a/app/views/issues/index.html.erb
+++ b/app/views/issues/index.html.erb
@@ -156,7 +156,8 @@
             <div class="issues_con_list" style="position: relative;">
               <ul id="issues_list_nav" >
                 <li id="issues_list_nav_1" onclick="HoverLi(1);all_reset_form();">
-                  <a href="javascript:void(0);" onclick="all_reset_form();" id="issues_type_1" >所有<span class="issues_nav_tag ml5"><%= @project.project_score.issue_num %></span></a>
+                  <a href="javascript:void(0);" onclick="all_reset_form();" id="issues_type_1" >所有
+                    <span id="issue_filter_all"><%= render :partial => "issues/issue_filter_all" %></span></a>
                 </li>
                 <!--li id="issues_list_nav_2" onclick="HoverLi(2);">
                   <a href="javascript:void(0);" onclick="switch_assign_to(<%#= User.current.id %>)" id="issues_type_2" >指派给我
@@ -232,12 +233,7 @@
                       )
                   %>
 
-                  <%#= select( :issue,:user_id, @project.members.order("lower(users.login)").map{|c| [c.name, c.user_id]}.unshift(["作者",0]),
-                              { :include_blank => false,:selected=>@author_id ? @author_id : 0
-                              },
-                              {:onchange=>"remote_function();",:id=>"author_id",:name=>"author_id",:class=>"w90 mr18"}
-                      )
-                  %>
+
 
 
 
diff --git a/app/views/issues/index.js.erb b/app/views/issues/index.js.erb
index 731145eca..d2207b1d0 100644
--- a/app/views/issues/index.js.erb
+++ b/app/views/issues/index.js.erb
@@ -1,5 +1,6 @@
 //$("#issue_list").html("<%#= escape_javascript(render :partial => 'issues/list',:locals => {:issues => @issues, :query => @query,:issue_pages=>@issue_pages,:issue_count=>@issue_count})%>");
 $("#issue_assigned_count").html("<%= escape_javascript(render :partial => 'issues/issue_filter') %>");
+$("#issue_filter_all").html("<%= escape_javascript(render :partial => 'issues/issue_filter_all') %>");
 $("#issue_author_count").html("<%= escape_javascript(render :partial => 'issues/issue_filter_author') %>");
 $("#issue_list").html("<%= escape_javascript(render :partial => 'issues/all_list',:locals => {:issues => @issues, :query => @query, :issue_pages=> @issue_pages, :issue_count => @issue_count, :project=> @project})%>");
 $("#issue_list_pagination").html('<%= pagination_links_full @issue_pages, @issue_count, :issues => @issues, :per_page_links => false, :remote => @is_remote, :flag => true, :is_new => true %>');