tez-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject tez git commit: TEZ-2754. Tez UI: StartTime & EndTime is not displayed with right format in Graphical View (sree)
Date Thu, 03 Sep 2015 06:57:17 GMT
Repository: tez
Updated Branches:
  refs/heads/master 05edd82a9 -> a0d59c379


TEZ-2754. Tez UI: StartTime & EndTime is not displayed with right format in Graphical
View (sree)


Project: http://git-wip-us.apache.org/repos/asf/tez/repo
Commit: http://git-wip-us.apache.org/repos/asf/tez/commit/a0d59c37
Tree: http://git-wip-us.apache.org/repos/asf/tez/tree/a0d59c37
Diff: http://git-wip-us.apache.org/repos/asf/tez/diff/a0d59c37

Branch: refs/heads/master
Commit: a0d59c379aed7fc4f2565eb75af755088921a5a1
Parents: 05edd82
Author: Sreenath Somarajapuram <sree@apache.org>
Authored: Thu Sep 3 12:25:15 2015 +0530
Committer: Sreenath Somarajapuram <sree@apache.org>
Committed: Thu Sep 3 12:25:15 2015 +0530

----------------------------------------------------------------------
 CHANGES.txt                                              |  1 +
 .../webapp/app/scripts/components/dag-view/graph-view.js | 11 +++++++----
 2 files changed, 8 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tez/blob/a0d59c37/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 72d972f..d7da445 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -7,6 +7,7 @@ Release 0.8.1: Unreleased
 INCOMPATIBLE CHANGES
 
 ALL CHANGES:
+  TEZ-2754. Tez UI: StartTime & EndTime is not displayed with right format in Graphical
View
   TEZ-2752. logUnsuccessful completion in Attempt should write original finish
   time to ATS
   TEZ-2755. Fix findbugs warning in TezClient

http://git-wip-us.apache.org/repos/asf/tez/blob/a0d59c37/tez-ui/src/main/webapp/app/scripts/components/dag-view/graph-view.js
----------------------------------------------------------------------
diff --git a/tez-ui/src/main/webapp/app/scripts/components/dag-view/graph-view.js b/tez-ui/src/main/webapp/app/scripts/components/dag-view/graph-view.js
index 3270ad9..1210bd4 100644
--- a/tez-ui/src/main/webapp/app/scripts/components/dag-view/graph-view.js
+++ b/tez-ui/src/main/webapp/app/scripts/components/dag-view/graph-view.js
@@ -403,11 +403,14 @@ App.DagViewComponent.graphView = (function (){
         _component.get('vertexProperties').forEach(function (property) {
           var value = {};
 
-          if(property.contentPath) {
-            value = d.get('data.' + property.contentPath);
-          }
-          else if(property.getCellContent && !property.tableCellViewClass) {
+          if(property.getCellContent && !property.tableCellViewClass) {
             value = property.getCellContent(d.get('data'));
+            if(value && value.displayText != undefined) {
+              value = value.displayText;
+            }
+          }
+          else if(property.contentPath) {
+            value = d.get('data.' + property.contentPath);
           }
 
           value = App.Helpers.number.formatNumThousands(value);


Mime
View raw message