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

IZ MS fixed facebook inviter for people you are already friends with to use the normal aspect membership dropdown, and created some nuiaces in the seed script between bob, alice and eve and their fb status"

Browse source
This commit is contained in:
Maxwell Salzberg 2011-08-23 13:50:03 -07:00
parent 40b2c2370a
commit 2a5155fd4d
3 changed files with 9 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/views/services/_remote_friend.html.haml
View file

@ -4,7 +4,9 @@
- if friend.already_invited? - if friend.already_invited?
= link_to t('.resend'), service_inviter_path(:uid => friend.uid, :provider => 'facebook', :invitation_id => friend.invitation_id), :class => 'button resend' = link_to t('.resend'), service_inviter_path(:uid => friend.uid, :provider => 'facebook', :invitation_id => friend.invitation_id), :class => 'button resend'
- elsif friend.on_diaspora? - elsif friend.on_diaspora?
= render 'shared/aspect_dropdown', :selected_aspects => contact_proxy(friend).aspects, :person => friend.person, :hang => 'left' /= render 'shared/aspect_dropdown', :selected_aspects => contact_proxy(friend).aspects, :person => friend.person, :hang => 'left'
- puts 'yo'
= aspect_membership_dropdown(contact_proxy(friend), friend.person, 'left')
- else - else
= render 'shared/aspect_dropdown', :selected_aspects => contact_proxy(friend).aspects, :person => friend.person, :hang => 'left', :dropdown_class => 'inviter', :service_uid => friend.uid = render 'shared/aspect_dropdown', :selected_aspects => contact_proxy(friend).aspects, :person => friend.person, :hang => 'left', :dropdown_class => 'inviter', :service_uid => friend.uid

6
db/seeds.rb
View file

@ -42,11 +42,13 @@ puts "done!"
print "Adding Facebook contacts... " print "Adding Facebook contacts... "
bob_facebook = Factory(:service, :type => 'Services::Facebook', :user_id => bob.id, :uid => bob.username) bob_facebook = Factory(:service, :type => 'Services::Facebook', :user_id => bob.id, :uid => bob.username)
ServiceUser.import((1..10).map{|n| Factory.build(:service_user, :service => bob_facebook)} + ServiceUser.import((1..10).map{|n| Factory.build(:service_user, :service => bob_facebook)} +
[Factory.build(:service_user, :service => bob_facebook, :uid => eve.username, :person => eve.person)]) [Factory.build(:service_user, :service => bob_facebook, :uid => eve.username, :person => eve.person,
:contact => bob.contact_for(eve.person))])
eve_facebook = Factory(:service, :type => 'Services::Facebook', :user_id => eve.id, :uid => eve.username) eve_facebook = Factory(:service, :type => 'Services::Facebook', :user_id => eve.id, :uid => eve.username)
ServiceUser.import((1..10).map{|n| Factory.build(:service_user, :service => eve_facebook) } + ServiceUser.import((1..10).map{|n| Factory.build(:service_user, :service => eve_facebook) } +
[Factory.build(:service_user, :service => eve_facebook, :uid => bob.username, :person => bob.person)]) [Factory.build(:service_user, :service => eve_facebook, :uid => bob.username, :person => bob.person,
:contact => eve.contact_for(bob.person))])
puts "done!" puts "done!"

12
public/javascripts/contact-edit.js
View file

@ -6,17 +6,10 @@ var ContactEdit = {
init: function(){ init: function(){
$.extend(ContactEdit, AspectsDropdown); $.extend(ContactEdit, AspectsDropdown);
$('.dropdown.aspect_membership .dropdown_list > li, .dropdown.inviter .dropdown_list > li').live('click', function(evt){ $('.dropdown.aspect_membership .dropdown_list > li, .dropdown.inviter .dropdown_list > li').live('click', function(evt){
ContactEdit.processClick($(this), evt); ContactEdit.processClick($(this), evt);
}); });
// $('.button.resend').live('click', function(evt){ },
// evt.preventDefault();
// $.post($(this).href, {},
// function(data){
// console.log(data);
// ContactEdit.processSuccess($(this), evt, data)
// });
// });
},
updateNumber: function(dropdown, personId, number){ updateNumber: function(dropdown, personId, number){
var button = dropdown.parents(".dropdown").children('.button.toggle'), var button = dropdown.parents(".dropdown").children('.button.toggle'),
@ -50,7 +43,6 @@ var ContactEdit = {
processSuccess: function(element, evt, data) { processSuccess: function(element, evt, data) {
element.removeClass('loading') element.removeClass('loading')
element.parent().parent().html('sent!');
if (data.url != undefined) { if (data.url != undefined) {
window.location = data.url; window.location = data.url;
} else { } else {