Revert "Revert "fixed commenting bug on current user's profile page""
This reverts commit 166202d0b2.
This commit is contained in:
parent
5fb782a988
commit
b54a72c240
2 changed files with 2 additions and 3 deletions
|
|
@ -47,13 +47,12 @@ class PeopleController < ApplicationController
|
|||
if @person
|
||||
@profile = @person.profile
|
||||
@contact = current_user.contact_for(@person)
|
||||
@is_contact = @person != current_user.person && @contact
|
||||
|
||||
if @contact
|
||||
@aspects_with_person = @contact.aspects
|
||||
end
|
||||
|
||||
@commenting_disabled = !@contact
|
||||
@commenting_disabled = (current_user.person.id != @person.id) && !@contact
|
||||
|
||||
@posts = current_user.posts_from(@person).paginate :page => params[:page]
|
||||
@post_hashes = hashes_for_posts @posts
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
= link_to t('_photos'), person_photos_path(@person)
|
||||
|
||||
.span-8.append-1.last
|
||||
= render :partial => 'people/profile_sidebar', :locals => {:person => @person, :is_contact => @is_contact}
|
||||
= render :partial => 'people/profile_sidebar', :locals => {:person => @person, :is_contact => @contact}
|
||||
|
||||
.span-15.last
|
||||
- unless @contact || current_user.person == @person
|
||||
|
|
|
|||
Loading…
Reference in a new issue