From 9b35ca7feb2804913f006b79098d43cd050302bc Mon Sep 17 00:00:00 2001
From: Jessica Forrester <jforrest@redhat.com>
Date: Tue, 13 Dec 2016 15:12:17 -0500
Subject: [PATCH] Bug 1404417 - Don't show negative durations, they are always
 due to client clock skew

---
 app/scripts/filters/date.js | 5 +++--
 dist/scripts/scripts.js     | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/scripts/filters/date.js b/app/scripts/filters/date.js
index 7a3bb08c68..35173a7995 100644
--- a/app/scripts/filters/date.js
+++ b/app/scripts/filters/date.js
@@ -164,8 +164,9 @@ angular.module('openshiftConsole')
       var minutes = duration.minutes();
       var seconds = duration.seconds();
 
-      if (!hours && !minutes && !seconds) {
-        return '';
+      // If we have negative duration then normalize it to zero, don't show negative durations
+      if (hours < 0 || minutes < 0 || seconds < 0) {
+        hours = minutes = seconds = 0;
       }
 
       if (hours) {
diff --git a/dist/scripts/scripts.js b/dist/scripts/scripts.js
index 71e44f3513..d00f430f53 100644
--- a/dist/scripts/scripts.js
+++ b/dist/scripts/scripts.js
@@ -13168,7 +13168,7 @@ return b ? (c = c || new Date(), a(moment(c).diff(b))) :b;
 } ]).filter("timeOnlyDuration", function() {
 return function(a) {
 var b = [], c = moment.duration(a), d = Math.floor(c.asHours()), e = c.minutes(), f = c.seconds();
-return d || e || f ? (d && b.push(d + "h"), e && b.push(e + "m"), d || b.push(f + "s"), b.join(" ")) :"";
+return (d < 0 || e < 0 || f < 0) && (d = e = f = 0), d && b.push(d + "h"), e && b.push(e + "m"), d || b.push(f + "s"), b.join(" ");
 };
 }), angular.module("openshiftConsole").filter("uid", function() {
 return function(a) {