Changeset 535 for trunk/packages/sipb-xen-www/code/webcommon.py

Timestamp:

May 15, 2008, 9:55:17 PM (16 years ago)

Author:

ecprice

Message:

Use joins, new xmlist.py

File:

• trunk/packages/sipb-xen-www/code/webcommon.py (modified) (2 diffs)

trunk/packages/sipb-xen-www/code/webcommon.py

@@ -1 +1 @@
 """Exceptions for the web interface."""
 
+import time
 from sipb_xen_database import Machine, MachineAccess
 
@@ -40 +41 @@
     def __init__(self, user):
         self.user = user
-    
-    machines = cachedproperty(lambda self: 
-                             [ma.machine for ma in 
-                              MachineAccess.select_by(user=self.user)])
-    uptimes = cachedproperty(lambda self: 
-                             controls.getUptimes(self.machines))
+
+    machines = cachedproperty(lambda self:
+                                  Machine.query().join('acl').select_by(user=self.user))
+    xmlist = cachedproperty(lambda self:
+                                controls.getList(self.machines))
 
     def clear(self):