Merge branch 'develop' into ouyang

10 years ago · 7b24b053a5
parent 5cc31fb511 a0e11a787f
commit 7b24b053a5
1 changed files with 1 additions and 1 deletions
--- a/app/views/users/show.js.erb
+++ b/app/views/users/show.js.erb
@ -1,2 +1,2 @@
-$("#show_more_activities").replaceWith("<%= escape_javascript( render :partial =>  'users/user_activities',:locals => {:user_activities => @user_activities, :page => @page,:type => @type} )%>");
+$("#show_more_activities").replaceWith("<%= escape_javascript( render :partial =>  'users/user_activities',:locals => {:user_activities => @user_activities, :page => @page,:type => @type, :user_id => (@user.type == "AnonymousUser" ? User.current.id : @user.id)} )%>");