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

fix 500 on people index

Browse source
This commit is contained in:
danielgrippi 2011-05-17 12:24:07 -07:00
parent 57a2a8fa71
commit 26ac8b8285
2 changed files with 6 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/views/contacts/_aspect_dropdown.html.haml
View file

@ -12,7 +12,7 @@
- for aspect in @all_aspects - for aspect in @all_aspects
= aspect_dropdown_list_item(aspect, contact, person) = 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 %li.newItem
.add_aspect .add_aspect
= link_to "Add a new aspect", new_aspect_path(:person_id => person.id), :rel => 'facebox' = link_to "Add a new aspect", new_aspect_path(:person_id => person.id), :rel => 'facebox'

15
app/views/people/_relationship_action.haml
View file

@ -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') = 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'