diff --git a/app/views/users/_user_activities.html.erb b/app/views/users/_user_activities.html.erb index 2eba84efa..8c9111dce 100644 --- a/app/views/users/_user_activities.html.erb +++ b/app/views/users/_user_activities.html.erb @@ -61,4 +61,7 @@ <% end %> <% end %> -<%= link_to "点击展开更多",user_activities_path(@user.id,:type => type),:id => "show_more_activities",:remote => "true",:class => "loadMore mt10 f_grey"%> +<% if user_activities.count == 10%> + <%= link_to "点击展开更多",user_activities_path(@user.id,:type => type),:id => "show_more_activities",:remote => "true",:class => "loadMore mt10 f_grey"%> +<% end%> + diff --git a/app/views/users/show.js.erb b/app/views/users/show.js.erb index bf7443f8c..eb5de9c6a 100644 --- a/app/views/users/show.js.erb +++ b/app/views/users/show.js.erb @@ -1,4 +1,2 @@ $("#show_more_activities").replaceWith("<%= escape_javascript( render :partial => 'users/user_activities',:locals => {:user_activities => @user_activities, :page => @page,:type => @type} )%>"); -<% if @user_activities.count < 10%> -$("#show_more_activities").hide(); -<% end%> +