Merge pull request #5304 from svbergerem/new-profile-fix-regressions

Fix pagination for people/guid/contacts

app/assets/stylesheets/profile.css.scss

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

app/controllers/people_controller.rb

@@ -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'

app/views/people/contacts.haml

@@ -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=>"#"}
         ⇧