From bbe5f56292f2da2af5a7e7bd0e1a21a5775739e9 Mon Sep 17 00:00:00 2001
From: maxwell <maxwell@joindiaspora.com>
Date: Tue, 29 Mar 2011 13:55:14 -0700
Subject: [PATCH] you can now mention in the bookmarklet

---
 app/controllers/status_messages_controller.rb   | 1 +
 app/views/status_messages/bookmarklet.html.haml | 1 +
 2 files changed, 2 insertions(+)

diff --git a/app/controllers/status_messages_controller.rb b/app/controllers/status_messages_controller.rb
index 8b0ad56c7..59c0e87b9 100644
--- a/app/controllers/status_messages_controller.rb
+++ b/app/controllers/status_messages_controller.rb
@@ -27,6 +27,7 @@ class StatusMessagesController < ApplicationController
 
   def bookmarklet 
     @aspects = current_user.aspects
+    @selected_contacts = @aspects.map { |aspect| aspect.contacts }.flatten.uniq
     @aspect_ids = @aspects.map{|x| x.id}
     render :layout => nil
   end
diff --git a/app/views/status_messages/bookmarklet.html.haml b/app/views/status_messages/bookmarklet.html.haml
index e25248aa4..6df5ed922 100644
--- a/app/views/status_messages/bookmarklet.html.haml
+++ b/app/views/status_messages/bookmarklet.html.haml
@@ -31,6 +31,7 @@
   });
 
 #new_status_message_pane
+  = hidden_field_tag :contact_json, @selected_contacts.map{|contact| contact.person}.to_json
   .span-15.last
     #facebox_header
       %h4