From 3833403178a83c5174295d945edabfe749d001af Mon Sep 17 00:00:00 2001
From: Kristian Lyngstol <kristian@bohemians.org>
Date: Wed, 25 May 2016 21:48:40 +0200
Subject: front: Fix/tweak edit-box

No need to expose 'switch' id in the API - it's internal to the db.

The entire edit-logic should be cleaned up, but at least this fixes the
immediate problem.

Fixes #74
---
 web/api/read/switches-management | 2 +-
 web/js/nms-info-box.js           | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'web')

diff --git a/web/api/read/switches-management b/web/api/read/switches-management
index 2dd329c..8d899b7 100755
--- a/web/api/read/switches-management
+++ b/web/api/read/switches-management
@@ -12,7 +12,7 @@ use Data::Dumper;
 
 $nms::web::cc{'max-age'} = "60";
 
-my $q2 = $nms::web::dbh->prepare('select switch,sysname,mgmt_v4_addr,subnet4,subnet6,mgmt_v6_addr,mgmt_v4_gw,mgmt_v6_gw,mgmt_vlan,traffic_vlan,last_config_fetch,current_mac,poll_frequency,last_updated,distro_phy_port from switches where placement is not null');
+my $q2 = $nms::web::dbh->prepare('select sysname,mgmt_v4_addr,subnet4,subnet6,mgmt_v6_addr,mgmt_v4_gw,mgmt_v6_gw,mgmt_vlan,traffic_vlan,last_config_fetch,current_mac,poll_frequency,last_updated,distro_phy_port,community from switches where placement is not null');
 
 $q2->execute();
 while (my $ref = $q2->fetchrow_hashref()) {
diff --git a/web/js/nms-info-box.js b/web/js/nms-info-box.js
index 8ed1f2a..9efff37 100644
--- a/web/js/nms-info-box.js
+++ b/web/js/nms-info-box.js
@@ -766,7 +766,7 @@ var switchEditPanel = function () {
 			var tmpsw = '\'' + this.sw + '\'';
 			var tmpv = '\'' + v + '\'';
 			var tmphandler = '"nmsInfoBox._editChange(' + tmpsw + ',' + tmpv + ');"';
-			var html = '<input type="text" class="form-control" value="' + template[v] + '" id="edit-' + this.sw + '-' + v + '" onchange=' + tmphandler + ' oninput=' + tmphandler + '>';
+			var html = '<input type="text" class="form-control" value="' + template[v] + '" id="edit-' + this.sw + '-' + v + '" onchange=' + tmphandler + ' oninput=' + tmphandler + ' ' + (v == 'sysname' ? "readonly" : "") + '>';
 			content.push([v, html]);
 		}
 
@@ -786,6 +786,7 @@ var switchEditPanel = function () {
 		output.id = "edit-output";
 		domObj.appendChild(output);
 
+		this._render(domObj);
 		if (place) {
 			var pval = document.getElementById("edit-" + this.sw + "-placement");
 			if (pval) {
@@ -793,7 +794,6 @@ var switchEditPanel = function () {
 			}
 		}
 
-		this._render(domObj);
 	};
 	this.save = function () {
 		var myData = nmsInfoBox._editStringify(this.sw);
-- 
cgit v1.2.3