diff --git a/app/controllers/contacts_controller.rb b/app/controllers/contacts_controller.rb index 202c07bce..e5404d351 100644 --- a/app/controllers/contacts_controller.rb +++ b/app/controllers/contacts_controller.rb @@ -24,7 +24,8 @@ class ContactsController < ApplicationController :locals => {:aspect_id => @aspect.id, :person_id => @person.id}), :badge_html => render_to_string(:partial => 'aspects/aspect_badge', - :locals => {:aspect => @aspect}) + :locals => {:aspect => @aspect}), + :contact_id => current_user.contact_for(@person).id }} format.html{ redirect_to aspect_path(@aspect.id)} end diff --git a/app/views/people/_share_with_pane.html.haml b/app/views/people/_share_with_pane.html.haml index 71694e59d..b980f18fd 100644 --- a/app/views/people/_share_with_pane.html.haml +++ b/app/views/people/_share_with_pane.html.haml @@ -2,7 +2,7 @@ -# licensed under the Affero General Public License version 3 or later. See -# the COPYRIGHT file. -.aspect_list#aspects_list(( {:data=>{:contact_id=>contact.id} }) if contact) +.aspect_list#aspects_list{:data=> {:contact_id=> (contact ? contact.id : nil)}} %ul - for aspect in aspects_with_person = render :partial => 'aspects/aspect_list_item', diff --git a/public/javascripts/contact-list.js b/public/javascripts/contact-list.js index 51bc93854..da37b2800 100644 --- a/public/javascripts/contact-list.js +++ b/public/javascripts/contact-list.js @@ -90,7 +90,6 @@ $(document).ready(function() { if($('#aspects_list').length == 1) { $('.aspect_list').attr('data-contact_id', json.contact_id); - alert('^- TODO'); $('.aspect_list ul').find('.add').each(function(a,b){$(b).attr('href', $(b).attr('href').replace('contacts','aspect_memberships'));}) };