Merge branch 'develop' into alan_develop

This commit is contained in:
alan 2016-03-24 13:58:04 +08:00
commit 11a5e0a963
1 changed files with 1 additions and 1 deletions

View File

@ -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)} )%>");