diff options
| author | Stefan Wintermeyer <stefan.wintermeyer@amooma.de> | 2013-03-04 11:55:33 +0100 |
|---|---|---|
| committer | Stefan Wintermeyer <stefan.wintermeyer@amooma.de> | 2013-03-04 11:55:33 +0100 |
| commit | a07b7482bb2f9d2867dafc909da8af90d5ee9143 (patch) | |
| tree | 360e5a8b3cc1f9c0ccf79575709b0a9787924dd3 /app/views/phones | |
| parent | aaffa89ef9aef6ac30e3304d735a8c58f4bdaaef (diff) | |
| parent | 8042e6c314737feab61209e0b8b26ddba5c7e763 (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 | 11 |
2 files changed, 6 insertions, 7 deletions
diff --git a/app/views/phones/_form_core.html.haml b/app/views/phones/_form_core.html.haml index 31f3c24..e093899 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 GsParameter.get('PROVISIONING_KEY_LENGTH') == 0 + - if @phone && @phone.provisioning_key_active = 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 e9b8b21..1996d48 100644 --- a/app/views/phones/show.html.haml +++ b/app/views/phones/show.html.haml @@ -34,12 +34,11 @@ %td = @phone.nightly_reboot == true ? t('simple_form.yes') : t('simple_form.no') - - if GsParameter.get('PROVISIONING_KEY_LENGTH') == 0 - %tr - %td - %strong= t('phones.show.provisioning_key_active') + ":" - %td - = @phone.provisioning_key_active == true ? t('simple_form.yes') : t('simple_form.no') + %tr + %td + %strong= t('phones.show.provisioning_key_active') + ":" + %td + = @phone.provisioning_key_active == true ? t('simple_form.yes') : t('simple_form.no') %tr{:class => (@phone.ip_address.blank? ? 'warning' : '')} %td |