From 87864bf4ff53bd561406349ef8d13d06479c276a Mon Sep 17 00:00:00 2001 From: Raphael Sofaer Date: Tue, 3 May 2011 11:39:34 -0700 Subject: [PATCH] people.diaspora_handle, not profiles.diaspora_handle --- app/controllers/conversations_controller.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/controllers/conversations_controller.rb b/app/controllers/conversations_controller.rb index 6894dbdf7..24c1fca3a 100644 --- a/app/controllers/conversations_controller.rb +++ b/app/controllers/conversations_controller.rb @@ -56,7 +56,8 @@ class ConversationsController < ApplicationController end def new - all_contacts_and_ids = Contact.connection.execute(current_user.contacts.joins(:person => :profile).select("contacts.id, profiles.first_name, profiles.last_name, profiles.diaspora_handle").to_sql).map do |r| + all_contacts_and_ids = Contact.connection.execute(current_user.contacts.joins(:person => :profile + ).select("contacts.id, profiles.first_name, profiles.last_name, people.diaspora_handle").to_sql).map do |r| {:value => r[0], :name => Person.name_from_attrs(r[1], r[2], r[3]).gsub(/(")/, "'")} end