Commit 1e6bf9c8 authored by zhitomirskiyi's avatar zhitomirskiyi

MS IZ the cucumber now passes

parent 7ace73b8
......@@ -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
......
......@@ -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',
......
......@@ -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'));})
};
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment