Commit d04cf704 authored by Steffen van Bergerem's avatar Steffen van Bergerem
Browse files

Fix pagination for people/guid/contacts

parent 803c257e
......@@ -119,4 +119,6 @@
}
}
.stream_container > .pagination { text-align: center; }
}
......@@ -149,7 +149,6 @@ class PeopleController < ApplicationController
if @person
@contact = current_user.contact_for(@person)
@contacts_of_contact = Contact.contact_contacts_for(current_user, @person)
@hashes = hashes_for_people @contacts_of_contact, @aspects
gon.preloads[:person] = PersonPresenter.new(@person, current_user).full_hash_with_profile
gon.preloads[:photos] = {
count: photos_from(@person).count(:all),
......@@ -158,6 +157,7 @@ class PeopleController < ApplicationController
count: @contacts_of_contact.count(:all),
}
@contacts_of_contact = @contacts_of_contact.paginate(:page => params[:page], :per_page => (params[:limit] || 15))
@hashes = hashes_for_people @contacts_of_contact, @aspects
respond_with @person
else
flash[:error] = I18n.t 'people.show.does_not_exist'
......
......@@ -21,7 +21,7 @@
#people_stream.stream
- @hashes.each do |hash|
= render :partial => 'people/person', :locals => hash
= will_paginate @contacts_of_contact
= will_paginate @contacts_of_contact, :renderer => WillPaginate::ActionView::BootstrapLinkRenderer
%a{:id=>"back-to-top", :title=>"#{t('layouts.application.back_to_top')}", :href=>"#"}
&#8679;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment