diff --git a/app/views/contacts/_aspect_dropdown.html.haml b/app/views/contacts/_aspect_dropdown.html.haml index 29bb8a7f7..22ee0d9d5 100644 --- a/app/views/contacts/_aspect_dropdown.html.haml +++ b/app/views/contacts/_aspect_dropdown.html.haml @@ -12,7 +12,7 @@ - for aspect in @all_aspects = aspect_dropdown_list_item(aspect, contact, person) - - if defined?(@aspect) && ( @aspect == :profile || @aspect == :tag) + - if defined?(@aspect) && ( @aspect == :profile || @aspect == :tag || @aspect == :search) %li.newItem .add_aspect = link_to "Add a new aspect", new_aspect_path(:person_id => person.id), :rel => 'facebox' diff --git a/app/views/people/_relationship_action.haml b/app/views/people/_relationship_action.haml index 25d457343..5f98c77cd 100644 --- a/app/views/people/_relationship_action.haml +++ b/app/views/people/_relationship_action.haml @@ -1,11 +1,6 @@ -- if person.owner_id == current_user.id +- unless person == current_user.person + - contact = current_user.contacts.find_by_person_id(person.id) + - contact ||= Contact.new(:person => person) + = render 'contacts/aspect_dropdown', :contact => contact, :person => person, :hang => 'left' +-else = t('people.person.thats_you') -- elsif contact && contact.mutual - = t('people.person.already_connected') -- else - = link_to t('people.show.start_sharing'), - {:controller => "contacts", - :action => "new", - :person_id => person.id}, - :class => 'button', - :rel => 'facebox'