Merge lp:~stevanr/lava-dashboard/fix-1197322 into lp:lava-dashboard

[Stevan Radaković]

Remove test cases name which was not necessary.
Remove units from legend for now to get rid of hundreds of additional queries django was making.

[Senthil Kumaran S (stylesen)]

Looks good. +1 to merge.

review: Approve

=== modified file 'dashboard_app/static/dashboard_app/js/image-report.js'
--- dashboard_app/static/dashboard_app/js/image-report.js	2013-07-01 15:49:15 +0000
+++ dashboard_app/static/dashboard_app/js/image-report.js	2013-07-03 11:44:27 +0000
@@ -284,7 +284,6 @@
     // Get the plot data.
 
     data = [];
-    units = "";
     for (test in table_data) {
 
 	if ($("#test_select").val().indexOf(test) >= 0) {
@@ -306,7 +305,6 @@
 			} else { // measurements
 			    if (row[iter]["measurements"] && row[iter]["measurements"].length != 0) {
 				row_data.push([iter, row[iter]["measurements"][0]["measurement"]]);
-				units = row[iter]["measurements"][0]["units"];
 			    }
 			}
 		    }
@@ -376,15 +374,6 @@
 	options["yaxis"]["min"] = 0;
     }
 
-    if (units != "") {
-	options["legend"]["labelFormatter"] = function(label, series) {
-	    if (label.length > 20) {
-		return label.substring(0,20) + "...";
-	    }
-	    return label + " (" + units + ")";
-	}
-    }
-
     $.plot($("#outer-container #inner-container"), data, options); 
 }
 

=== modified file 'dashboard_app/views/images.py'
--- dashboard_app/views/images.py	2013-07-01 15:49:15 +0000
+++ dashboard_app/views/images.py	2013-07-03 11:44:27 +0000
@@ -89,10 +89,7 @@
                     cls = 'present fail'
             bug_ids = sorted([b.bug_id for b in test_run.launchpad_bugs.all()])
 
-            measurements = [{'item': str(item.test_case),
-                             'measurement': str(item.measurement),
-                             'units': str(item.units)
-                             }
+            measurements = [{'measurement': str(item.measurement)}
                             for item in test_run.test_results.all()]
 
             test_run_data = dict(