diff --git a/app/controllers/aspects_controller.rb b/app/controllers/aspects_controller.rb index 0129c0abf..985fb68a9 100644 --- a/app/controllers/aspects_controller.rb +++ b/app/controllers/aspects_controller.rb @@ -48,7 +48,7 @@ class AspectsController < ApplicationController render :file => "#{Rails.root}/public/404.html", :layout => false, :status => 404 else @friends = @aspect.people - @posts = current_user.visible_posts( :by_members_of => @aspect ).paginate :per_page => 15, :order => 'created_at DESC' + @posts = current_user.visible_posts( :by_members_of => @aspect ).paginate :page => params[:page], :per_page => 15, :order => 'created_at DESC' respond_with @aspect end end diff --git a/public/javascripts/aspect-edit.js b/public/javascripts/aspect-edit.js index 4b6f1c421..e4a581d57 100644 --- a/public/javascripts/aspect-edit.js +++ b/public/javascripts/aspect-edit.js @@ -92,7 +92,7 @@ $(function() { 'aspect_id' : person.attr('data-aspect_id') } }); } - person.fadeOut('slow', $(this).remove()); + person.fadeOut(400, function(){person.remove();}); } } });