From 2a5155fd4da06f0e31310032bc367d1aa267ed39 Mon Sep 17 00:00:00 2001
From: Maxwell Salzberg <maxwell@joindiaspora.com>
Date: Tue, 23 Aug 2011 13:50:03 -0700
Subject: [PATCH] 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"

---
 app/views/services/_remote_friend.html.haml |  4 +++-
 db/seeds.rb                                 |  6 ++++--
 public/javascripts/contact-edit.js          | 12 ++----------
 3 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/app/views/services/_remote_friend.html.haml b/app/views/services/_remote_friend.html.haml
index 86abd04ed..2e32165c8 100644
--- a/app/views/services/_remote_friend.html.haml
+++ b/app/views/services/_remote_friend.html.haml
@@ -4,7 +4,9 @@
     - if friend.already_invited?
       = link_to t('.resend'), service_inviter_path(:uid => friend.uid, :provider => 'facebook', :invitation_id => friend.invitation_id), :class => 'button resend'
     - 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
       = render 'shared/aspect_dropdown', :selected_aspects => contact_proxy(friend).aspects, :person => friend.person, :hang => 'left', :dropdown_class => 'inviter', :service_uid => friend.uid
 
diff --git a/db/seeds.rb b/db/seeds.rb
index 54a8ac33e..1043a2456 100644
--- a/db/seeds.rb
+++ b/db/seeds.rb
@@ -42,11 +42,13 @@ puts "done!"
 print "Adding Facebook contacts... "
 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)} +
-                   [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)
 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!"
diff --git a/public/javascripts/contact-edit.js b/public/javascripts/contact-edit.js
index 756323116..4031b1854 100644
--- a/public/javascripts/contact-edit.js
+++ b/public/javascripts/contact-edit.js
@@ -6,17 +6,10 @@ var ContactEdit = {
   init: function(){
     $.extend(ContactEdit, AspectsDropdown);
     $('.dropdown.aspect_membership .dropdown_list > li, .dropdown.inviter .dropdown_list > li').live('click', function(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){
     var button = dropdown.parents(".dropdown").children('.button.toggle'),
@@ -50,7 +43,6 @@ var ContactEdit = {
 
   processSuccess: function(element, evt, data) {
     element.removeClass('loading')
-    element.parent().parent().html('sent!');
     if (data.url != undefined) {
       window.location = data.url;
     } else {