summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorspag <spag@golwen.net>2013-02-14 14:46:35 +0100
committerspag <spag@golwen.net>2013-02-14 14:46:35 +0100
commit124a421b19e08447fa790b65cc969dadd7408539 (patch)
tree8320d8e6a13c18f253188082f2846198f610b3df /app
parent41303b0a2a07b897f7373eebba25708da89085a1 (diff)
fixed subscriptions on newer phone firmware versions
Diffstat (limited to 'app')
-rw-r--r--app/controllers/config_snom_controller.rb8
-rw-r--r--app/views/config_snom/show.xml.haml21
2 files changed, 23 insertions, 6 deletions
diff --git a/app/controllers/config_snom_controller.rb b/app/controllers/config_snom_controller.rb
index d36f990..76fa633 100644
--- a/app/controllers/config_snom_controller.rb
+++ b/app/controllers/config_snom_controller.rb
@@ -292,8 +292,8 @@ class ConfigSnomController < ApplicationController
:softkey => softkey,
:general_type => t("softkeys.functions.#{softkey.softkey_function.name}"),
:subscription => {
- :to => "park+#{parking_stall.name}@#{sip_account.host}",
- :for => "#{sip_account.auth_name}@#{sip_account.host}"
+ :to => "sip:park+#{parking_stall.name}@#{sip_account.host}",
+ :for => "sip:park+#{parking_stall.name}@#{sip_account.host}",
},
:actions => [{
:type => :dial,
@@ -316,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,
diff --git a/app/views/config_snom/show.xml.haml b/app/views/config_snom/show.xml.haml
index 1102ad1..3d0edf1 100644
--- a/app/views/config_snom/show.xml.haml
+++ b/app/views/config_snom/show.xml.haml
@@ -90,6 +90,23 @@
%backlight_idle{:perm => 'RW'}= '0'
%dim_timer{:perm => 'RW'}= '300'
+ / LED
+ %led_on{:perm => 'RW'}= 'ON BUSY IN_A_CALL CALLING IN_A_MEETING URGENT_INTERRUPTIONS_ONLY HOLDING DND ACTIVE INACTIVE BE_RIGHT_BACK AWAY UNAVAILABLE AVAILABLE PhoneHasCall CurrentIdentityHasVoiceMessages PhoneHasVoiceMessages'
+ %led_blink_slow{:perm => 'RW'}= 'PARKED HOLDING_BOSSADMIN Wrap-Up'
+ %led_blink_medium{:perm => 'RW'}= ''
+ %led_blink_fast{:perm => 'RW'}= 'RINGING PhoneHasCallInStateRinging'
+ %led_blink_short_off{:perm => 'RW'}= 'PhoneHasMissedCalls'
+ %led_red{:perm => 'RW'}= 'BUSY IN_A_CALL CALLING IN_A_MEETING URGENT_INTERRUPTIONS_ONLY HOLDING DND'
+ %led_green{:perm => 'RW'}= 'Wrap-Up'
+ %led_orange{:perm => 'RW'}= 'AWAY INACTIVE BE_RIGHT_BACK INACTIVE'
+ %led_blue{:perm => 'RW'}= ''
+ %led_red_green{:perm => 'RW'}= ''
+ %led_red_orange{:perm => 'RW'}= ''
+ %led_green_orange{:perm => 'RW'}= ''
+ %led_call_indicator_usage{:perm => 'RW'}= 'PhoneHasCallInStateRinging PhoneHasCall PhoneHasMissedCalls'
+ %led_message_usage{:perm => 'RW'}= 'CurrentIdentityHasVoiceMessages PhoneHasVoiceMessages'
+
+
- if @phone.phone_model.name == 'Snom 870'
/ Snom 870 idle icons
%idle_icon_01{:perm => 'RW'}= '9'
@@ -165,9 +182,9 @@
- if softkey[:subscription]
%subscription{:type => 'dialog', :to => softkey[:subscription][:to], :for => softkey[:subscription][:for]}
%NotifyParsingRules{:type => 'applies'}
- %level1{:translates_to => 'OK'}= "/dialog-info[@entity=\"sip:#{softkey[:subscription][:to]}\"]"
+ %level1{:translates_to => 'OK'}= "/dialog-info[@entity=\"#{softkey[:subscription][:to]}\"]"
%NotifyParsingRules{:type => 'state'}
- %level1{:translates_to => 'available'}= '/dialog-info/dialog/state[.="terminated"]'
+ %level1{:translates_to => 'unknown'}= '/dialog-info/dialog/state[.="terminated"]'
%level2{:translates_to => 'ringing'}= '/dialog-info/dialog/state[.="early"]'
%level3{:translates_to => 'active'}= '/dialog-info/dialog/state[.="confirmed"]'
%level4{:fetch_content => 'true'}= '/dialog-info/dialog/state'