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

Add photo count

Browse source
This commit is contained in:
carolina 2013-08-07 18:33:04 +02:00 committed by mokus
parent a7bfc542e1
commit d7e6ec8a4c
2 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/people_controller.rb
View file

@ -81,7 +81,7 @@ class PeopleController < ApplicationController
@aspect = :profile @aspect = :profile
@stream = Stream::Person.new(current_user, @person, :max_time => max_time) @stream = Stream::Person.new(current_user, @person, :max_time => max_time)
@profile = @person.profile @profile = @person.profile
@photos = Photo.where(author_id: @profile.id).limit(3).order('created_at desc') @photos = Photo.where(author_id: @profile.id).order('created_at desc')
unless params[:format] == "json" # hovercard unless params[:format] == "json" # hovercard
if current_user if current_user
@block = current_user.blocks.where(:person_id => @person.id).first @block = current_user.blocks.where(:person_id => @person.id).first

8
app/views/people/_profile_sidebar.html.haml
View file

@ -18,7 +18,8 @@
%br %br
%br %br
-if contact.sharing? || person == current_user.person -if contact.sharing? || person == current_user.person
%ul#profile_information %ul#aspect_nav.left_nav
- unless person.bio.blank? - unless person.bio.blank?
%li %li
%h4 %h4
@ -47,7 +48,10 @@
- unless @photos.blank? - unless @photos.blank?
%h4 %h4
= t('_photos') = t('_photos')
- for photo in @photos .contact_count
= " #{@photos.count}"
- @thumbs = @photos.limit(3)
- for photo in @thumbs
= image_tag(photo.url(:thumb_small)) = image_tag(photo.url(:thumb_small))
%br %br
= link_to t('layouts.header.view_all'), person_photos_path(person) = link_to t('layouts.header.view_all'), person_photos_path(person)