X-Git-Url: http://git.onelab.eu/?p=monitor.git;a=blobdiff_plain;f=web%2FMonitorWeb%2Fmonitorweb%2Fcontrollers.py;h=0c80feef5ff5a60a0d94bec24db93133882dcb77;hp=5fe87b1bcead170f8f2e35d5a5fca0b79bc2c8b0;hb=be3de073848942591cf35cc71c514bf75fa21906;hpb=b6c1d56d3d49c18fff2f1a0a6114cacb82b3c3ec

diff --git a/web/MonitorWeb/monitorweb/controllers.py b/web/MonitorWeb/monitorweb/controllers.py
index 5fe87b1..0c80fee 100644
--- a/web/MonitorWeb/monitorweb/controllers.py
+++ b/web/MonitorWeb/monitorweb/controllers.py
@@ -177,7 +177,25 @@ class Root(controllers.RootController, MonitorXmlrpcServer):
 		flash("Welcome To MyOps!")
 		return dict(now=time.ctime())
 
-	@expose(template="monitorweb.templates.nodelist")
+	@expose(template="monitorweb.templates.nodelist", allow_json=True)
+	def node3(self, filter=None):
+		nhquery = HistoryNodeRecord.query.all()
+		query = []
+		for nh in nhquery:
+			if filter:
+				if nh.status == filter:
+					query.append(nh)
+			else:
+				query.append(nh)
+
+		rquery=[]
+		for q in query:
+			fb = FindbadNodeRecord.get_latest_by(hostname=q.hostname)
+			rquery.append(fb)
+
+		return dict(now=time.ctime(), query=rquery)
+
+	@expose(template="monitorweb.templates.nodelist", allow_json=True)
 	def node2(self, filter=None):
 		nhquery = HistoryNodeRecord.query.all()
 		query = []
@@ -407,7 +425,7 @@ class Root(controllers.RootController, MonitorXmlrpcServer):
 	@expose(template="monitorweb.templates.nodescanhistory")
 	def nodescanhistory(self, hostname=None, length=10):
 		try: length = int(length)
-		except: length = 10
+		except: length = 21
 
 		fbnode = FindbadNodeRecord.get_by(hostname=hostname)
 		# TODO: add links for earlier history if desired.
@@ -418,7 +436,9 @@ class Root(controllers.RootController, MonitorXmlrpcServer):
 			agg = prep_node_for_display(node, pcuhash=None, preppcu=False, asofdate=node.timestamp)
 			query.append(agg)
 
-		return dict(query=query, hostname=hostname)
+		if 'length' in request.params: 
+			del request.params['length']
+		return dict(query=query, hostname=hostname, params=request.params)
 
 	@expose(template="monitorweb.templates.nodehistory")
 	def nodehistory(self, hostname=None):