1 files changed, 22 insertions, 10 deletions

diff --git a/web/js/nms.js b/web/js/nms.js
index 0caac24..3a37e4a 100644
--- a/web/js/nms.js
+++ b/web/js/nms.js
@@ -134,7 +134,7 @@ function nmsTimer(handler, interval, name, description) {
 function byteCount(bytes,precision) {
 	if (precision ==undefined)
 		precision = 1;
-	var units = ['', 'K', 'M', 'G', 'T', 'P'];
+	var units = ['', 'K', 'M', 'G', 'T', 'P', 'E','Z'];
 	var i = 0;
 	while (bytes > 1024) {
 		bytes = bytes / 1024;
@@ -356,6 +356,7 @@ function getInitialConfig() {
 			} else {
 				nms._public = false;
 				document.body.classList.add("gondul-private");
+				nmsTemplate.getTemplates();
 			}
 		}
 	});
@@ -414,7 +415,7 @@ function detectHandler() {
 	var views = document.location.hash.slice(1);
 	var interval = nms.interval;
 	if (views == undefined || views == "")
-		views = "ping";
+		views = "health";
 	views = views.split(",");
 
 	if (views.length > 1) {
@@ -639,14 +640,25 @@ function nmsUpdateNavbarGraph() {
  * 	do stuff with nmsData.snmp.snmp[sw].misc
  * }
  *
+ * New: setTree(root, array, default):
+ * same thing, but instead of just returing true/false, return the value found
+ * or the provided default.
  */
-function testTree(root, ar) {
-	if (ar == undefined || root == undefined)
-		return false;
-	for (var i in ar) {
-		root = root[ar[i]];
-		if (root == undefined)
-			return false;
+function setTree(root, ar, def) {
+	if (ar == undefined || root == undefined) {
+		return def;
+	} else {
+		for (var i in ar) {
+			root = root[ar[i]];
+			if (root == undefined)
+				return def;
+		}
 	}
-	return true;
+	return root;
+}
+function testTree(root, ar) {
+	var x = setTree(root,ar,false);
+	if (x != false)
+		return true;
 }
+