Repository: oozie Updated Branches: refs/heads/master ff9e43fa8 -> 6143d949c
OOZIE-1774 Expected/Actual Duration on UI SLA Tab doesn't show correct information (ryota) Project: http://git-wip-us.apache.org/repos/asf/oozie/repo Commit: http://git-wip-us.apache.org/repos/asf/oozie/commit/6143d949 Tree: http://git-wip-us.apache.org/repos/asf/oozie/tree/6143d949 Diff: http://git-wip-us.apache.org/repos/asf/oozie/diff/6143d949 Branch: refs/heads/master Commit: 6143d949c46d9f84691ededd9bb152ba4a8ea603 Parents: ff9e43f Author: egashira <[email protected]> Authored: Fri Apr 11 10:28:30 2014 -0700 Committer: egashira <[email protected]> Committed: Fri Apr 11 10:28:30 2014 -0700 ---------------------------------------------------------------------- release-log.txt | 1 + webapp/src/main/webapp/console/sla/js/oozie-sla-table.js | 7 +++---- 2 files changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/oozie/blob/6143d949/release-log.txt ---------------------------------------------------------------------- diff --git a/release-log.txt b/release-log.txt index 00286d9..a0e5723 100644 --- a/release-log.txt +++ b/release-log.txt @@ -1,5 +1,6 @@ -- Oozie 4.1.0 release (trunk - unreleased) +OOZIE-1774 Expected/Actual Duration on UI SLA Tab doesn't show correct information (ryota) OOZIE-1754 add order(sort) option and exclude filter for coord job Info (ryota) OOZIE-1761 Improve sharelib purging logic (puru via rohini) OOZIE-1725 add coord EL functions to be used in SLA tag (ryota) http://git-wip-us.apache.org/repos/asf/oozie/blob/6143d949/webapp/src/main/webapp/console/sla/js/oozie-sla-table.js ---------------------------------------------------------------------- diff --git a/webapp/src/main/webapp/console/sla/js/oozie-sla-table.js b/webapp/src/main/webapp/console/sla/js/oozie-sla-table.js index a69f636..1a88671 100644 --- a/webapp/src/main/webapp/console/sla/js/oozie-sla-table.js +++ b/webapp/src/main/webapp/console/sla/js/oozie-sla-table.js @@ -190,16 +190,15 @@ function drawTable(jsonData) { if (aData.expectedDuration == -1) { $(rowAllColumns[10]).html(""); } else { - // Convert from minutes to milliseconds - $(rowAllColumns[10]).html(timeElapsed(aData.expectedDuration * 60000)); + $(rowAllColumns[10]).html(timeElapsed(aData.expectedDuration)); } if (aData.actualDuration == -1) { $(rowAllColumns[11]).html(""); } else { - $(rowAllColumns[11]).html(timeElapsed(aData.actualDuration * 60000)); + $(rowAllColumns[11]).html(timeElapsed(aData.actualDuration)); } if (aData.durDiff || aData.durDiff == 0) { - $(rowAllColumns[12]).html(timeElapsed(aData.durDiff * 60000)); + $(rowAllColumns[12]).html(timeElapsed(aData.durDiff)); } $("td:first", nRow).html(iDisplayIndexFull + 1); return nRow;
