From 05739931f3a1fcdfe46ef1a07ca3fc2e5afcb436 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Wed, 2 Sep 2015 14:34:32 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E7=82=B9=E5=87=BB=E5=8A=A0=E8=BD=BD=E6=9B=B4=E5=A4=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/users/_user_homework_list.html.erb | 6 +++---
 app/views/users/user_homeworks.js.erb        | 4 +---
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/app/views/users/_user_homework_list.html.erb b/app/views/users/_user_homework_list.html.erb
index fc6e723f2..076383607 100644
--- a/app/views/users/_user_homework_list.html.erb
+++ b/app/views/users/_user_homework_list.html.erb
@@ -52,6 +52,6 @@
       </div>
     </div><!----HomeWork end-->
 <% end%>
-
-<input type="hidden" value="<%= page%>" />
-<%= link_to "加载更多",user_homeworks_user_path(User.current.id),:id => "user_show_more_homework",:remote => "true",:class => "loadMore f_grey"%>
\ No newline at end of file
+<% if homework_commons.count == 10%>
+    <%= link_to "加载更多",user_homeworks_user_path(User.current.id,:page => page),:id => "user_show_more_homework",:remote => "true",:class => "loadMore f_grey"%>
+<% end%>
\ No newline at end of file
diff --git a/app/views/users/user_homeworks.js.erb b/app/views/users/user_homeworks.js.erb
index a2e778a21..b6703dd43 100644
--- a/app/views/users/user_homeworks.js.erb
+++ b/app/views/users/user_homeworks.js.erb
@@ -1,4 +1,2 @@
 $("#user_show_more_homework").replaceWith("<%= escape_javascript( render :partial =>  'users/user_homework_list',:locals => {:homework_commons => @homework_commons, :page => @page} )%>");
-<% if @homework_commons.count < 10%>
-    $(window).off("scroll", scrollHandler);
-<% end%>
+

From 43f99c45e80b2c0c845a557fef0474a76dbc8c9a Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Wed, 2 Sep 2015 14:37:57 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E6=B6=88=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/users_controller.rb | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 1fac6737b..281924f55 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -106,16 +106,16 @@ class UsersController < ApplicationController
       return
     end
     # 当前用户查看消息，则设置消息为已读
-    # course_querys = @user.course_messages
-    # forge_querys = @user.forge_messages
-    # user_querys = @user.user_feedback_messages
-    # forum_querys = @user.memo_messages
-    # if User.current.id == @user.id
-    #   course_querys.update_all(:viewed => true)
-    #   forge_querys.update_all(:viewed => true)
-    #   user_querys.update_all(:viewed => true)
-    #   forum_querys.update_all(:viewed => true)
-    # end
+    course_querys = @user.course_messages
+    forge_querys = @user.forge_messages
+    user_querys = @user.user_feedback_messages
+    forum_querys = @user.memo_messages
+    if User.current.id == @user.id
+      course_querys.update_all(:viewed => true)
+      forge_querys.update_all(:viewed => true)
+      user_querys.update_all(:viewed => true)
+      forum_querys.update_all(:viewed => true)
+    end
     # @new_message_count = forge_querys.count + forum_querys.count + course_querys.count + user_querys.count
     case params[:type]
       when nil

From 9df301b4ccf554425c3befbefebe1c5ecd52f374 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Wed, 2 Sep 2015 14:37:58 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E5=8F=96=E6=B6=88=E6=97=A0=E7=94=A8?=
 =?UTF-8?q?=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/users/_user_activities.html.erb | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/views/users/_user_activities.html.erb b/app/views/users/_user_activities.html.erb
index 18125eaa9..906787070 100644
--- a/app/views/users/_user_activities.html.erb
+++ b/app/views/users/_user_activities.html.erb
@@ -60,7 +60,6 @@
         <% end %>
     <% end %>
 <% end %>
-<input type="hidden" value="<%= page%>"/>
 
 <% if user_activities.count == 10%>
     <%= link_to "点击展开更多",user_activities_path(@user.id,:type => type,:page => page),:id => "show_more_activities",:remote => "true",:class => "loadMore mt10 f_grey"%>