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

MS IZ the cucumber now passes

Browse source
This commit is contained in:
zhitomirskiyi 2011-02-17 11:35:55 -08:00
parent 7ace73b84b
commit 1e6bf9c80e
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/controllers/contacts_controller.rb
View file

@ -24,7 +24,8 @@ class ContactsController < ApplicationController
:locals => {:aspect_id => @aspect.id, :locals => {:aspect_id => @aspect.id,
:person_id => @person.id}), :person_id => @person.id}),
:badge_html => render_to_string(:partial => 'aspects/aspect_badge', :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)} format.html{ redirect_to aspect_path(@aspect.id)}
end end

2
app/views/people/_share_with_pane.html.haml
View file

@ -2,7 +2,7 @@
-# licensed under the Affero General Public License version 3 or later. See -# licensed under the Affero General Public License version 3 or later. See
-# the COPYRIGHT file. -# 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 %ul
- for aspect in aspects_with_person - for aspect in aspects_with_person
= render :partial => 'aspects/aspect_list_item', = render :partial => 'aspects/aspect_list_item',

1
public/javascripts/contact-list.js
View file

@ -90,7 +90,6 @@ $(document).ready(function() {
if($('#aspects_list').length == 1) { if($('#aspects_list').length == 1) {
$('.aspect_list').attr('data-contact_id', json.contact_id); $('.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'));}) $('.aspect_list ul').find('.add').each(function(a,b){$(b).attr('href', $(b).attr('href').replace('contacts','aspect_memberships'));})
}; };