fix 500 on people index
This commit is contained in:
parent
57a2a8fa71
commit
26ac8b8285
2 changed files with 6 additions and 11 deletions
|
|
@ -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'
|
||||
|
|
|
|||
|
|
@ -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'
|
||||
|
|
|
|||
Loading…
Reference in a new issue