From 08ae8d23cc8195943e778ed2496f839bab5b9185 Mon Sep 17 00:00:00 2001 From: Raphael Sofaer Date: Thu, 4 Aug 2011 22:28:10 -0700 Subject: [PATCH] aspect_membership_dropdown, not aspectmembership --- app/helpers/aspect_global_helper.rb | 2 +- app/views/contacts/sharing.haml | 2 +- app/views/notifications/index.html.haml | 2 +- app/views/people/_aspect_membership_dropdown.haml | 2 +- app/views/people/_relationship_action.haml | 2 +- app/views/people/_sub_header.html.haml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/app/helpers/aspect_global_helper.rb b/app/helpers/aspect_global_helper.rb index 675af2e9d..77428b8fb 100644 --- a/app/helpers/aspect_global_helper.rb +++ b/app/helpers/aspect_global_helper.rb @@ -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}} diff --git a/app/views/contacts/sharing.haml b/app/views/contacts/sharing.haml index 7ac6883c5..3ef702ece 100644 --- a/app/views/contacts/sharing.haml +++ b/app/views/contacts/sharing.haml @@ -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;"} diff --git a/app/views/notifications/index.html.haml b/app/views/notifications/index.html.haml index c78a657cd..a09e5086d 100644 --- a/app/views/notifications/index.html.haml +++ b/app/views/notifications/index.html.haml @@ -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) diff --git a/app/views/people/_aspect_membership_dropdown.haml b/app/views/people/_aspect_membership_dropdown.haml index 0636c85a1..c344095d1 100644 --- a/app/views/people/_aspect_membership_dropdown.haml +++ b/app/views/people/_aspect_membership_dropdown.haml @@ -1 +1 @@ -= aspectmembership_dropdown(@contact, @person, 'left') += aspect_memberhip_dropdown(@contact, @person, 'left') diff --git a/app/views/people/_relationship_action.haml b/app/views/people/_relationship_action.haml index 744b6dc9b..610e97fa9 100644 --- a/app/views/people/_relationship_action.haml +++ b/app/views/people/_relationship_action.haml @@ -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') diff --git a/app/views/people/_sub_header.html.haml b/app/views/people/_sub_header.html.haml index 4d376461f..8d36533d7 100644 --- a/app/views/people/_sub_header.html.haml +++ b/app/views/people/_sub_header.html.haml @@ -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'