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

Revert "fixed commenting bug on current user's profile page"

Browse source 
This reverts commit 8264c58e3e.
This commit is contained in:
maxwell 2010-12-09 13:53:23 -08:00
parent 8264c58e3e
commit 166202d0b2
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/controllers/people_controller.rb
View file

@ -47,12 +47,13 @@ class PeopleController < ApplicationController
if @person if @person
@profile = @person.profile @profile = @person.profile
@contact = current_user.contact_for(@person) @contact = current_user.contact_for(@person)
@is_contact = @person != current_user.person && @contact
if @contact if @contact
@aspects_with_person = @contact.aspects @aspects_with_person = @contact.aspects
end end
@commenting_disabled = (current_user.person.id != @person.id) && !@contact @commenting_disabled = !@contact
@posts = current_user.posts_from(@person).paginate :page => params[:page] @posts = current_user.posts_from(@person).paginate :page => params[:page]
@post_hashes = hashes_for_posts @posts @post_hashes = hashes_for_posts @posts

2
app/views/people/show.html.haml
View file

@ -17,7 +17,7 @@
= link_to t('_photos'), person_photos_path(@person) = link_to t('_photos'), person_photos_path(@person)
.span-8.append-1.last .span-8.append-1.last
= render :partial => 'people/profile_sidebar', :locals => {:person => @person, :is_contact => @contact} = render :partial => 'people/profile_sidebar', :locals => {:person => @person, :is_contact => @is_contact}
.span-15.last .span-15.last
- unless @contact || current_user.person == @person - unless @contact || current_user.person == @person