[llvm-commits] [LNT] r161839 - in /lnt/trunk/lnt/server/ui: static/v4_global_status.css views.py

[Michael Gottesman]

Author: mgottesman
Date: Mon Aug 13 23:21:01 2012
New Revision: 161839

URL: http://llvm.org/viewvc/llvm-project?rev=161839&view=rev
Log:
[LNT] v4_global_status: Added revision control panel. Also made a few small fixes.

*NOTE* This control panel is not completely wired up in this comment since I have
not included any of the javascript yet.

Modified:
    lnt/trunk/lnt/server/ui/static/v4_global_status.css
    lnt/trunk/lnt/server/ui/views.py

Modified: lnt/trunk/lnt/server/ui/static/v4_global_status.css
URL: http://llvm.org/viewvc/llvm-project/lnt/trunk/lnt/server/ui/static/v4_global_status.css?rev=161839&r1=161838&r2=161839&view=diff
==============================================================================
--- lnt/trunk/lnt/server/ui/static/v4_global_status.css (original)
+++ lnt/trunk/lnt/server/ui/static/v4_global_status.css Mon Aug 13 23:21:01 2012
@@ -88,3 +88,19 @@
     margin: 0px;
     padding: 0px;    
 }
+
+/* Revision control panel styles */
+
+div#revision-control-panel {
+    height: auto;
+}
+
+div#revision-control-panel label {
+    width: 30%;
+    display: block;
+}
+
+div#revision-control-panel input.baseline-form {
+    width: 60%;
+    display: block;
+}

Modified: lnt/trunk/lnt/server/ui/views.py
URL: http://llvm.org/viewvc/llvm-project/lnt/trunk/lnt/server/ui/views.py?rev=161839&r1=161838&r2=161839&view=diff
==============================================================================
--- lnt/trunk/lnt/server/ui/views.py (original)
+++ lnt/trunk/lnt/server/ui/views.py Mon Aug 13 23:21:01 2012
@@ -631,7 +631,8 @@
     from lnt.server.ui import util
 
     ts = request.get_testsuite()
-
+    fields = [f for f in ts.Sample.get_primary_fields()]
+    
     # Get the latest run.
     latest = ts.query(ts.Run.start_time).\
         order_by(ts.Run.start_time.desc()).first()
@@ -649,10 +650,7 @@
     # Get arguments.
     revision = int(request.args.get('revision',
                                     ts.Machine.DEFAULT_BASELINE_REVISION))
-    field = int(request.args.get('field', 2)) # 2 is for compile time
-    # FIXME: This maybe could be done in itertools or we could maybe
-    # return an actual list that is populated lazily.
-    field = [x for x in ts.Sample.get_primary_fields()][field-2]
+    field = fields[int(request.args.get('field', 2)) - 2] # 2 is for compile time    
     
     # Get the list of all runs we might be interested in.
     recent_runs = ts.query(ts.Run).filter(ts.Run.start_time > yesterday).all()
@@ -741,7 +739,8 @@
     # Order the table by worst regression.
     test_table.sort(key = lambda row: row[1], reverse=True)
     
-    baselinetype = None
+    baseline_types = []
+    baseline_type = None
     date = None
     
     return render_template("v4_global_status.html",
@@ -750,8 +749,10 @@
                            machines=recent_machines,
                            machine_groups_map=machine_groups_map,
                            groups = list(grouping_set),
+                           fields = fields,
+                           baseline_types = baseline_types,
                            selected_field=field,
-                           selected_baselinetype=baselinetype,
+                           selected_baseline_type=baseline_type,
                            selected_revision=revision,
                            selected_date=date)