From 46df72f8af7fc7fc7d5f9da9756e4fc895fd4d16 Mon Sep 17 00:00:00 2001 From: Mark Crane Date: Fri, 22 May 2015 04:34:31 +0000 Subject: [PATCH] More work on device alternate. --- app/devices/app_languages.php | 16 ++++++++-------- app/devices/device_edit.php | 13 +++++++++++++ app/devices/devices.php | 2 +- 3 files changed, 22 insertions(+), 9 deletions(-) diff --git a/app/devices/app_languages.php b/app/devices/app_languages.php index 4eebabd719..7bb90ed7f0 100644 --- a/app/devices/app_languages.php +++ b/app/devices/app_languages.php @@ -999,14 +999,14 @@ $text['label-device_label']['pl'] = "Etykieta"; $text['label-device_label']['uk'] = ""; $text['label-device_label']['sv-se'] = "Etikett"; -$text['label-device_alternate']['en-us'] = "Alternate"; -$text['label-device_alternate']['es-cl'] = "Suplente"; -$text['label-device_alternate']['pt-pt'] = "Alternado"; -$text['label-device_alternate']['fr-fr'] = "Alterné"; -$text['label-device_alternate']['pt-br'] = "Alternado"; -$text['label-device_alternate']['pl'] = "Alternatywny"; -$text['label-device_alternate']['uk'] = "заступник"; -$text['label-device_alternate']['sv-se'] = "Alternate"; +$text['label-device_uuid_alternate']['en-us'] = "Alternate"; +$text['label-device_uuid_alternate']['es-cl'] = "Suplente"; +$text['label-device_uuid_alternate']['pt-pt'] = "Alternado"; +$text['label-device_uuid_alternate']['fr-fr'] = "Alterné"; +$text['label-device_uuid_alternate']['pt-br'] = "Alternado"; +$text['label-device_uuid_alternate']['pl'] = "Alternatywny"; +$text['label-device_uuid_alternate']['uk'] = "заступник"; +$text['label-device_uuid_alternate']['sv-se'] = "Alternate"; $text['label-device_key_value']['en-us'] = "Value"; $text['label-device_key_value']['es-cl'] = "Valor"; diff --git a/app/devices/device_edit.php b/app/devices/device_edit.php index 81e0529335..bb3b25d4b5 100644 --- a/app/devices/device_edit.php +++ b/app/devices/device_edit.php @@ -137,6 +137,7 @@ require_once "resources/require.php"; $_POST["device_mac_address"] = $device_mac_address; $device_label = check_str($_POST["device_label"]); $device_vendor = check_str($_POST["device_vendor"]); + $device_uuid_alternate = check_str($_POST["device_uuid_alternate"]); $device_model = check_str($_POST["device_model"]); $device_firmware_version = check_str($_POST["device_firmware_version"]); $device_provision_enable = check_str($_POST["device_provision_enable"]); @@ -329,6 +330,7 @@ require_once "resources/require.php"; $device_username = $row["device_username"]; $device_password = $row["device_password"]; $device_vendor = $row["device_vendor"]; + $device_uuid_alternate = $row["device_uuid_alternate"]; $device_model = $row["device_model"]; $device_firmware_version = $row["device_firmware_version"]; $device_provision_enable = $row["device_provision_enable"]; @@ -1122,6 +1124,17 @@ require_once "resources/require.php"; echo "\n"; echo "\n"; + echo "\n"; + echo "\n"; + echo " ".$text['label-device_uuid_alternate']."\n"; + echo "\n"; + echo "\n"; + echo " \n"; + echo "
\n"; + echo $text['description-device_uuid_alternate']."\n"; + echo "\n"; + echo "\n"; + echo "\n"; echo "\n"; echo " ".$text['label-device_model']."\n"; diff --git a/app/devices/devices.php b/app/devices/devices.php index d3b7a42cfe..4ce77ea6d7 100644 --- a/app/devices/devices.php +++ b/app/devices/devices.php @@ -193,7 +193,7 @@ else { echo th_order_by('device_mac_address', $text['label-device_mac_address'], $order_by, $order); echo th_order_by('device_label', $text['label-device_label'], $order_by, $order); if ($device_alternate) { - echo th_order_by('device_template', $text['label-device_alternate'], $order_by, $order); + echo th_order_by('device_template', $text['label-device_uuid_alternate'], $order_by, $order); } echo th_order_by('device_vendor', $text['label-device_vendor'], $order_by, $order); echo th_order_by('device_template', $text['label-device_template'], $order_by, $order);