summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Kozak <spag@golwen.net>2013-03-12 10:14:20 -0400
committerPeter Kozak <spag@golwen.net>2013-03-12 10:14:20 -0400
commit056d167480aca20ab9d547bad59aa2875843f8e0 (patch)
tree8d586ccd5b1c9d5c2cd8ff017229bdf4bb1b0cca
parent141e4dee515931cfb0a8dec440b11fc8ed58523f (diff)
parent3ca9b0e7af3dd475c4e69512cf49abfef4ddd0aa (diff)
Merge branch 'develop' of github.com:amooma/GS5 into develop
-rw-r--r--app/controllers/trigger_controller.rb6
1 files changed, 4 insertions, 2 deletions
diff --git a/app/controllers/trigger_controller.rb b/app/controllers/trigger_controller.rb
index 3445802..b8db4c9 100644
--- a/app/controllers/trigger_controller.rb
+++ b/app/controllers/trigger_controller.rb
@@ -95,8 +95,10 @@ class TriggerController < ApplicationController
if sip_account
# push the partial to the webbrowser
#
- # new_html = ActionController::Base.helpers.escape_javascript(render_to_string("fax_documents/_fax_document", :layout => false, :locals => {:fax_document => fax_document}))
- # PrivatePub.publish_to("/fax_documents/#{fax_document.id}", "$('#" + fax_document.id.to_s + ".fax_document').replaceWith('#{new_html}');")
+ sip_account.switchboard_entries.each do |switchboard_entry|
+ new_html = ActionController::Base.helpers.escape_javascript(render_to_string("switchboard_entries/_switchboard_entry", :layout => false, :locals => {:switchboard_entry => switchboard_entry}))
+ PrivatePub.publish_to("/switchboards/#{switchboard_entry.switchboard.id}", "$('#switchboard_entry_id_" + switchboard_entry.id.to_s + ".replaceWith('#{new_html}');")
+ end
render(
:status => 200,