diff options
-rw-r--r-- | app/controllers/sip_accounts_controller.rb | 1 | ||||
-rw-r--r-- | app/views/config_snom/show.xml.haml | 1 | ||||
-rw-r--r-- | misc/freeswitch/scripts/dialplan/voicemail.lua | 5 |
3 files changed, 6 insertions, 1 deletions
diff --git a/app/controllers/sip_accounts_controller.rb b/app/controllers/sip_accounts_controller.rb index cd34953..3dc5a54 100644 --- a/app/controllers/sip_accounts_controller.rb +++ b/app/controllers/sip_accounts_controller.rb @@ -85,6 +85,7 @@ class SipAccountsController < ApplicationController m = method( :"#{@parent.class.name.underscore}_sip_account_path" ) redirect_to m.( @parent, @sip_account ), :notice => t('sip_accounts.controller.successfuly_updated') else + possible_voicemail_accounts render :edit end end diff --git a/app/views/config_snom/show.xml.haml b/app/views/config_snom/show.xml.haml index 22df8bc..8b501ab 100644 --- a/app/views/config_snom/show.xml.haml +++ b/app/views/config_snom/show.xml.haml @@ -37,6 +37,7 @@ %display_method{:perm => 'RW'}= 'display_name_number' %callpickup_dialoginfo{:perm => 'RW'}= 'on' %pickup_indication{:perm => 'RW'}= 'off' + %auto_connect_indication{:perm => 'RW'}= 'off' %show_local_line{:perm => 'RW'}= 'off' %mwi_notification{:perm => 'RW'}= 'silent' %mwi_dialtone{:perm => 'RW'}= 'normal' diff --git a/misc/freeswitch/scripts/dialplan/voicemail.lua b/misc/freeswitch/scripts/dialplan/voicemail.lua index 3358d2b..f436720 100644 --- a/misc/freeswitch/scripts/dialplan/voicemail.lua +++ b/misc/freeswitch/scripts/dialplan/voicemail.lua @@ -349,7 +349,10 @@ function Voicemail.leave(self, caller, greeting, number) end os.remove(record_file_name); caller:send_display('Goodbye'); - caller.session:sayPhrase('voicemail_goodbye'); + + if common.str.blank(greeting_file) then + caller.session:sayPhrase('voicemail_goodbye'); + end end |