From cf2c7b9f072e7267671daa3c51d5317e66e7deb3 Mon Sep 17 00:00:00 2001 From: jonnylamb Date: Thu, 31 Jan 2008 15:57:10 +0000 Subject: [PATCH] Misc. fixes to Hawkeye's AgentView. --- src/www/bongo/hawkeye/AgentView.py | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/src/www/bongo/hawkeye/AgentView.py b/src/www/bongo/hawkeye/AgentView.py index 13d9b57..36d2dd8 100644 --- a/src/www/bongo/hawkeye/AgentView.py +++ b/src/www/bongo/hawkeye/AgentView.py @@ -157,14 +157,14 @@ class AgentHandler(HawkeyeHandler): # It's a hostlist, and arraytype is the default port # Check if value has port and/or weighting defaultweight = 1 - defultport = arraytype - + defaultport = arraytype + if dobj.count(':') == 1: # Port and hostname dobj = dobj + ":" + defaultweight elif dobj.count(':') == 0: # Only hostname - dobj = dobj + ":" + defaultport + ":" + defaultweight + dobj = dobj + ":" + str(defaultport) + ":" + str(defaultweight) # Otherwise, type was string (default). @@ -215,11 +215,7 @@ class AgentHandler(HawkeyeHandler): nkey["revertbox"] = key + "-normal" nkey["revertjs"] = "$('" + nkey["revertbox"] + "').hide(); $('" + nkey["selectorid"] + "').show();" - strthingy = "" - for value in config[key]: - strthingy += value + "," - - nkey["strvalue"] = strthingy + nkey["strvalue"] = ','.join(config[key]) rkeys.append(nkey)