From a0035a4c1ed46e94ab34255b743323e6ea73341f Mon Sep 17 00:00:00 2001
From: lizanle <491823689@qq.com>
Date: Wed, 16 Dec 2015 16:49:33 +0800
Subject: [PATCH] =?UTF-8?q?issue=20=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/issues_controller.rb | 3 +++
 app/views/issues/_list.html.erb      | 2 +-
 app/views/issues/index.html.erb      | 2 +-
 app/views/issues/index.js.erb        | 6 +++++-
 4 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb
index 48bf3b568..3263ebc07 100644
--- a/app/controllers/issues_controller.rb
+++ b/app/controllers/issues_controller.rb
@@ -87,6 +87,9 @@ class IssuesController < ApplicationController
                               :order => sort_clause,
                               :offset => @offset,
                               :limit => @limit)
+      if params[:set_filter]
+        @set_filter = params[:set_filter]
+      end
       @issue_count_by_group = @query.issue_count_by_group
       respond_to do |format|
         format.js
diff --git a/app/views/issues/_list.html.erb b/app/views/issues/_list.html.erb
index c071d57d8..115a70e7a 100644
--- a/app/views/issues/_list.html.erb
+++ b/app/views/issues/_list.html.erb
@@ -40,7 +40,7 @@
      <%= render :partial => 'users/project_issue', :locals => {:activity => issue, :user_activity_id => issue.id} %>
  <% end %>
  <% if issues.count == 10%>
-     <div id="show_more_issues" class="loadMore mt10 f_grey">展开更多<%=link_to "",  project_issues_path(:project_id => project.id,:page => issue_pages.page),:id => "more_issues_link",:remote => "true",:class => "none" %></div>
+     <div id="show_more_issues" class="loadMore mt10 f_grey">展开更多<%=link_to "",  project_issues_path({:project_id => project.id,:page => issue_pages.page}.merge(params)),:id => "more_issues_link",:remote => "true",:class => "none" %></div>
      <%#= link_to "点击展开更多",user_activities_path(@user.id,:type => type,:page => page),:id => "show_more_activities",:remote => "true",:class => "loadMore mt10 f_grey"%>
  <% end%>
  <!--<ul class="wlist">-->
diff --git a/app/views/issues/index.html.erb b/app/views/issues/index.html.erb
index 7c358aaed..cf0428c27 100644
--- a/app/views/issues/index.html.erb
+++ b/app/views/issues/index.html.erb
@@ -144,7 +144,7 @@
             </p>
         <% else %>
             <div id="issue_list">
-            <%= render :partial => 'issues/list', :locals => {:issues => @issues, :query => @query,:issue_pages=>@issue_pages,:issue_count=>@issue_count,:project=>@project} %>
+            <%= render :partial => 'issues/list', :locals => {:issues => @issues, :query => @query,:issue_pages=>@issue_pages,:issue_count=>@issue_count,:project=>@project,:subject=>@subject} %>
             </div>
 
 
diff --git a/app/views/issues/index.js.erb b/app/views/issues/index.js.erb
index 9e68f9bc8..9ddc50445 100644
--- a/app/views/issues/index.js.erb
+++ b/app/views/issues/index.js.erb
@@ -1,2 +1,6 @@
 //$("#issue_list").html("<%#= escape_javascript(render :partial => 'issues/list',:locals => {:issues => @issues, :query => @query,:issue_pages=>@issue_pages,:issue_count=>@issue_count})%>");
-$("#show_more_issues").replaceWith("<%= escape_javascript( render :partial => 'issues/list', :locals => {:issues => @issues, :query => @query,:issue_pages=>@issue_pages,:issue_count=>@issue_count,:project=>@project}  )%>");
+<% if @set_filter && @issue_pages.page == 1%>
+    $("#issue_list").html("<%= escape_javascript(render :partial => 'issues/list',:locals => {:issues => @issues, :query => @query,:issue_pages=>@issue_pages,:issue_count=>@issue_count,:project=>@project})%>");
+<%else%>
+    $("#show_more_issues").replaceWith("<%= escape_javascript( render :partial => 'issues/list', :locals => {:issues => @issues, :query => @query,:issue_pages=>@issue_pages,:issue_count=>@issue_count,:project=>@project}  )%>");
+<%end%>