diff options
| author | spag <spag@golwen.net> | 2013-01-13 17:23:47 +0100 |
|---|---|---|
| committer | spag <spag@golwen.net> | 2013-01-13 17:23:47 +0100 |
| commit | 0b717b40b596fcd6ba238b2b3066b33a91289fdf (patch) | |
| tree | 5b225d4085ac89532413ed224438d3ba187fda5f /app/views/phones | |
| parent | 0d5114566e73c44799eac83d46f159cd979f4fcc (diff) | |
| parent | 9567f239586f253002dea0ed654b7bd18a15e572 (diff) | |
Merge branch 'develop' of github.com:amooma/GS5 into develop
Diffstat (limited to 'app/views/phones')
| -rw-r--r-- | app/views/phones/_form_core.html.haml | 2 | ||||
| -rw-r--r-- | app/views/phones/show.html.haml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/views/phones/_form_core.html.haml b/app/views/phones/_form_core.html.haml index b09ee35..17b9ca8 100644 --- a/app/views/phones/_form_core.html.haml +++ b/app/views/phones/_form_core.html.haml @@ -11,5 +11,5 @@ - if defined? GsParameter.get('NIGHTLY_REBOOT_OF_PHONES') && GsParameter.get('NIGHTLY_REBOOT_OF_PHONES') == true = f.input :nightly_reboot, :label => t('phones.form.nightly_reboot.label'), :hint => conditional_hint('phones.form.nightly_reboot.hint') - - if defined? PROVISIONING_KEY_LENGTH && PROVISIONING_KEY_LENGTH > 0 + - if !GsParameter.get('PROVISIONING_KEY_LENGTH').nil? && GsParameter.get('PROVISIONING_KEY_LENGTH') > 0 = f.input :provisioning_key_active, :label => t('phones.form.provisioning_key_active.label'), :hint => conditional_hint('phones.form.provisioning_key_active.hint') diff --git a/app/views/phones/show.html.haml b/app/views/phones/show.html.haml index f20facd..0e0dad5 100644 --- a/app/views/phones/show.html.haml +++ b/app/views/phones/show.html.haml @@ -21,7 +21,7 @@ %strong= t('phones.show.nightly_reboot') + ":" = @phone.nightly_reboot -- if defined? PROVISIONING_KEY_LENGTH && PROVISIONING_KEY_LENGTH > 0 +- if !GsParameter.get('PROVISIONING_KEY_LENGTH').nil? && GsParameter.get('PROVISIONING_KEY_LENGTH') > 0 %p %strong= t('phones.show.provisioning_key_active') + ":" = @phone.provisioning_key_active |