Merge branch 'develop'5.1-beta5

1 files changed, 27 insertions, 24 deletions

diff --git a/app/controllers/config_snom_controller.rb b/app/controllers/config_snom_controller.rb
index 58cced2..76fa633 100644
--- a/app/controllers/config_snom_controller.rb
+++ b/app/controllers/config_snom_controller.rb
@@ -282,28 +282,31 @@ class ConfigSnomController < ApplicationController
               @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-"})
-            when 'call_parking'
-              @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 => "park+#{@softkeys.softkeyable_id}@#{sip_account.host}",
-                  :for => "#{sip_account.auth_name}@#{sip_account.host}"
-                },
-                :actions => [{
-                  :type => :dial, 
-                  :target => "f-tpark-#{@softkeys.softkeyable_id}",
-                  :when => 'on press',
-                  :states => 'connected,holding',
-                },{
-                  :type => :dial, 
-                  :target => "f-park-#{@softkeys.softkeyable_id}",
-                  :when => 'on press',
-                }],
-              })
+            when 'parking_stall'
+              parking_stall = softkey.softkeyable
+              if parking_stall.class == ParkingStall
+                @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:park+#{parking_stall.name}@#{sip_account.host}",
+                    :for => "sip:park+#{parking_stall.name}@#{sip_account.host}",
+                  },
+                  :actions => [{
+                    :type => :dial, 
+                    :target => "f-cpa-#{parking_stall.name}",
+                    :when => 'on press',
+                    :states => 'connected,holding',
+                  },{
+                    :type => :dial, 
+                    :target => "f-cpa-#{parking_stall.name}",
+                    :when => 'on press',
+                  }],
+                })
+              end
             when 'call_forwarding'
               if softkey.softkeyable.class == CallForward then
                 @softkeys.push({
@@ -313,8 +316,8 @@ class ConfigSnomController < ApplicationController
                   :softkey => softkey,
                   :general_type => t("softkeys.functions.#{softkey.softkey_function.name}"),
                   :subscription => {
-                    :to => "f-cftg-#{softkey.softkeyable_id}@#{sip_account.host}",
-                    :for => "#{sip_account.auth_name}@#{sip_account.host}"
+                    :to => "sip:f-cftg-#{softkey.softkeyable_id}@#{sip_account.host}",
+                    :for => "sip:f-cftg-#{softkey.softkeyable_id}@#{sip_account.host}"
                   },
                   :actions => [{
                     :type => :url,