From 869234579a4fa02705ad2613bdd7faf3586d6f07 Mon Sep 17 00:00:00 2001 From: Rosiak Date: Mon, 4 Jan 2016 20:23:32 +0100 Subject: [PATCH] Convert to device_attribs --- html/includes/forms/update-port-notes.inc.php | 13 ++++++++----- html/pages/device/port/notes.inc.php | 15 ++++++++------- sql-schema/085.sql | 1 - 3 files changed, 16 insertions(+), 13 deletions(-) delete mode 100644 sql-schema/085.sql diff --git a/html/includes/forms/update-port-notes.inc.php b/html/includes/forms/update-port-notes.inc.php index 8100cedb6..9678cab64 100644 --- a/html/includes/forms/update-port-notes.inc.php +++ b/html/includes/forms/update-port-notes.inc.php @@ -13,10 +13,11 @@ $status = 'error'; $message = 'unknown error'; -$port_id = mres($_POST['port_id']); -$notes = mres($_POST['notes']); +$device_id = mres($_POST['device_id']); +$port_id_notes = mres($_POST['port_id_notes']); +$attrib_value = mres($_POST['notes']); -if (isset($notes) && (dbUpdate(array('notes' => $notes), 'ports', 'port_id = ?', array($port_id)))) { +if (isset($attrib_value) && set_dev_attrib(array('device_id' => $device_id), $port_id_notes, $attrib_value)) { $status = 'ok'; $message = 'Updated'; } @@ -27,6 +28,8 @@ else { die(json_encode(array( 'status' => $status, 'message' => $message, - 'notes' => $notes, - 'port_id' => $port_id + 'attrib_type' => $port_id_notes, + 'attrib_value' => $attrib_value, + 'device_id' => $device_id + ))); diff --git a/html/pages/device/port/notes.inc.php b/html/pages/device/port/notes.inc.php index 87a637f7f..4ca852897 100644 --- a/html/pages/device/port/notes.inc.php +++ b/html/pages/device/port/notes.inc.php @@ -10,9 +10,9 @@ * the source code distribution for details. */ $pagetitle[] = 'Notes'; -$data = dbFetchRow("SELECT `notes` FROM `ports` WHERE port_id = ?", array( - $port['port_id'] -)); +$port_id_notes = 'port_id_notes:' . $port['port_id']; +$device_id = $device['device_id']; +$data = get_dev_attrib($device,$port_id_notes); ?>
@@ -21,14 +21,14 @@ $data = dbFetchRow("SELECT `notes` FROM `ports` WHERE port_id = ?", array(
+echo htmlentities($data); ?>
Submit + '; ?>
@@ -38,12 +38,13 @@ echo ' $("[name='btn-update-notes']").on('click', function(event) { event.preventDefault(); var $this = $(this); - var port_id = $(this).data("port_id"); + var device_id = ""; + var port_id_notes = ""; var notes = $("#port-notes").val(); $.ajax({ type: 'POST', url: 'ajax_form.php', - data: { type: "update-port-notes", notes: notes, port_id: port_id}, + data: { type: "update-port-notes", notes: notes, port_id_notes: port_id_notes, device_id: device_id }, dataType: "html", success: function(data){ toastr.success('Saved'); diff --git a/sql-schema/085.sql b/sql-schema/085.sql deleted file mode 100644 index 181ad4c52..000000000 --- a/sql-schema/085.sql +++ /dev/null @@ -1 +0,0 @@ -ALTER TABLE `ports` ADD COLUMN `notes` text;