Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh

app/controllers/users_controller.rb

@@ -106,16 +106,16 @@ class UsersController < ApplicationController
       return
     end
     # 当前用户查看消息，则设置消息为已读
-    # course_querys = @user.course_messages
+    course_querys = @user.course_messages
-    # forge_querys = @user.forge_messages
+    forge_querys = @user.forge_messages
-    # user_querys = @user.user_feedback_messages
+    user_querys = @user.user_feedback_messages
-    # forum_querys = @user.memo_messages
+    forum_querys = @user.memo_messages
-    # if User.current.id == @user.id
+    if User.current.id == @user.id
-    #   course_querys.update_all(:viewed => true)
+      course_querys.update_all(:viewed => true)
-    #   forge_querys.update_all(:viewed => true)
+      forge_querys.update_all(:viewed => true)
-    #   user_querys.update_all(:viewed => true)
+      user_querys.update_all(:viewed => true)
-    #   forum_querys.update_all(:viewed => true)
+      forum_querys.update_all(:viewed => true)
-    # end
+    end
     # @new_message_count = forge_querys.count + forum_querys.count + course_querys.count + user_querys.count
     case params[:type]
       when nil

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"%>

app/views/users/_user_homework_list.html.erb

@@ -52,6 +52,6 @@
       </div>
     </div><!----HomeWork end-->
 <% end%>
-
+<% if homework_commons.count == 10%>
-<input type="hidden" value="<%= page%>" />
+    <%= link_to "加载更多",user_homeworks_user_path(User.current.id,:page => page),:id => "user_show_more_homework",:remote => "true",:class => "loadMore f_grey"%>
-<%= link_to "加载更多",user_homeworks_user_path(User.current.id, :page=> page),:id => "user_show_more_homework",:remote => "true",:class => "loadMore f_grey"%>
+<% end%>

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%>