diff --git a/app/controllers/people_controller.rb b/app/controllers/people_controller.rb index b334b4af311cad236f619dc8da3bc82fcbac097d..f9d053eb42585e795c6e82fd53d015d419a5e5c0 100644 --- a/app/controllers/people_controller.rb +++ b/app/controllers/people_controller.rb @@ -87,7 +87,7 @@ class PeopleController < ApplicationController @contacts_of_contact = [] end - if (@person != current_user.person) && (!@contact || @contact.pending) + if (@person != current_user.person) && (!@contact || !@contact.persisted? || @contact.pending) @commenting_disabled = true else @commenting_disabled = false diff --git a/app/views/people/show.mobile.haml b/app/views/people/show.mobile.haml index 7bd5d378bcee57913016c744b6c511e5c7fde60e..837774fa88a9de3484f30c9bdb9c643b1814ca8f 100644 --- a/app/views/people/show.mobile.haml +++ b/app/views/people/show.mobile.haml @@ -10,7 +10,7 @@ - if user_signed_in? && !(@contact.persisted? || current_user.person == @person) .right = link_to "start sharing", - {:controller => "contact", + {:controller => "contacts", :action => "new", :id => @person.id}, :class => 'share_with button', diff --git a/spec/controllers/people_controller_spec.rb b/spec/controllers/people_controller_spec.rb index ce849185e8978c1cc292851e5efd6fa896f48749..e923c8a1bfc2d33cd58e27eb834982c5d38fad36 100644 --- a/spec/controllers/people_controller_spec.rb +++ b/spec/controllers/people_controller_spec.rb @@ -200,6 +200,11 @@ describe PeopleController do get :show, :id => @person.id assigns(:posts).models.should =~ posts_user_can_see end + + it 'sets @commenting_disabled to true' do + get :show, :id => @person.id + assigns(:commenting_disabled).should == false + end end context "when the person is not a contact of the current user" do @@ -227,6 +232,11 @@ describe PeopleController do get :show, :id => @person.id assigns[:posts].models.should =~ [public_post] end + + it 'sets @commenting_disabled to true' do + get :show, :id => @person.id + assigns(:commenting_disabled).should == true + end end end