From db9dbf03d88cfbd68ce99a242730b9e870339539 Mon Sep 17 00:00:00 2001
From: Stefan Wintermeyer <stefan.wintermeyer@amooma.de>
Date: Thu, 7 Mar 2013 13:15:35 +0100
Subject: Added Switchboard scaffold.

---
 app/controllers/switchboards_controller.rb | 65 ++++++++++++++++++++++++++++++
 1 file changed, 65 insertions(+)
 create mode 100644 app/controllers/switchboards_controller.rb

(limited to 'app/controllers')

diff --git a/app/controllers/switchboards_controller.rb b/app/controllers/switchboards_controller.rb
new file mode 100644
index 0000000..8f21d5e
--- /dev/null
+++ b/app/controllers/switchboards_controller.rb
@@ -0,0 +1,65 @@
+class SwitchboardsController < ApplicationController
+  load_and_authorize_resource :user
+  authorize_resource :switchboard, :through => :user
+
+  def index
+    @switchboards = @user.switchboards
+    spread_breadcrumbs
+  end
+
+  def show
+    @switchboard = @user.switchboards.find(params[:id])
+    spread_breadcrumbs
+  end
+
+  def new
+    @switchboard = @user.switchboards.build
+    spread_breadcrumbs
+  end
+
+  def create
+    @switchboard = @user.switchboards.build(switchboard_params)
+    spread_breadcrumbs
+    if @switchboard.save
+      redirect_to user_switchboards_path(@user), :notice => t('switchboards.controller.successfuly_created')
+    else
+      render :new
+    end
+  end
+
+  def edit
+    @switchboard = @user.switchboards.find(params[:id])
+    spread_breadcrumbs
+  end
+
+  def update
+    @switchboard = @user.switchboards.find(params[:id])
+    spread_breadcrumbs
+    if @switchboard.update_attributes(switchboard_params)
+      redirect_to [@user, @switchboard], :notice  => t('switchboards.controller.successfuly_updated')
+    else
+      render :edit
+    end
+  end
+
+  def destroy
+    @switchboard = @user.switchboards.find(params[:id])
+    @switchboard.destroy
+    spread_breadcrumbs
+    redirect_to user_switchboards_path(@user), :notice => t('switchboards.controller.successfuly_destroyed')
+  end
+
+  private
+  def switchboard_params
+    params.require(:switchboard).permit(:name)
+  end
+
+  def spread_breadcrumbs
+    add_breadcrumb t("users.index.page_title"), tenant_users_path(@user.current_tenant)
+    add_breadcrumb @user, tenant_user_path(@user.current_tenant, @user)
+    add_breadcrumb t("switchboards.index.page_title"), user_switchboards_path(@user)
+    if @switchboard && !@switchboard.new_record?
+      add_breadcrumb @switchboard, user_switchboard_path(@user, @switchboard)
+    end
+  end  
+end
-- 
cgit v1.2.3


From 678baf479066ad6b517b3a97925a7e37bf5327e4 Mon Sep 17 00:00:00 2001
From: Peter Kozak <spag@golwen.net>
Date: Thu, 7 Mar 2013 07:38:44 -0500
Subject: softkey form fixed

---
 app/controllers/softkeys_controller.rb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'app/controllers')

diff --git a/app/controllers/softkeys_controller.rb b/app/controllers/softkeys_controller.rb
index 9179d8c..6727de1 100644
--- a/app/controllers/softkeys_controller.rb
+++ b/app/controllers/softkeys_controller.rb
@@ -2,7 +2,7 @@ class SoftkeysController < ApplicationController
   load_and_authorize_resource :sip_account, :except => [:sort]
   load_and_authorize_resource :softkey, :through => [:sip_account], :except => [:sort]
 
-  before_filter :set_available_softkey_functions, :only => [ :new, :edit, :update ]
+  before_filter :set_available_softkey_functions, :only => [ :new, :edit, :update, :create ]
   before_filter :spread_breadcrumbs, :except => [:sort]
   
   def index
@@ -35,6 +35,7 @@ class SoftkeysController < ApplicationController
       redirect_to sip_account_softkey_path(@softkey.sip_account, @softkey), :notice  => t('softkeys.controller.successfuly_updated')
     else
       delete_call_forward_softkey_if_no_callforward_is_available
+      
       render :edit
     end
   end
-- 
cgit v1.2.3


From 4d7d5ad238990582d6c90a25272f2141ea9a3b28 Mon Sep 17 00:00:00 2001
From: Peter Kozak <spag@golwen.net>
Date: Fri, 8 Mar 2013 05:50:02 -0500
Subject: toggle action added to acd_agents

---
 app/controllers/acd_agents_controller.rb | 32 ++++++++++++++++++++------------
 1 file changed, 20 insertions(+), 12 deletions(-)

(limited to 'app/controllers')

diff --git a/app/controllers/acd_agents_controller.rb b/app/controllers/acd_agents_controller.rb
index 4c08f68..e2aabdf 100644
--- a/app/controllers/acd_agents_controller.rb
+++ b/app/controllers/acd_agents_controller.rb
@@ -1,7 +1,7 @@
 class AcdAgentsController < ApplicationController
-  load_and_authorize_resource :automatic_call_distributor
-  load_and_authorize_resource :acd_agent, :through => [:automatic_call_distributor]
-
+  load_and_authorize_resource :automatic_call_distributor, :except => [:toggle]
+  load_and_authorize_resource :acd_agent, :through => [:automatic_call_distributor], :except => [:toggle]
+  load_and_authorize_resource :acd_agent, :only => [:toggle]
   before_filter :spread_breadcrumbs
 
   def index
@@ -62,16 +62,24 @@ class AcdAgentsController < ApplicationController
     redirect_to automatic_call_distributor_acd_agents_path(@automatic_call_distributor), :notice => t('acd_agents.controller.successfuly_destroyed')
   end
 
+  def toggle
+    @acd_agent.toggle_status
+    redirect_to request.referer
+  end
+
+  private
   def spread_breadcrumbs
-    if @automatic_call_distributor.automatic_call_distributorable.class == User
-      add_breadcrumb t("#{@automatic_call_distributor.automatic_call_distributorable.class.name.underscore.pluralize}.index.page_title"), method( :"tenant_#{@automatic_call_distributor.automatic_call_distributorable.class.name.underscore.pluralize}_path" ).(@automatic_call_distributor.tenant)
-      add_breadcrumb @automatic_call_distributor.automatic_call_distributorable, method( :"tenant_#{@automatic_call_distributor.automatic_call_distributorable.class.name.underscore}_path" ).(@automatic_call_distributor.tenant, @automatic_call_distributor.automatic_call_distributorable)
-    end
-    add_breadcrumb t("automatic_call_distributors.index.page_title"), method( :"#{@automatic_call_distributor.automatic_call_distributorable.class.name.underscore}_automatic_call_distributors_path" ).(@automatic_call_distributor.automatic_call_distributorable)
-    add_breadcrumb @automatic_call_distributor, method( :"#{@automatic_call_distributor.automatic_call_distributorable.class.name.underscore}_automatic_call_distributor_path" ).(@automatic_call_distributor.automatic_call_distributorable, @automatic_call_distributor)
-    add_breadcrumb t("acd_agents.index.page_title"), automatic_call_distributor_acd_agents_path(@automatic_call_distributor)
-    if @acd_agent && !@acd_agent.new_record?
-      add_breadcrumb @acd_agent, automatic_call_distributor_acd_agent_path(@automatic_call_distributor, @acd_agent)
+    if @automatic_call_distributor
+      if @automatic_call_distributor.automatic_call_distributorable.class == User
+        add_breadcrumb t("#{@automatic_call_distributor.automatic_call_distributorable.class.name.underscore.pluralize}.index.page_title"), method( :"tenant_#{@automatic_call_distributor.automatic_call_distributorable.class.name.underscore.pluralize}_path" ).(@automatic_call_distributor.tenant)
+        add_breadcrumb @automatic_call_distributor.automatic_call_distributorable, method( :"tenant_#{@automatic_call_distributor.automatic_call_distributorable.class.name.underscore}_path" ).(@automatic_call_distributor.tenant, @automatic_call_distributor.automatic_call_distributorable)
+      end
+      add_breadcrumb t("automatic_call_distributors.index.page_title"), method( :"#{@automatic_call_distributor.automatic_call_distributorable.class.name.underscore}_automatic_call_distributors_path" ).(@automatic_call_distributor.automatic_call_distributorable)
+      add_breadcrumb @automatic_call_distributor, method( :"#{@automatic_call_distributor.automatic_call_distributorable.class.name.underscore}_automatic_call_distributor_path" ).(@automatic_call_distributor.automatic_call_distributorable, @automatic_call_distributor)
+      add_breadcrumb t("acd_agents.index.page_title"), automatic_call_distributor_acd_agents_path(@automatic_call_distributor)
+      if @acd_agent && !@acd_agent.new_record?
+        add_breadcrumb @acd_agent, automatic_call_distributor_acd_agent_path(@automatic_call_distributor, @acd_agent)
+      end
     end
   end
 end
-- 
cgit v1.2.3


From 6374c0b3e38dfc74eb1b4a5a1fcc5229eacdcaf2 Mon Sep 17 00:00:00 2001
From: Stefan Wintermeyer <stefan.wintermeyer@amooma.de>
Date: Fri, 8 Mar 2013 12:09:17 +0100
Subject: Added SwitchboardEntry scaffold. switchboard has_many
 switchboard_entries

---
 app/controllers/switchboard_entries_controller.rb | 74 +++++++++++++++++++++++
 1 file changed, 74 insertions(+)
 create mode 100644 app/controllers/switchboard_entries_controller.rb

(limited to 'app/controllers')

diff --git a/app/controllers/switchboard_entries_controller.rb b/app/controllers/switchboard_entries_controller.rb
new file mode 100644
index 0000000..ef6c72e
--- /dev/null
+++ b/app/controllers/switchboard_entries_controller.rb
@@ -0,0 +1,74 @@
+class SwitchboardEntriesController < ApplicationController
+  load_and_authorize_resource :switchboard
+  authorize_resource :switchboard_entry, :through => :switchboard, :except => [:sort]
+
+  def index
+    @switchboard_entries = @switchboard.switchboard_entries
+    spread_breadcrumbs
+  end
+
+  def show
+    @switchboard_entry = @switchboard.switchboard_entries.find(params[:id])
+    spread_breadcrumbs
+  end
+
+  def new
+    @switchboard_entry = @switchboard.switchboard_entries.build
+    @sip_accounts = SipAccount.all - @switchboard.sip_accounts
+    spread_breadcrumbs
+  end
+
+  def create
+    @switchboard_entry = @switchboard.switchboard_entries.build(switchboard_entry_params)
+    spread_breadcrumbs
+    if @switchboard_entry.save
+      redirect_to switchboard_switchboard_entries_path(@switchboard), :notice => t('switchboard_entries.controller.successfuly_created')
+    else
+      render :new
+    end
+  end
+
+  def edit
+    @switchboard_entry = @switchboard.switchboard_entries.find(params[:id])
+    @sip_accounts = SipAccount.all - @switchboard.sip_accounts + [@switchboard_entry.sip_account]
+    spread_breadcrumbs
+  end
+
+  def update
+    @switchboard_entry = @switchboard.switchboard_entries.find(params[:id])
+    if @switchboard_entry.update_attributes(switchboard_entry_params)
+      redirect_to [@switchboard, @switchboard_entry], :notice  => t('switchboard_entries.controller.successfuly_updated')
+    else
+      render :edit
+    end
+  end
+
+  def destroy
+    @switchboard_entry = @switchboard.switchboard_entries.find(params[:id])
+    @switchboard_entry.destroy
+    redirect_to switchboard_switchboard_entries_path(@switchboard), :notice => t('switchboard_entries.controller.successfuly_destroyed')
+  end
+
+  def sort
+    params[:switchboard_entry].reverse.each do |id|
+      @switchboard.switchboard_entries.find(id).move_to_top
+    end
+    render nothing: true
+  end
+
+  private
+  def switchboard_entry_params
+    params.require(:switchboard_entry).permit(:name, :sip_account_id)
+  end
+
+  def spread_breadcrumbs
+    add_breadcrumb t("users.index.page_title"), tenant_users_path(@switchboard.user.current_tenant)
+    add_breadcrumb @switchboard.user, tenant_user_path(@switchboard.user.current_tenant, @switchboard.user)
+    add_breadcrumb t("switchboards.index.page_title"), user_switchboards_path(@switchboard.user)
+    add_breadcrumb @switchboard, user_switchboard_path(@switchboard.user, @switchboard)
+    add_breadcrumb t("switchboard_entries.index.page_title"), switchboard_switchboard_entries_path(@switchboard)
+    if @switchboard_entry && !@switchboard_entry.new_record?
+      add_breadcrumb @switchboard_entry, switchboard_switchboard_entries_path(@switchboard, @switchboard_entry)
+    end
+  end   
+end
-- 
cgit v1.2.3


From 473fbe23f29278ac2384b2d3b3fc814dbb5ab9fc Mon Sep 17 00:00:00 2001
From: Peter Kozak <spag@golwen.net>
Date: Sat, 9 Mar 2013 01:26:27 -0500
Subject: sip_account.calls has become an array

---
 app/controllers/calls_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'app/controllers')

diff --git a/app/controllers/calls_controller.rb b/app/controllers/calls_controller.rb
index 9d85a10..6182ad8 100644
--- a/app/controllers/calls_controller.rb
+++ b/app/controllers/calls_controller.rb
@@ -31,7 +31,7 @@ class CallsController < ApplicationController
   end
 
   def create
-    @call = @sip_account.calls.create(params[:call])
+    @call = @sip_account.call_legs.build(params[:call])
 
     if @call && @call.call
       m = method( :"#{@parent.class.name.underscore}_calls_url" )
-- 
cgit v1.2.3


From f0932e38b890b08397020a5994ddde7110d7b8db Mon Sep 17 00:00:00 2001
From: Stefan Wintermeyer <stefan.wintermeyer@amooma.de>
Date: Sun, 10 Mar 2013 10:50:49 +0100
Subject: refactoring

---
 app/controllers/switchboards_controller.rb | 1 +
 1 file changed, 1 insertion(+)

(limited to 'app/controllers')

diff --git a/app/controllers/switchboards_controller.rb b/app/controllers/switchboards_controller.rb
index 8f21d5e..98008c1 100644
--- a/app/controllers/switchboards_controller.rb
+++ b/app/controllers/switchboards_controller.rb
@@ -9,6 +9,7 @@ class SwitchboardsController < ApplicationController
 
   def show
     @switchboard = @user.switchboards.find(params[:id])
+    @switchboard_entries = @switchboard.switchboard_entries
     spread_breadcrumbs
   end
 
-- 
cgit v1.2.3


From beb9e66a5b4e2744435f2c1f301828b68a58c96a Mon Sep 17 00:00:00 2001
From: Stefan Wintermeyer <stefan.wintermeyer@amooma.de>
Date: Sun, 10 Mar 2013 19:11:13 +0100
Subject: Indicate a new voicemail in the navigation bar.

---
 app/controllers/trigger_controller.rb | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'app/controllers')

diff --git a/app/controllers/trigger_controller.rb b/app/controllers/trigger_controller.rb
index 5e836c4..1a5bfca 100644
--- a/app/controllers/trigger_controller.rb
+++ b/app/controllers/trigger_controller.rb
@@ -42,6 +42,10 @@ class TriggerController < ApplicationController
           end
         end
 
+        # 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');")
+
         render(
           :status => 200,
           :layout => false,
-- 
cgit v1.2.3


From 8cbf5e8f740383c56c1c92de85df3421b0e1a5d0 Mon Sep 17 00:00:00 2001
From: Stefan Wintermeyer <stefan.wintermeyer@amooma.de>
Date: Mon, 11 Mar 2013 11:37:27 +0100
Subject: Fax indicator test.

---
 app/controllers/trigger_controller.rb | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'app/controllers')

diff --git a/app/controllers/trigger_controller.rb b/app/controllers/trigger_controller.rb
index 1a5bfca..2e97711 100644
--- a/app/controllers/trigger_controller.rb
+++ b/app/controllers/trigger_controller.rb
@@ -110,6 +110,13 @@ class TriggerController < ApplicationController
       end
        
       if errors.count == 0
+        # 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_indicator').hide.delay(250).show('slow').hide.delay(250).show('slow');")
+        end
+
         render(
           :status => 200,
           :layout => false,
-- 
cgit v1.2.3


From 685b8dc4987965e1450627e831ea40847bb5b19c Mon Sep 17 00:00:00 2001
From: Stefan Wintermeyer <stefan.wintermeyer@amooma.de>
Date: Mon, 11 Mar 2013 11:52:01 +0100
Subject: JavaScript fix

---
 app/controllers/trigger_controller.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'app/controllers')

diff --git a/app/controllers/trigger_controller.rb b/app/controllers/trigger_controller.rb
index 2e97711..7ab90c2 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_indicator').hide('fast').show('slow');")
 
         render(
           :status => 200,
@@ -114,7 +114,7 @@ class TriggerController < ApplicationController
         #
         if fax_document.fax_accountable.class == User
           user = fax_document.fax_accountable
-          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_indicator').hide('fast').show('slow');")
         end
 
         render(
-- 
cgit v1.2.3


From aa46f61cc84043a81f760c961ec53786671e7e50 Mon Sep 17 00:00:00 2001
From: Stefan Wintermeyer <stefan.wintermeyer@amooma.de>
Date: Mon, 11 Mar 2013 12:12:36 +0100
Subject: Moved the voicemail and fax indicator.

---
 app/controllers/trigger_controller.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'app/controllers')

diff --git a/app/controllers/trigger_controller.rb b/app/controllers/trigger_controller.rb
index 7ab90c2..db379f9 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('fast').show('slow');")
+        PrivatePub.publish_to("/users/#{user.id}/messages/new", "$('#new_voicemail_or_fax_indicator').hide('fast').show('slow');")
 
         render(
           :status => 200,
@@ -114,7 +114,7 @@ class TriggerController < ApplicationController
         #
         if fax_document.fax_accountable.class == User
           user = fax_document.fax_accountable
-          PrivatePub.publish_to("/users/#{user.id}/messages/new", "$('#new_voicemail_indicator').hide('fast').show('slow');")
+          PrivatePub.publish_to("/users/#{user.id}/messages/new", "$('#new_voicemail_or_fax_indicator').hide('fast').show('slow');")
         end
 
         render(
-- 
cgit v1.2.3


From 64afdeacb1444b319abfcad6c9a8cfd656fe2dd4 Mon Sep 17 00:00:00 2001
From: Stefan Wintermeyer <stefan.wintermeyer@amooma.de>
Date: Mon, 11 Mar 2013 12:19:57 +0100
Subject: Reload FaxDocument#show when a fax was send.

---
 app/controllers/trigger_controller.rb | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'app/controllers')

diff --git a/app/controllers/trigger_controller.rb b/app/controllers/trigger_controller.rb
index db379f9..0de9223 100644
--- a/app/controllers/trigger_controller.rb
+++ b/app/controllers/trigger_controller.rb
@@ -110,6 +110,10 @@ 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
-- 
cgit v1.2.3


From 525c216dc6c64821d0273dd4a63b9716dc52e715 Mon Sep 17 00:00:00 2001
From: Stefan Wintermeyer <stefan.wintermeyer@amooma.de>
Date: Mon, 11 Mar 2013 13:14:13 +0100
Subject: Bugfix

---
 app/controllers/trigger_controller.rb | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'app/controllers')

diff --git a/app/controllers/trigger_controller.rb b/app/controllers/trigger_controller.rb
index 0de9223..db379f9 100644
--- a/app/controllers/trigger_controller.rb
+++ b/app/controllers/trigger_controller.rb
@@ -110,10 +110,6 @@ 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
-- 
cgit v1.2.3


From f274393cd7e9ed81084661ccefa1a2e53c49b50a Mon Sep 17 00:00:00 2001
From: Stefan Wintermeyer <stefan.wintermeyer@amooma.de>
Date: Mon, 11 Mar 2013 13:46:24 +0100
Subject: Bugfix

---
 app/controllers/trigger_controller.rb | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'app/controllers')

diff --git a/app/controllers/trigger_controller.rb b/app/controllers/trigger_controller.rb
index db379f9..a1bab65 100644
--- a/app/controllers/trigger_controller.rb
+++ b/app/controllers/trigger_controller.rb
@@ -91,6 +91,8 @@ class TriggerController < ApplicationController
           
           if fax_document.save
             Notifications.new_fax(fax_document).deliver
+            @last_fax_document = fax_document
+
             begin
               File.delete(pdf_file)
             rescue => e
@@ -112,8 +114,8 @@ class TriggerController < ApplicationController
       if errors.count == 0
         # Indicate a new fax in the navigation bar.
         #
-        if fax_document.fax_accountable.class == User
-          user = fax_document.fax_accountable
+        if @last_fax_document.fax_account.fax_accountable.class == User
+          user = @last_fax_document.fax_account.fax_accountable
           PrivatePub.publish_to("/users/#{user.id}/messages/new", "$('#new_voicemail_or_fax_indicator').hide('fast').show('slow');")
         end
 
-- 
cgit v1.2.3


From 220e5e76996a4071c9645b3026abfc0592f6af0b Mon Sep 17 00:00:00 2001
From: Stefan Wintermeyer <stefan.wintermeyer@amooma.de>
Date: Mon, 11 Mar 2013 16:47:34 +0100
Subject: Bugfix for #236

---
 app/controllers/trigger_controller.rb | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'app/controllers')

diff --git a/app/controllers/trigger_controller.rb b/app/controllers/trigger_controller.rb
index a1bab65..fb53c37 100644
--- a/app/controllers/trigger_controller.rb
+++ b/app/controllers/trigger_controller.rb
@@ -16,6 +16,10 @@ class TriggerController < ApplicationController
             next
           end
 
+          # Indicate a new voicemail in the navigation bar.
+          #
+          PrivatePub.publish_to("/users/#{user.id}/messages/new", "$('#new_voicemail_or_fax_indicator').hide('fast').show('slow');")
+
           if  user.email.blank?
             next
           end
@@ -42,10 +46,6 @@ class TriggerController < ApplicationController
           end
         end
 
-        # Indicate a new voicemail in the navigation bar.
-        #
-        PrivatePub.publish_to("/users/#{user.id}/messages/new", "$('#new_voicemail_or_fax_indicator').hide('fast').show('slow');")
-
         render(
           :status => 200,
           :layout => false,
-- 
cgit v1.2.3


From 42c2396b485a3eaa0e8bdb995b3777c498b4f94d Mon Sep 17 00:00:00 2001
From: Peter Kozak <spag@golwen.net>
Date: Tue, 12 Mar 2013 04:15:31 -0400
Subject: redirection fixed

---
 app/controllers/conference_invitees_controller.rb | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

(limited to 'app/controllers')

diff --git a/app/controllers/conference_invitees_controller.rb b/app/controllers/conference_invitees_controller.rb
index e891ebc..cbe4790 100644
--- a/app/controllers/conference_invitees_controller.rb
+++ b/app/controllers/conference_invitees_controller.rb
@@ -35,10 +35,7 @@ class ConferenceInviteesController < ApplicationController
     end                            
     
     if @conference_invitee.save
-      # m = method( :"#{@parent_in_route.class.name.underscore}_path" )
-      # redirect_to m.( @parent_in_route ), :notice => t('conference_invitees.controller.successfuly_created', :resource => @conference_invitees)
-      m = method( :"#{@conference_invitee.conference.conferenceable_type.underscore}_conference_path")
-      redirect_to m.( @conference_invitee.conference.conferenceable, @conference_invitee.conference), :notice => t('conference_invitees.controller.successfuly_created', :resource => @conference_invitees)
+      redirect_to conference_conference_invitees_url(@conference), :notice => t('conference_invitees.controller.successfuly_created')
     else
       render :new
     end
@@ -50,7 +47,7 @@ class ConferenceInviteesController < ApplicationController
 
   def update
     if @conference_invitee.update_attributes(params[:conference_invitee])
-      redirect_to @conference_invitee, :notice  => t('conference_invitees.controller.successfuly_updated')
+      redirect_to conference_conference_invitees_url(@conference), :notice  => t('conference_invitees.controller.successfuly_updated')
     else
       render :edit
     end
-- 
cgit v1.2.3


From 28a21a6fce2b46f44e0a08b2d9d3f7b69f6cba9b Mon Sep 17 00:00:00 2001
From: Peter Kozak <spag@golwen.net>
Date: Tue, 12 Mar 2013 04:22:49 -0400
Subject: conference softkey provisioning

---
 app/controllers/config_snom_controller.rb | 25 ++++++++++++++++++++++++-
 1 file changed, 24 insertions(+), 1 deletion(-)

(limited to 'app/controllers')

diff --git a/app/controllers/config_snom_controller.rb b/app/controllers/config_snom_controller.rb
index eb94038..ae58ab8 100644
--- a/app/controllers/config_snom_controller.rb
+++ b/app/controllers/config_snom_controller.rb
@@ -281,7 +281,30 @@ class ConfigSnomController < ApplicationController
             when 'log_in'
               @softkeys.push({:context => sip_account_index, :label => softkey.label, :data => "speed f-li-#{softkey.number}"})
             when 'conference'
-              @softkeys.push({:context => sip_account_index, :label => softkey.label, :data => "blf <sip:#{softkey.number}@#{sip_account.host}>|f-ta-"})
+              conference = softkey.softkeyable
+              if conference.class == Conference
+                @softkeys.push({
+                  :context => sip_account_index,
+                  :function => softkey.softkey_function.name,
+                  :label => softkey.label,
+                  :softkey => softkey,
+                  :general_type => t("softkeys.functions.#{softkey.softkey_function.name}"),
+                  :subscription => {
+                    :to => "sip:conference#{conference.id}@#{sip_account.host}",
+                    :for => "sip:conference#{conference.id}@#{sip_account.host}",
+                  },
+                  :actions => [{
+                    :type => :dial, 
+                    :target => "f-ta-#{softkey.number}",
+                    :when => 'on press',
+                    :states => 'connected,holding',
+                  },{
+                    :type => :dial, 
+                    :target => softkey.number,
+                    :when => 'on press',
+                  }],
+                })
+              end
             when 'parking_stall'
               parking_stall = softkey.softkeyable
               if parking_stall.class == ParkingStall
-- 
cgit v1.2.3


From 3c5a0511d228fb3dc00ae860ade1b8ff032cc42f Mon Sep 17 00:00:00 2001
From: Stefan Wintermeyer <stefan.wintermeyer@amooma.de>
Date: Tue, 12 Mar 2013 11:23:20 +0100
Subject: Refactoring

---
 app/controllers/trigger_controller.rb | 12 ++++++++++++
 1 file changed, 12 insertions(+)

(limited to 'app/controllers')

diff --git a/app/controllers/trigger_controller.rb b/app/controllers/trigger_controller.rb
index fb53c37..e3fc524 100644
--- a/app/controllers/trigger_controller.rb
+++ b/app/controllers/trigger_controller.rb
@@ -63,6 +63,18 @@ class TriggerController < ApplicationController
     end
   end
 
+  def fax_has_been_sent
+    fax_document = FaxDocument.find(params[:id])
+
+    if fax_document
+      # push the partial to the webbrowser
+      #
+      new_html = render_to_string("fax_documents/_fax_document", :layout => false, :locals => {:fax_document => fax_document})
+      PrivatePub.publish_to("/fax_documents/#{fax_document.id}", "$('#fax_document_" + fax_document.id.to_s + "').replaceWith(escape_javascript(" + new_html + "));")
+    end
+
+  end
+
   def fax
     if !params[:fax_account_id].blank?
       fax_account = FaxAccount.where(:id => params[:fax_account_id].to_i).first
-- 
cgit v1.2.3


From d11a8692e742720435c4286e3752c8c136cc88cf Mon Sep 17 00:00:00 2001
From: Stefan Wintermeyer <stefan.wintermeyer@amooma.de>
Date: Tue, 12 Mar 2013 12:32:32 +0100
Subject: jquery replaceWith for FaxDocument#view after sending the fax

---
 app/controllers/trigger_controller.rb | 20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

(limited to 'app/controllers')

diff --git a/app/controllers/trigger_controller.rb b/app/controllers/trigger_controller.rb
index e3fc524..3bd75a1 100644
--- a/app/controllers/trigger_controller.rb
+++ b/app/controllers/trigger_controller.rb
@@ -69,10 +69,24 @@ class TriggerController < ApplicationController
     if fax_document
       # push the partial to the webbrowser
       #
-      new_html = render_to_string("fax_documents/_fax_document", :layout => false, :locals => {:fax_document => fax_document})
-      PrivatePub.publish_to("/fax_documents/#{fax_document.id}", "$('#fax_document_" + fax_document.id.to_s + "').replaceWith(escape_javascript(" + new_html + "));")
+      new_html = ActionController::Base.helpers.escape_javascript(render_to_string("fax_documents/_fax_document", :layout => false, :locals => {:fax_document => fax_document}))
+      Rails.logger.debug new_html
+      PrivatePub.publish_to("/fax_documents/#{fax_document.id}", "$('#" + fax_document.id.to_s + ".fax_document').replaceWith('#{new_html}');")
+    
+      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
 
   def fax
-- 
cgit v1.2.3


From f788a35cd1a70ba08effb3807bbb313744324c85 Mon Sep 17 00:00:00 2001
From: Stefan Wintermeyer <stefan.wintermeyer@amooma.de>
Date: Tue, 12 Mar 2013 13:17:44 +0100
Subject: Add a * to the page title when a new voicemail or fax was received.

---
 app/controllers/trigger_controller.rb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'app/controllers')

diff --git a/app/controllers/trigger_controller.rb b/app/controllers/trigger_controller.rb
index 3bd75a1..df6f39f 100644
--- a/app/controllers/trigger_controller.rb
+++ b/app/controllers/trigger_controller.rb
@@ -19,6 +19,7 @@ class TriggerController < ApplicationController
           # Indicate a new voicemail in the navigation bar.
           #
           PrivatePub.publish_to("/users/#{user.id}/messages/new", "$('#new_voicemail_or_fax_indicator').hide('fast').show('slow');")
+          PrivatePub.publish_to("/users/#{user.id}/messages/new", "document.title = '* ' + document.title.replace( '* ' , '');")
 
           if  user.email.blank?
             next
@@ -70,7 +71,6 @@ class TriggerController < ApplicationController
       # 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}))
-      Rails.logger.debug new_html
       PrivatePub.publish_to("/fax_documents/#{fax_document.id}", "$('#" + fax_document.id.to_s + ".fax_document').replaceWith('#{new_html}');")
     
       render(
@@ -143,6 +143,7 @@ class TriggerController < ApplicationController
         if @last_fax_document.fax_account.fax_accountable.class == User
           user = @last_fax_document.fax_account.fax_accountable
           PrivatePub.publish_to("/users/#{user.id}/messages/new", "$('#new_voicemail_or_fax_indicator').hide('fast').show('slow');")
+          PrivatePub.publish_to("/users/#{user.id}/messages/new", "document.title = '* ' + document.title.replace( '* ' , '');")
         end
 
         render(
-- 
cgit v1.2.3


From 5d3eeec6962010eb0b9cbcb9d3bb87d016bce199 Mon Sep 17 00:00:00 2001
From: Stefan Wintermeyer <stefan.wintermeyer@amooma.de>
Date: Tue, 12 Mar 2013 13:40:18 +0100
Subject: Added sip_account_update trigger

---
 app/controllers/trigger_controller.rb | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

(limited to 'app/controllers')

diff --git a/app/controllers/trigger_controller.rb b/app/controllers/trigger_controller.rb
index df6f39f..3445802 100644
--- a/app/controllers/trigger_controller.rb
+++ b/app/controllers/trigger_controller.rb
@@ -89,6 +89,31 @@ class TriggerController < ApplicationController
     end
   end
 
+  def sip_account_update
+    sip_account = SipAccount.find(params[:id])
+
+    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}');")
+    
+      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  
+
   def fax
     if !params[:fax_account_id].blank?
       fax_account = FaxAccount.where(:id => params[:fax_account_id].to_i).first
-- 
cgit v1.2.3


From 3ca9b0e7af3dd475c4e69512cf49abfef4ddd0aa Mon Sep 17 00:00:00 2001
From: Stefan Wintermeyer <stefan.wintermeyer@amooma.de>
Date: Tue, 12 Mar 2013 14:31:37 +0100
Subject: Replace SwitchboardEntry when the SipAccount gets updated.

---
 app/controllers/trigger_controller.rb | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'app/controllers')

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,
-- 
cgit v1.2.3


From dcdd37036f45d13b7402436ddb1af65c78052ca9 Mon Sep 17 00:00:00 2001
From: Peter Kozak <spag@golwen.net>
Date: Wed, 13 Mar 2013 15:41:17 -0400
Subject: routing test view

---
 app/controllers/call_routes_controller.rb | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'app/controllers')

diff --git a/app/controllers/call_routes_controller.rb b/app/controllers/call_routes_controller.rb
index 2dcd648..50e7849 100644
--- a/app/controllers/call_routes_controller.rb
+++ b/app/controllers/call_routes_controller.rb
@@ -87,6 +87,13 @@ class CallRoutesController < ApplicationController
     end
   end
 
+  def test
+    sip_account = SipAccount.where(:id => params[:sip_account_id]).first;
+    destination_number = params[:destination_number]
+    routing_table = params[:routing_table]
+    @route_test = CallRoute.test_route(routing_table, {'caller.destination_number' => destination_number, 'caller.auth_account_type' => 'SipAccount', 'caller.auth_account_uuid' => sip_account.uuid})
+  end
+
   private
   def call_route_parameter_params
     params.require(:call_route).permit(:routing_table, :name, :endpoint_type, :endpoint_id, :position)
-- 
cgit v1.2.3


From 40d8290361bff123e0b44defa0f199708b89093b Mon Sep 17 00:00:00 2001
From: Stefan Wintermeyer <stefan.wintermeyer@amooma.de>
Date: Thu, 14 Mar 2013 18:34:57 +0100
Subject: Adds a new remote_ip_address methode to figure out the remote IP
 address. #245

---
 app/controllers/application_controller.rb    | 4 ++++
 app/controllers/config_polycom_controller.rb | 4 ++--
 app/controllers/config_siemens_controller.rb | 2 +-
 app/controllers/config_snom_controller.rb    | 4 ++--
 app/controllers/gs_nodes_controller.rb       | 2 +-
 app/controllers/trigger_controller.rb        | 2 +-
 6 files changed, 11 insertions(+), 7 deletions(-)

(limited to 'app/controllers')

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index d1d918e..12bea54 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -110,6 +110,10 @@ class ApplicationController < ActionController::Base
       redirect_to log_in_path, :alert => 'Access denied! You need to login first.'
     end
   end
+
+  def request_remote_ip 
+    request.env['HTTP_X_FORWARDED_FOR'] || request.remote_ip 
+  end
   
   private  
   
diff --git a/app/controllers/config_polycom_controller.rb b/app/controllers/config_polycom_controller.rb
index fd730e3..ca314c2 100644
--- a/app/controllers/config_polycom_controller.rb
+++ b/app/controllers/config_polycom_controller.rb
@@ -67,8 +67,8 @@ class ConfigPolycomController < ApplicationController
 		if ! request.env['HTTP_USER_AGENT'].index('polycom')
 			Rails.logger.info "---> User-Agent indicates not a Polycom phone (#{request.env['HTTP_USER_AGENT'].inspect})"
 		else
-			Rails.logger.info "---> Phone #{@mac_address.inspect}, IP address #{request.remote_ip.inspect}"
-			@phone.update_attributes({ :ip_address => request.remote_ip })
+			Rails.logger.info "---> Phone #{@mac_address.inspect}, IP address #{request_remote_ip.inspect}"
+			@phone.update_attributes({ :ip_address => request_remote_ip })
 		end
 
     xml_applications_url = "#{request.protocol}#{request.host_with_port}/config_polycom/#{@phone.id}/0"
diff --git a/app/controllers/config_siemens_controller.rb b/app/controllers/config_siemens_controller.rb
index 1966d49..7d5eb3f 100644
--- a/app/controllers/config_siemens_controller.rb
+++ b/app/controllers/config_siemens_controller.rb
@@ -146,7 +146,7 @@ class ConfigSiemensController < ApplicationController
     country = 'US'
     language = 'en'
     if ! @phone.nil?
-      @phone.update_attributes(:ip_address => request.remote_ip)
+      @phone.update_attributes(:ip_address => request_remote_ip)
       @sip_account = @phone.sip_accounts.where(:sip_accountable_type => @phone.phoneable_type,
                                      :sip_accountable_id => @phone.phoneable_id).first
 
diff --git a/app/controllers/config_snom_controller.rb b/app/controllers/config_snom_controller.rb
index ae58ab8..8db1d57 100644
--- a/app/controllers/config_snom_controller.rb
+++ b/app/controllers/config_snom_controller.rb
@@ -233,8 +233,8 @@ class ConfigSnomController < ApplicationController
 		if ! request.env['HTTP_USER_AGENT'].index('snom')
 			Rails.logger.info "---> User-Agent indicates not a Snom phone (#{request.env['HTTP_USER_AGENT'].inspect})"
 		else
-			Rails.logger.info "---> Phone #{@mac_address.inspect}, IP address #{request.remote_ip.inspect}"
-			@phone.update_attributes({ :ip_address => request.remote_ip })
+			Rails.logger.info "---> Phone #{@mac_address.inspect}, IP address #{request_remote_ip.inspect}"
+			@phone.update_attributes({ :ip_address => request_remote_ip })
 		end
 
     @softkeys = Array.new()
diff --git a/app/controllers/gs_nodes_controller.rb b/app/controllers/gs_nodes_controller.rb
index 17c9e8b..6a5e0a6 100644
--- a/app/controllers/gs_nodes_controller.rb
+++ b/app/controllers/gs_nodes_controller.rb
@@ -48,7 +48,7 @@ class GsNodesController < ApplicationController
   end
 
   def sync
-    if !GsNode.where(:ip_address => request.remote_ip).first
+    if !GsNode.where(:ip_address => request_remote_ip).first
       render(
         :status => 404,
         :layout => false,
diff --git a/app/controllers/trigger_controller.rb b/app/controllers/trigger_controller.rb
index b8db4c9..623ea94 100644
--- a/app/controllers/trigger_controller.rb
+++ b/app/controllers/trigger_controller.rb
@@ -97,7 +97,7 @@ class TriggerController < ApplicationController
       #
       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}');")
+        PrivatePub.publish_to("/switchboards/#{switchboard_entry.switchboard.id}", "$('#switchboard_entry_id_" + switchboard_entry.id.to_s + "').replaceWith('#{new_html}');")
       end
     
       render(
-- 
cgit v1.2.3


From f476fb7648fd235642233b2bbe5bb90cb57e8549 Mon Sep 17 00:00:00 2001
From: Stefan Wintermeyer <stefan.wintermeyer@amooma.de>
Date: Thu, 14 Mar 2013 18:57:24 +0100
Subject: Bugfix

---
 app/controllers/trigger_controller.rb | 25 +++++++++----------------
 1 file changed, 9 insertions(+), 16 deletions(-)

(limited to 'app/controllers')

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
-- 
cgit v1.2.3


From 3a0ea10cdd6084a8beb235f5c1573c22a5d733f0 Mon Sep 17 00:00:00 2001
From: Stefan Wintermeyer <stefan.wintermeyer@amooma.de>
Date: Thu, 14 Mar 2013 20:21:59 +0100
Subject: Added a dashboard for Switchboard.

---
 app/controllers/trigger_controller.rb | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

(limited to 'app/controllers')

diff --git a/app/controllers/trigger_controller.rb b/app/controllers/trigger_controller.rb
index 0c635b9..fc0556b 100644
--- a/app/controllers/trigger_controller.rb
+++ b/app/controllers/trigger_controller.rb
@@ -92,15 +92,18 @@ class TriggerController < ApplicationController
   def sip_account_update
     sip_account = SipAccount.find(params[:id])
 
-    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    
+    # 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|
+      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,
-- 
cgit v1.2.3


From 0b4e3dfd031b21c26f7bc9c7c05cd931950ecbd6 Mon Sep 17 00:00:00 2001
From: Stefan Wintermeyer <stefan.wintermeyer@amooma.de>
Date: Thu, 14 Mar 2013 21:34:06 +0100
Subject: Switchboard stuff

---
 app/controllers/trigger_controller.rb | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'app/controllers')

diff --git a/app/controllers/trigger_controller.rb b/app/controllers/trigger_controller.rb
index fc0556b..a858e33 100644
--- a/app/controllers/trigger_controller.rb
+++ b/app/controllers/trigger_controller.rb
@@ -100,8 +100,11 @@ class TriggerController < ApplicationController
     end
 
     Switchboard.all.each do |switchboard|
-      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}');")
+      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
     end
 
     render(
-- 
cgit v1.2.3


From baf86f285be7c02535c3bc1cd25bf8c69b3b2051 Mon Sep 17 00:00:00 2001
From: Peter Kozak <spag@golwen.net>
Date: Fri, 15 Mar 2013 06:02:44 -0400
Subject: Germans are serious about call progress tones

---
 app/controllers/gemeinschaft_setups_controller.rb | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'app/controllers')

diff --git a/app/controllers/gemeinschaft_setups_controller.rb b/app/controllers/gemeinschaft_setups_controller.rb
index a62df99..4949fa7 100644
--- a/app/controllers/gemeinschaft_setups_controller.rb
+++ b/app/controllers/gemeinschaft_setups_controller.rb
@@ -62,6 +62,11 @@ class GemeinschaftSetupsController < ApplicationController
       GsParameter.where(:name => 'ringtone_url').first.update_attributes(:value => "http://#{@gemeinschaft_setup.sip_domain.host}")
       GsParameter.where(:name => 'user_image_url').first.update_attributes(:value => "http://#{@gemeinschaft_setup.sip_domain.host}/uploads/user/image")
 
+      # Set ringback_tone
+      if @gemeinschaft_setup.country.country_code.to_s == '49'
+        GsParameter.where(:entity => 'dialplan', :section => 'variables', :name => 'ringback').first.update_attributes(:value => '%(1000,4000,425.0)')
+      end
+
       # Restart FreeSWITCH
       if Rails.env.production?
         require 'freeswitch_event'
-- 
cgit v1.2.3


From 5fdcf4e66f1b9d926ace0ab4a78db177b7487ad6 Mon Sep 17 00:00:00 2001
From: Peter Kozak <spag@golwen.net>
Date: Fri, 15 Mar 2013 08:43:29 -0400
Subject: test action

---
 app/controllers/call_routes_controller.rb | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

(limited to 'app/controllers')

diff --git a/app/controllers/call_routes_controller.rb b/app/controllers/call_routes_controller.rb
index 50e7849..819b593 100644
--- a/app/controllers/call_routes_controller.rb
+++ b/app/controllers/call_routes_controller.rb
@@ -88,10 +88,17 @@ class CallRoutesController < ApplicationController
   end
 
   def test
-    sip_account = SipAccount.where(:id => params[:sip_account_id]).first;
-    destination_number = params[:destination_number]
-    routing_table = params[:routing_table]
-    @route_test = CallRoute.test_route(routing_table, {'caller.destination_number' => destination_number, 'caller.auth_account_type' => 'SipAccount', 'caller.auth_account_uuid' => sip_account.uuid})
+    if !params[:sip_account_id].blank?
+      account = SipAccount.where(:id => params[:sip_account_id]).first
+    elsif !params[:hunt_group_id].blank?
+      account = HuntGroup.where(:id => params[:hunt_group_id]).first
+    end
+
+    if account
+      destination_number = params[:destination_number]
+      routing_table = params[:routing_table]
+      @route_test = CallRoute.test_route(routing_table, {'caller.destination_number' => destination_number, 'caller.auth_account_type' => account.class.name, 'caller.auth_account_id' => account.id, 'caller.auth_account_uuid' => account.try(:uuid)})
+    end
   end
 
   private
-- 
cgit v1.2.3


From 87655b8f02c5cdefc44abbacea8e60deefaf77c4 Mon Sep 17 00:00:00 2001
From: Peter Kozak <spag@golwen.net>
Date: Sun, 17 Mar 2013 02:08:18 -0400
Subject: set caller account

---
 app/controllers/call_routes_controller.rb | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

(limited to 'app/controllers')

diff --git a/app/controllers/call_routes_controller.rb b/app/controllers/call_routes_controller.rb
index 819b593..e5cf56a 100644
--- a/app/controllers/call_routes_controller.rb
+++ b/app/controllers/call_routes_controller.rb
@@ -97,7 +97,15 @@ class CallRoutesController < ApplicationController
     if account
       destination_number = params[:destination_number]
       routing_table = params[:routing_table]
-      @route_test = CallRoute.test_route(routing_table, {'caller.destination_number' => destination_number, 'caller.auth_account_type' => account.class.name, 'caller.auth_account_id' => account.id, 'caller.auth_account_uuid' => account.try(:uuid)})
+      @route_test = CallRoute.test_route(routing_table, {
+        'caller.destination_number' => destination_number,
+        'caller.auth_account_type' => account.class.name, 
+        'caller.auth_account_id' => account.id, 
+        'caller.auth_account_uuid' => account.try(:uuid),
+        'caller.account_type' => account.class.name, 
+        'caller.account_id' => account.id, 
+        'caller.account_uuid' => account.try(:uuid),
+      })
     end
   end
 
-- 
cgit v1.2.3


From 0ed2894ca7371199788c202b61f53a3f73c4b03b Mon Sep 17 00:00:00 2001
From: Stefan Wintermeyer <stefan.wintermeyer@amooma.de>
Date: Sun, 17 Mar 2013 12:44:33 +0100
Subject: Reduce the push load.

---
 app/controllers/trigger_controller.rb | 29 ++++++++++++++++++-----------
 1 file changed, 18 insertions(+), 11 deletions(-)

(limited to 'app/controllers')

diff --git a/app/controllers/trigger_controller.rb b/app/controllers/trigger_controller.rb
index a858e33..6b58d6a 100644
--- a/app/controllers/trigger_controller.rb
+++ b/app/controllers/trigger_controller.rb
@@ -92,19 +92,26 @@ class TriggerController < ApplicationController
   def sip_account_update
     sip_account = SipAccount.find(params[:id])
 
-    # 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
+    if sip_account.updated_at < Time.now
 
-    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}');")
+      # Push an update to sip_account.switchboard_entries
+      #
+      sip_account.switchboard_entries.each do |switchboard_entry|
+        escaped_switchboard_entry_partial = 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('#{escaped_switchboard_entry_partial}');")
       end
+
+      # Push an update to the needed switchboards
+      #
+      Switchboard.where(:user_id => sip_account.sip_accountable.id).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?
+          escaped_switchboard_partial = 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('#{escaped_switchboard_partial}');")
+        end
+      end
+
+      sip_account.touch
     end
 
     render(
-- 
cgit v1.2.3


From 7cd62ec6d7e40da2d1882d3ec056dae40c2f7b80 Mon Sep 17 00:00:00 2001
From: Peter Kozak <spag@golwen.net>
Date: Mon, 18 Mar 2013 04:44:37 -0400
Subject: callto: url added

---
 app/controllers/sip_accounts_controller.rb | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'app/controllers')

diff --git a/app/controllers/sip_accounts_controller.rb b/app/controllers/sip_accounts_controller.rb
index b34172d..0d7cbfe 100644
--- a/app/controllers/sip_accounts_controller.rb
+++ b/app/controllers/sip_accounts_controller.rb
@@ -10,7 +10,10 @@ class SipAccountsController < ApplicationController
   end
 
   def show
-    @register_tel_protocol = "#{request.protocol}#{request.host_with_port}/sip_accounts/#{@sip_account.try(:id)}/calls/new?url=%s"
+    @register_protocols = {
+      :tel    => "#{request.protocol}#{request.host_with_port}/sip_accounts/#{@sip_account.try(:id)}/calls/new?url=%s",
+      :callto => "#{request.protocol}#{request.host_with_port}/sip_accounts/#{@sip_account.try(:id)}/calls/new?url=%s",
+    }
   end
 
   def new
-- 
cgit v1.2.3


From 49549c7053700fb5444a2ae0835f879626d574cc Mon Sep 17 00:00:00 2001
From: Peter Kozak <spag@golwen.net>
Date: Wed, 20 Mar 2013 12:19:03 +0100
Subject: possible_call_forwards fixed

---
 app/controllers/softkeys_controller.rb | 18 ++++--------------
 1 file changed, 4 insertions(+), 14 deletions(-)

(limited to 'app/controllers')

diff --git a/app/controllers/softkeys_controller.rb b/app/controllers/softkeys_controller.rb
index 6727de1..adb0e10 100644
--- a/app/controllers/softkeys_controller.rb
+++ b/app/controllers/softkeys_controller.rb
@@ -13,8 +13,6 @@ class SoftkeysController < ApplicationController
 
   def new
     @softkey = @sip_account.softkeys.build
-
-    delete_call_forward_softkey_if_no_callforward_is_available
   end
 
   def create
@@ -27,15 +25,12 @@ class SoftkeysController < ApplicationController
   end
 
   def edit
-    delete_call_forward_softkey_if_no_callforward_is_available
   end
 
   def update
     if @softkey.update_attributes(params[:softkey])
       redirect_to sip_account_softkey_path(@softkey.sip_account, @softkey), :notice  => t('softkeys.controller.successfuly_updated')
     else
-      delete_call_forward_softkey_if_no_callforward_is_available
-      
       render :edit
     end
   end
@@ -57,10 +52,13 @@ class SoftkeysController < ApplicationController
 
   private
   def set_available_softkey_functions
+    @possible_call_forwards = @softkey.possible_call_forwards
     @softkey_functions = []
     SoftkeyFunction.accessible_by(current_ability, :read).each do |softkey_function|
       if GuiFunction.display?("softkey_function_#{softkey_function.name.downcase}_field_in_softkey_form", current_user)
-        @softkey_functions << softkey_function
+        if softkey_function.name != 'call_forwarding' or @possible_call_forwards.count > 0
+          @softkey_functions << softkey_function
+        end
       end
     end
   end
@@ -78,12 +76,4 @@ class SoftkeysController < ApplicationController
       add_breadcrumb t('softkeys.index.page_title'), sip_account_softkeys_path(@sip_account) 
     end
   end
-
-  def delete_call_forward_softkey_if_no_callforward_is_available
-    # Don't display the call_forward option if there aren't any call_forwards to choose from.
-    #
-    if @softkey.sip_account.phone_numbers.map{|phone_number| phone_number.call_forwards}.flatten.count == 0
-      @softkey_functions.delete_if { |softkey_function| softkey_function == SoftkeyFunction.find_by_name('call_forwarding') }
-    end
-  end
 end
-- 
cgit v1.2.3


From 68a4b0e40586aa6d11599b68b81e7e9c7f623f71 Mon Sep 17 00:00:00 2001
From: Peter Kozak <spag@golwen.net>
Date: Thu, 21 Mar 2013 12:00:22 +0100
Subject: destroy action redirect fixed

---
 app/controllers/sip_accounts_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'app/controllers')

diff --git a/app/controllers/sip_accounts_controller.rb b/app/controllers/sip_accounts_controller.rb
index 0d7cbfe..0d34109 100644
--- a/app/controllers/sip_accounts_controller.rb
+++ b/app/controllers/sip_accounts_controller.rb
@@ -75,7 +75,7 @@ class SipAccountsController < ApplicationController
   def destroy
     @sip_account.destroy
     m = method( :"#{@parent.class.name.underscore}_sip_accounts_url" )
-    redirect_to :root, :notice => t('sip_accounts.controller.successfuly_destroyed')
+    redirect_to m.(@parent), :notice => t('sip_accounts.controller.successfuly_destroyed')
   end
 
   private
-- 
cgit v1.2.3


From 61c91cccb00bbc04049d102150929874fc1a08e5 Mon Sep 17 00:00:00 2001
From: Peter Kozak <spag@golwen.net>
Date: Thu, 21 Mar 2013 12:47:26 +0100
Subject: breadcrumbs

---
 app/controllers/ringtones_controller.rb | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

(limited to 'app/controllers')

diff --git a/app/controllers/ringtones_controller.rb b/app/controllers/ringtones_controller.rb
index e5a4f64..9dd253f 100644
--- a/app/controllers/ringtones_controller.rb
+++ b/app/controllers/ringtones_controller.rb
@@ -49,7 +49,18 @@ class RingtonesController < ApplicationController
   end
 
   def spread_breadcrumbs
-    if @parent.class == PhoneNumber && @parent.phone_numberable.class == SipAccount
+    if @parent.class == SipAccount
+      if @sip_account.sip_accountable.class == User
+        add_breadcrumb t("#{@sip_account.sip_accountable.class.name.underscore.pluralize}.index.page_title"), method( :"tenant_#{@sip_account.sip_accountable.class.name.underscore.pluralize}_path" ).(@sip_account.tenant)
+        add_breadcrumb @sip_account.sip_accountable, method( :"tenant_#{@sip_account.sip_accountable.class.name.underscore}_path" ).(@sip_account.tenant, @sip_account.sip_accountable)
+      end
+      add_breadcrumb t("sip_accounts.index.page_title"), method( :"#{@sip_account.sip_accountable.class.name.underscore}_sip_accounts_path" ).(@sip_account.sip_accountable)
+      add_breadcrumb @sip_account, method( :"#{@sip_account.sip_accountable.class.name.underscore}_sip_account_path" ).(@sip_account.sip_accountable, @sip_account)
+      add_breadcrumb t("ringtones.index.page_title"), sip_account_ringtones_path(@sip_account)
+      if @ringtone && !@ringtone.new_record?
+        add_breadcrumb @ringtone
+      end
+    elsif @parent.class == PhoneNumber
       @sip_account = @parent.phone_numberable
       if @sip_account.sip_accountable.class == User
         add_breadcrumb t("#{@sip_account.sip_accountable.class.name.underscore.pluralize}.index.page_title"), method( :"tenant_#{@sip_account.sip_accountable.class.name.underscore.pluralize}_path" ).(@sip_account.tenant)
@@ -61,7 +72,7 @@ class RingtonesController < ApplicationController
       add_breadcrumb @phone_number, sip_account_phone_number_path(@sip_account, @phone_number)
       add_breadcrumb t("ringtones.index.page_title"), phone_number_ringtones_path(@phone_number)
       if @ringtone && !@ringtone.new_record?
-        add_breadcrumb @ringtone, phone_number_ringtone_path(@phone_number, @ringtone)
+        add_breadcrumb @ringtone
       end
     end
   end
-- 
cgit v1.2.3


From 1e43dc850a3b8bfb9a2df59e2575094baf5c9426 Mon Sep 17 00:00:00 2001
From: Peter Kozak <spag@golwen.net>
Date: Thu, 21 Mar 2013 12:57:04 +0100
Subject: breadcrumbs

---
 app/controllers/ringtones_controller.rb | 36 ++++++++++++++++++++++-----------
 1 file changed, 24 insertions(+), 12 deletions(-)

(limited to 'app/controllers')

diff --git a/app/controllers/ringtones_controller.rb b/app/controllers/ringtones_controller.rb
index 9dd253f..96e9c6d 100644
--- a/app/controllers/ringtones_controller.rb
+++ b/app/controllers/ringtones_controller.rb
@@ -61,18 +61,30 @@ class RingtonesController < ApplicationController
         add_breadcrumb @ringtone
       end
     elsif @parent.class == PhoneNumber
-      @sip_account = @parent.phone_numberable
-      if @sip_account.sip_accountable.class == User
-        add_breadcrumb t("#{@sip_account.sip_accountable.class.name.underscore.pluralize}.index.page_title"), method( :"tenant_#{@sip_account.sip_accountable.class.name.underscore.pluralize}_path" ).(@sip_account.tenant)
-        add_breadcrumb @sip_account.sip_accountable, method( :"tenant_#{@sip_account.sip_accountable.class.name.underscore}_path" ).(@sip_account.tenant, @sip_account.sip_accountable)
-      end
-      add_breadcrumb t("sip_accounts.index.page_title"), method( :"#{@sip_account.sip_accountable.class.name.underscore}_sip_accounts_path" ).(@sip_account.sip_accountable)
-      add_breadcrumb @sip_account, method( :"#{@sip_account.sip_accountable.class.name.underscore}_sip_account_path" ).(@sip_account.sip_accountable, @sip_account)
-      add_breadcrumb t("phone_numbers.index.page_title"), sip_account_phone_numbers_path(@sip_account)
-      add_breadcrumb @phone_number, sip_account_phone_number_path(@sip_account, @phone_number)
-      add_breadcrumb t("ringtones.index.page_title"), phone_number_ringtones_path(@phone_number)
-      if @ringtone && !@ringtone.new_record?
-        add_breadcrumb @ringtone
+      if @parent.phone_numberable.class == SipAccount
+        @sip_account = @parent.phone_numberable
+        if @sip_account.sip_accountable.class == User
+          add_breadcrumb t("#{@sip_account.sip_accountable.class.name.underscore.pluralize}.index.page_title"), method( :"tenant_#{@sip_account.sip_accountable.class.name.underscore.pluralize}_path" ).(@sip_account.tenant)
+          add_breadcrumb @sip_account.sip_accountable, method( :"tenant_#{@sip_account.sip_accountable.class.name.underscore}_path" ).(@sip_account.tenant, @sip_account.sip_accountable)
+        end
+        add_breadcrumb t("sip_accounts.index.page_title"), method( :"#{@sip_account.sip_accountable.class.name.underscore}_sip_accounts_path" ).(@sip_account.sip_accountable)
+        add_breadcrumb @sip_account, method( :"#{@sip_account.sip_accountable.class.name.underscore}_sip_account_path" ).(@sip_account.sip_accountable, @sip_account)
+        add_breadcrumb t("phone_numbers.index.page_title"), sip_account_phone_numbers_path(@sip_account)
+        add_breadcrumb @phone_number, sip_account_phone_number_path(@sip_account, @phone_number)
+        add_breadcrumb t("ringtones.index.page_title"), phone_number_ringtones_path(@phone_number)
+        if @ringtone && !@ringtone.new_record?
+          add_breadcrumb @ringtone
+        end
+      elsif @parent.phone_numberable.class == HuntGroup
+        @hunt_group = @parent.phone_numberable
+        add_breadcrumb t("hunt_groups.index.page_title"), method( :"#{@hunt_group.tenant.class.name.underscore}_hunt_groups_path" ).(@hunt_group.tenant)
+        add_breadcrumb @hunt_group, method( :"#{@hunt_group.tenant.class.name.underscore}_hunt_group_path" ).(@hunt_group.tenant, @hunt_group)
+        add_breadcrumb t("phone_numbers.index.page_title"), hunt_group_phone_numbers_path(@hunt_group)
+        add_breadcrumb @phone_number, hunt_group_phone_number_path(@hunt_group, @phone_number)
+        add_breadcrumb t("ringtones.index.page_title"), phone_number_ringtones_path(@phone_number)
+        if @ringtone && !@ringtone.new_record?
+          add_breadcrumb @ringtone
+        end
       end
     end
   end
-- 
cgit v1.2.3


From fc406e45e4a5ce26e0117ff94e632522fcfa066b Mon Sep 17 00:00:00 2001
From: Peter Kozak <spag@golwen.net>
Date: Sun, 24 Mar 2013 07:32:26 +0100
Subject: use call_legs to initiate call

---
 app/controllers/calls_controller.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'app/controllers')

diff --git a/app/controllers/calls_controller.rb b/app/controllers/calls_controller.rb
index 6182ad8..ae0093c 100644
--- a/app/controllers/calls_controller.rb
+++ b/app/controllers/calls_controller.rb
@@ -17,11 +17,11 @@ class CallsController < ApplicationController
     if !params[:url].blank?
       protocol, separator, phone_number = params[:url].partition(':')
       if ! phone_number.blank? 
-        @call = @parent.calls.new()
+        @call = @parent.call_legs.new()
         @call.destination = phone_number
       end
     elsif !params[:number].blank?
-      @call = @parent.calls.new()
+      @call = @parent.call_legs.new()
       @call.destination = params[:number]
     end
   end
-- 
cgit v1.2.3