Changeset 147 for trunk/web/templates/main.py

Timestamp:

Oct 9, 2007, 2:31:30 AM (17 years ago)

Author:

ecprice

Message:

For new naming scheme.

File:

• trunk/web/templates/main.py (modified) (3 diffs)

trunk/web/templates/main.py

@@ -213 +213 @@
     lines = value_string.splitlines()
     d = {}
-    for line in lines[1:]:
+    for line in lines:
         lst = line.split()
         name, id = lst[:2]
@@ -593 +593 @@
     fields = []
     machine_info = {}
+    machine_info['name'] = machine.name
     machine_info['type'] = machine.type.hvm and 'HVM' or 'ParaVM'
     machine_info['owner'] = machine.owner
@@ -609 +610 @@
         if field in ('uptime', 'cputime'):
             fields.append((disp, locals()[field]))
+        elif field in machine_info:
+            fields.append((disp, machine_info[field]))
         elif field in main_status:
             fields.append((disp, main_status[field]))
-        elif field in machine_info:
-            fields.append((disp, machine_info[field]))
         else:
             pass