From d976bf0966ca6287157ad2b691fac4363fa8a5da Mon Sep 17 00:00:00 2001
From: zhitomirskiyi <ilya@joindiaspora.com>
Date: Tue, 25 Jan 2011 13:49:42 -0800
Subject: [PATCH] fixed bug in facebook service finder

---
 app/models/services/facebook.rb     |  7 ++++---
 app/views/services/finder.html.haml | 11 ++++++++---
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/app/models/services/facebook.rb b/app/models/services/facebook.rb
index 26f0e93ce..50ed0072d 100644
--- a/app/models/services/facebook.rb
+++ b/app/models/services/facebook.rb
@@ -20,9 +20,10 @@ class Services::Facebook < Service
     response = RestClient.get("https://graph.facebook.com/me/friends", {:params => {:access_token => self.access_token}})
     data = JSON.parse(response.body)['data']
 
-    data_h = Hash[*data.collect {|v|
-      [v['id'], {:name => v['name']}]
-    }.flatten]
+    data_h = {}
+    data.map do |d|
+      data_h[d['id']] = {:name => d['name']}
+    end
 
     service_objects = Services::Facebook.where(:uid => data_h.keys).includes(:user => :person)
     service_objects.each{|s| data_h[s.uid][:person] = s.user.person}
diff --git a/app/views/services/finder.html.haml b/app/views/services/finder.html.haml
index bde66a67d..2de08ab94 100644
--- a/app/views/services/finder.html.haml
+++ b/app/views/services/finder.html.haml
@@ -16,7 +16,12 @@
         %h4.name
           = link_to friend[:name], '#'
 
-      - if friend[:person]
-        .right
-          = aspect_membership_button(aspect, contact, contact.person)
+        - if person = friend[:person]
+          .right
+            = link_to t('people.show.start_sharing'),
+              {:controller => "people",
+              :action => "share_with",
+              :id => person.id},
+              :class => 'button',
+              :rel => 'facebox'