added a variety of updates to templates, to reference each other.

[monitor.git] / web / MonitorWeb / monitorweb / controllers.py

diff --git a/web/MonitorWeb/monitorweb/controllers.py b/web/MonitorWeb/monitorweb/controllers.py
index 95d9740..2f7b3a6 100644 (file)
--- a/web/MonitorWeb/monitorweb/controllers.py
+++ b/web/MonitorWeb/monitorweb/controllers.py
@@ -33,12 +33,13 @@ def format_ports(pcu):
 
 def format_pcu_shortstatus(pcu):
        status = "error"
-       if pcu.reboot_trial_status == str(0):
-               status = "ok"
-       elif pcu.reboot_trial_status == "NetDown" or pcu.reboot_trial_status == "Not_Run":
-               status = pcu.reboot_trial_status
-       else:
-               status = "error"
+       if pcu:
+               if pcu.reboot_trial_status == str(0):
+                       status = "ok"
+               elif pcu.reboot_trial_status == "NetDown" or pcu.reboot_trial_status == "Not_Run":
+                       status = pcu.reboot_trial_status
+               else:
+                       status = "error"
 
        return status
 
@@ -152,10 +153,10 @@ class Root(controllers.RootController):
                for node in fbquery:
 
                        # NOTE: count filter
-                       if pcu.reboot_trial_status == str(0):
+                       if node.reboot_trial_status == str(0):
                                filtercount['ok'] += 1
-                       elif pcu.reboot_trial_status == 'NetDown' or pcu.reboot_trial_status == 'Not_Run':
-                               filtercount[pcu.reboot_trial_status] += 1
+                       elif node.reboot_trial_status == 'NetDown' or node.reboot_trial_status == 'Not_Run':
+                               filtercount[node.reboot_trial_status] += 1
                        else:
                                filtercount['pending'] += 1