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

Timestamp:

Jun 2, 2008, 1:48:27 AM (16 years ago)

Author:

ecprice

Message:

Avoid a second remctl to determine whether ice3 is up

File:

• trunk/packages/sipb-xen-www/code/webcommon.py (modified) (1 diff)

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

@@ -44 +44 @@
     machines = cachedproperty(lambda self:
                                   Machine.query().join('acl').select_by(user=self.user))
+    xmlist_raw = cachedproperty(lambda self: controls.getList())
     xmlist = cachedproperty(lambda self:
-                                controls.getList(self.machines))
+                                dict((m, self.xmlist_raw[m.name])
+                                     for m in self.machines
+                                     if m.name in self.xmlist_raw))
 
     def clear(self):