diff options
| author | Stefan Wintermeyer <stefan.wintermeyer@amooma.de> | 2013-01-05 23:10:07 +0100 |
|---|---|---|
| committer | Stefan Wintermeyer <stefan.wintermeyer@amooma.de> | 2013-01-05 23:10:07 +0100 |
| commit | 3862734b5e0833ed108300102c68159e40ffd93a (patch) | |
| tree | 4491044dbf48aea515303382e7664cf9be2cb182 /app/views/config_snom | |
| parent | 380a4cdfe5cfa573fb916ca7c2145a6062ef8198 (diff) | |
| parent | 57196d838691aeba38ad7e088e83c0881a213861 (diff) | |
Merge branch 'replace_constants' into develop
Diffstat (limited to 'app/views/config_snom')
| -rw-r--r-- | app/views/config_snom/show.xml.haml | 4 | ||||
| -rw-r--r-- | app/views/config_snom/state_settings.xml.haml | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/app/views/config_snom/show.xml.haml b/app/views/config_snom/show.xml.haml index a11715d..5f53802 100644 --- a/app/views/config_snom/show.xml.haml +++ b/app/views/config_snom/show.xml.haml @@ -48,8 +48,8 @@ %use_proxy_number_guessing{:perm => 'RW'}= 'off' %guess_number{:perm => 'RW'}= 'off' %guess_start_length{:perm => 'RW'}= '3' - %ieee8021x_eap_md5_username{:perm => 'RW'}= PROVISIONING_IEEE8021X_EAP_USERNAME - %ieee8021x_eap_md5_password{:perm => 'RW'}= PROVISIONING_IEEE8021X_EAP_PASSWORD + %ieee8021x_eap_md5_username{:perm => 'RW'}= GsParameter.get('PROVISIONING_IEEE8021X_EAP_USERNAME') + %ieee8021x_eap_md5_password{:perm => 'RW'}= GsParameter.get('PROVISIONING_IEEE8021X_EAP_PASSWORD') - 0.upto(9) do |ringer_idx| %internal_ringer_text{:idx => ringer_idx, :perm => 'RW'}= "Ringer#{(ringer_idx+1)}" diff --git a/app/views/config_snom/state_settings.xml.haml b/app/views/config_snom/state_settings.xml.haml index ac0e872..6be1efc 100644 --- a/app/views/config_snom/state_settings.xml.haml +++ b/app/views/config_snom/state_settings.xml.haml @@ -1,5 +1,5 @@ !!! XML -%SnomIPPhoneMenu{:state => 'relevant', :title => "Gemeinschaft #{GEMEINSCHAFT_VERSION}"} +%SnomIPPhoneMenu{:state => 'relevant', :title => "Gemeinschaft #{GsParameter.get('GEMEINSCHAFT_VERSION')}"} %MenuItem{:name => '$(lang:menu100_phone_book)'} %URL= "#{@base_url}/#{@sip_account_ids.first}/phone_book.xml" %Menu{:name => '$(lang:menu100_call_lists)'} |