nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix pagination for people/guid/contacts

Browse source
This commit is contained in:
Steffen van Bergerem 2014-10-07 10:55:58 +02:00
parent 803c257ecf
commit d04cf7046b
3 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/assets/stylesheets/profile.css.scss
View file

@ -119,4 +119,6 @@
} }
} }
.stream_container > .pagination { text-align: center; }
} }

2
app/controllers/people_controller.rb
View file

@ -149,7 +149,6 @@ class PeopleController < ApplicationController
if @person if @person
@contact = current_user.contact_for(@person) @contact = current_user.contact_for(@person)
@contacts_of_contact = Contact.contact_contacts_for(current_user, @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[:person] = PersonPresenter.new(@person, current_user).full_hash_with_profile
gon.preloads[:photos] = { gon.preloads[:photos] = {
count: photos_from(@person).count(:all), count: photos_from(@person).count(:all),
@ -158,6 +157,7 @@ class PeopleController < ApplicationController
count: @contacts_of_contact.count(:all), count: @contacts_of_contact.count(:all),
} }
@contacts_of_contact = @contacts_of_contact.paginate(:page => params[:page], :per_page => (params[:limit] || 15)) @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 respond_with @person
else else
flash[:error] = I18n.t 'people.show.does_not_exist' flash[:error] = I18n.t 'people.show.does_not_exist'

2
app/views/people/contacts.haml
View file

@ -21,7 +21,7 @@
#people_stream.stream #people_stream.stream
- @hashes.each do |hash| - @hashes.each do |hash|
= render :partial => 'people/person', :locals => 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=>"#"} %a{:id=>"back-to-top", :title=>"#{t('layouts.application.back_to_top')}", :href=>"#"}
&#8679; &#8679;