aspect_membership_dropdown, not aspectmembership
This commit is contained in:
parent
d9484e3dd5
commit
08ae8d23cc
6 changed files with 6 additions and 6 deletions
|
|
@ -65,7 +65,7 @@ module AspectGlobalHelper
|
|||
end
|
||||
end
|
||||
|
||||
def aspectmembership_dropdown(contact, person, hang, aspect=nil)
|
||||
def aspect_membership_dropdown(contact, person, hang, aspect=nil)
|
||||
@selected_aspects = []
|
||||
if contact.persisted?
|
||||
@selected_aspects = all_aspects.find_all{|aspect| contact.aspect_memberships.detect{ |am| am.aspect_id == aspect.id}}
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@
|
|||
= contact.person.diaspora_handle
|
||||
|
||||
.right
|
||||
= aspectmembership_dropdown(contact, contact.person, 'right')
|
||||
= aspect_membership_dropdown(contact, contact.person, 'right')
|
||||
|
||||
%br
|
||||
%div{:style => "text-align:right;"}
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@
|
|||
.stream_element{:data=>{:guid => note.id}, :class => "#{note.unread ? 'unread' : ''}"}
|
||||
- if note.type == "Notifications::StartedSharing" && contact = current_user.contact_for(note[:target])
|
||||
.right
|
||||
= aspectmembership_dropdown(contact, note[:target], 'left')
|
||||
= aspect_memberhip_dropdown(contact, note[:target], 'left')
|
||||
|
||||
%span.from
|
||||
= notification_message_for(note)
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
= aspectmembership_dropdown(@contact, @person, 'left')
|
||||
= aspect_memberhip_dropdown(@contact, @person, 'left')
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
- unless person == current_user.person
|
||||
- contact = current_user.contacts.find_by_person_id(person.id)
|
||||
- contact ||= Contact.new(:person => person)
|
||||
= aspectmembership_dropdown(contact, person, 'left')
|
||||
= aspect_memberhip_dropdown(contact, person, 'left')
|
||||
-else
|
||||
= t('people.person.thats_you')
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
#author_info
|
||||
.right
|
||||
- if user_signed_in? && current_user.person != person
|
||||
= render 'aspect_memberships/aspect_dropdown', :contact => contact, :person => person, :hang => 'left'
|
||||
= aspect_memberhip_dropdown(contact, person, 'left')
|
||||
- elsif user_signed_in? && current_user.person == person
|
||||
= link_to t('people.profile_sidebar.edit_my_profile'), edit_profile_path, :class => 'button creation'
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue