diff options
| author | Mario "Kuroir" Ricalde <kuroir@gmail.com> | 2013-03-05 11:01:01 -0600 |
|---|---|---|
| committer | Mario "Kuroir" Ricalde <kuroir@gmail.com> | 2013-03-05 11:01:01 -0600 |
| commit | 4fcdd330139921b6fa5d4f9d15fb5f91775b27af (patch) | |
| tree | 62e82c385c9a804a8f32da6f276881ff8c21fc90 /app/views/phones/show.html.haml | |
| parent | 2b94b16ee1201d15b3b9d66e142df311141a47db (diff) | |
| parent | a865b1f9506b900ed8643c01d94c86268e907720 (diff) | |
Merge remote-tracking branch 'origin/develop' into develop
Diffstat (limited to 'app/views/phones/show.html.haml')
| -rw-r--r-- | app/views/phones/show.html.haml | 11 |
1 files changed, 5 insertions, 6 deletions
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 |