X-Git-Url: http://git.onelab.eu/?p=monitor.git;a=blobdiff_plain;f=web%2FMonitorWeb%2Fmonitorweb%2Fcontrollers.py;h=4a74782886c867c03b6527e6c6f6463cfad5b9d0;hp=2821b7604e50b91b6fb76aa93d02f4382ebd7793;hb=57fc3f2c580971f7a31c708764557d6273b83216;hpb=ab835ed0e99bc4c57728c8cfa61856d15dfc34f5

diff --git a/web/MonitorWeb/monitorweb/controllers.py b/web/MonitorWeb/monitorweb/controllers.py
index 2821b76..4a74782 100644
--- a/web/MonitorWeb/monitorweb/controllers.py
+++ b/web/MonitorWeb/monitorweb/controllers.py
@@ -9,8 +9,6 @@ import cherrypy
 import re
 from monitor.database.info.model import *
 #from monitor.database.zabbixapi.model import *
-#from monitor.database.dborm import zab_session as session
-#from monitor.database.dborm import zab_metadata as metadata
 from monitor_xmlrpc import MonitorXmlrpcServer
 
 from monitor import reboot
@@ -796,6 +794,14 @@ class Root(controllers.RootController, MonitorXmlrpcServer):
 		types = filter(lambda x: 'notice' in x, dir(mailtxt))
 		results = {}
 
+		print mon_metadata.bind
+		if session.bind is None:
+			#TODO: figure out why this value gets cleared out...
+			session.bind = mon_metadata.bind
+		result = session.execute("select distinct(action_type) from actionrecord;")
+
+		types = [r[0] for r in result]
+
 		try: since = int(since)
 		except: since = 7