New perf dashboard shows null as the aggregator name if no aggregation is done

https://bugs.webkit.org/show_bug.cgi?id=141256

Reviewed by Chris Dumez.

Don't show the aggregator name if there isn't one.

* public/v2/manifest.js:
(App.Metric.label):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@179647 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Websites/perf.webkit.org/ChangeLog b/Websites/perf.webkit.org/ChangeLog
index 973db4751fb369f9e564d32a26050ec71c56c586..56d51bf9c8cf907619cc4f108fb6f67fffd7ca6d 100644 (file)
--- a/Websites/perf.webkit.org/ChangeLog
+++ b/Websites/perf.webkit.org/ChangeLog
@@ -1,3 +1,15 @@
+2015-02-04  Ryosuke Niwa  <rniwa@webkit.org>
+
+        New perf dashboard shows null as the aggregator name if no aggregation is done
+        https://bugs.webkit.org/show_bug.cgi?id=141256
+
+        Reviewed by Chris Dumez.
+
+        Don't show the aggregator name if there isn't one.
+
+        * public/v2/manifest.js:
+        (App.Metric.label):
+
 2015-02-04  Ryosuke Niwa  <rniwa@webkit.org>
 
         Unreviewed build fix after r179611.

diff --git a/Websites/perf.webkit.org/public/v2/manifest.js b/Websites/perf.webkit.org/public/v2/manifest.js
index a3d0b078ce04ddfa8d5ff96248fa0295067ee465..c04d180d9566599e04670199a23347a750d04381 100755 (executable)
--- a/Websites/perf.webkit.org/public/v2/manifest.js
+++ b/Websites/perf.webkit.org/public/v2/manifest.js
@@ -20,7 +20,7 @@ App.Metric = App.NameLabelModel.extend({
     aggregator: DS.attr('string'),
     label: function ()
     {
-        return this.get('name') + ' : ' + this.get('aggregator');
+        return this.get('name') + (this.get('aggregator') ? ' : ' + this.get('aggregator') : '');
     }.property('name', 'aggregator'),
     path: function ()
     {