summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorStefan Wintermeyer <stefan.wintermeyer@amooma.de>2013-03-14 18:57:24 +0100
committerStefan Wintermeyer <stefan.wintermeyer@amooma.de>2013-03-14 18:57:24 +0100
commitf476fb7648fd235642233b2bbe5bb90cb57e8549 (patch)
tree9197b8670cd2bee075e9aa95c3b81a879a9f366f /app
parent40d8290361bff123e0b44defa0f199708b89093b (diff)
Bugfix
Diffstat (limited to 'app')
-rw-r--r--app/controllers/trigger_controller.rb25
1 files changed, 9 insertions, 16 deletions
diff --git a/app/controllers/trigger_controller.rb b/app/controllers/trigger_controller.rb
index 623ea94..0c635b9 100644
--- a/app/controllers/trigger_controller.rb
+++ b/app/controllers/trigger_controller.rb
@@ -92,28 +92,21 @@ class TriggerController < ApplicationController
def sip_account_update
sip_account = SipAccount.find(params[:id])
- if sip_account
+ if sip_account && sip_account.switchboard_entries.any?
# push the partial to the webbrowser
#
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,
- :layout => false,
- :content_type => 'text/plain',
- :text => "<!-- OK -->",
- )
- else
- render(
- :status => 501,
- :layout => false,
- :content_type => 'text/plain',
- :text => "<!-- ERRORS: #{errors.join(', ')} -->",
- )
+ end
end
+
+ render(
+ :status => 200,
+ :layout => false,
+ :content_type => 'text/plain',
+ :text => "<!-- OK -->",
+ )
end
def fax