summaryrefslogtreecommitdiff
path: root/app/controllers/trigger_controller.rb
diff options
context:
space:
mode:
authorPeter Kozak <spag@golwen.net>2013-03-11 07:29:39 -0400
committerPeter Kozak <spag@golwen.net>2013-03-11 07:29:39 -0400
commit62293482479ff51c5044f536aa2aae88e5117f46 (patch)
treee4e643cabf14a58863715f8c112447b8e77e1fae /app/controllers/trigger_controller.rb
parent3e7b87d2839213cf5d29e2750b08a7b6cfd7d1c4 (diff)
parent64afdeacb1444b319abfcad6c9a8cfd656fe2dd4 (diff)
Merge branch 'develop' of github.com:amooma/GS5 into develop
Diffstat (limited to 'app/controllers/trigger_controller.rb')
-rw-r--r--app/controllers/trigger_controller.rb13
1 files changed, 12 insertions, 1 deletions
diff --git a/app/controllers/trigger_controller.rb b/app/controllers/trigger_controller.rb
index 1a5bfca..0de9223 100644
--- a/app/controllers/trigger_controller.rb
+++ b/app/controllers/trigger_controller.rb
@@ -44,7 +44,7 @@ class TriggerController < ApplicationController
# Indicate a new voicemail in the navigation bar.
#
- PrivatePub.publish_to("/users/#{user.id}/messages/new", "$('#new_voicemail_indicator').hide.delay(250).show('slow').hide.delay(250).show('slow');")
+ PrivatePub.publish_to("/users/#{user.id}/messages/new", "$('#new_voicemail_or_fax_indicator').hide('fast').show('slow');")
render(
:status => 200,
@@ -110,6 +110,17 @@ class TriggerController < ApplicationController
end
if errors.count == 0
+ # Reload FaxDocument#show
+ #
+ PrivatePub.publish_to("/fax_documents/#{fax_document.id}", "location.reload();")
+
+ # Indicate a new fax in the navigation bar.
+ #
+ if fax_document.fax_accountable.class == User
+ user = fax_document.fax_accountable
+ PrivatePub.publish_to("/users/#{user.id}/messages/new", "$('#new_voicemail_or_fax_indicator').hide('fast').show('slow');")
+ end
+
render(
:status => 200,
:layout => false,