Merge branch 'develop' of https://github.com/amooma/GS5 into develop

1 files changed, 19 insertions, 20 deletions

diff --git a/app/controllers/trigger_controller.rb b/app/controllers/trigger_controller.rb
index 623ea94..a858e33 100644
--- a/app/controllers/trigger_controller.rb
+++ b/app/controllers/trigger_controller.rb
@@ -92,28 +92,27 @@ class TriggerController < ApplicationController
   def sip_account_update
     sip_account = SipAccount.find(params[:id])
 
-    if sip_account
-      # 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}');")
+    # TO-DO: Only update the neccessary entries.
+    #
+    SwitchboardEntry.all.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
+
+    Switchboard.all.each do |switchboard|
+      if sip_account.call_legs.where(:sip_account_id => switchboard.user.sip_account_ids).any? || 
+         sip_account.b_call_legs.where(:sip_account_id => switchboard.user.sip_account_ids).any?
+        new_html = ActionController::Base.helpers.escape_javascript(render_to_string("switchboards/_current_user_dashboard", :layout => false, :locals => {:current_user => switchboard.user}))
+        PrivatePub.publish_to("/switchboards/#{switchboard.id}", "$('.dashboard').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
+
+    render(
+          :status => 200,
+          :layout => false,
+          :content_type => 'text/plain',
+          :text => "<!-- OK -->",
+    )
   end  
 
   def fax