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

Fix rendering into json for names with quotes

Browse source
This commit is contained in:
Raphael Sofaer 2011-05-03 10:49:57 -07:00
parent 77372b2f08
commit c7358c8664
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
app/controllers/conversations_controller.rb
View file

@ -56,10 +56,11 @@ class ConversationsController < ApplicationController
end end
def new 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, profiles.diaspora_handle").to_sql).map do |r|
{:value => r[0], :name => Person.name_from_attrs(r[1], r[2], r[3])} {:value => r[0],
:name => Person.name_from_attrs(r[1], r[2], r[3]).gsub(/(")/, "'")}
end end
@contacts_json = all_contacts_and_ids.to_json.gsub!(/(")/, '\\"')
@contact = current_user.contacts.find(params[:contact_id]) if params[:contact_id] @contact = current_user.contacts.find(params[:contact_id]) if params[:contact_id]
render :layout => false render :layout => false
end end

2
app/views/conversations/new.haml
View file

@ -4,7 +4,7 @@
:javascript :javascript
$(document).ready(function () { $(document).ready(function () {
var data = $.parseJSON( '#{@all_contacts_and_ids.to_json.gsub("'", "\\\\'")}' ), var data = $.parseJSON( "#{@contacts_json}" ),
autocompleteInput = $("#contact_autocomplete"); autocompleteInput = $("#contact_autocomplete");
autocompleteInput.autoSuggest(data, { autocompleteInput.autoSuggest(data, {