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
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 %>
-
<% 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"%>
diff --git a/app/views/users/_user_homework_list.html.erb b/app/views/users/_user_homework_list.html.erb
index 677f0303b..076383607 100644
--- a/app/views/users/_user_homework_list.html.erb
+++ b/app/views/users/_user_homework_list.html.erb
@@ -52,6 +52,6 @@
<% end%>
-
-
-<%= link_to "加载更多",user_homeworks_user_path(User.current.id, :page=> page),: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%>
+