ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From alexantone...@apache.org
Subject ambari git commit: AMBARI-14158. BG operation window: Running task shows duration with negative value
Date Thu, 03 Dec 2015 16:55:20 GMT
Repository: ambari
Updated Branches:
  refs/heads/trunk 3711b365c -> 59bce8554


AMBARI-14158. BG operation window: Running task shows duration with negative value


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

Branch: refs/heads/trunk
Commit: 59bce855491f4c2f5a72384ea441ab7d4c307688
Parents: 3711b36
Author: Alex Antonenko <hiveww@gmail.com>
Authored: Thu Dec 3 18:38:38 2015 +0200
Committer: Alex Antonenko <hiveww@gmail.com>
Committed: Thu Dec 3 18:55:13 2015 +0200

----------------------------------------------------------------------
 .../app/controllers/global/background_operations_controller.js   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/59bce855/ambari-web/app/controllers/global/background_operations_controller.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/global/background_operations_controller.js b/ambari-web/app/controllers/global/background_operations_controller.js
index 6bbbc19..76c517c 100644
--- a/ambari-web/app/controllers/global/background_operations_controller.js
+++ b/ambari-web/app/controllers/global/background_operations_controller.js
@@ -228,7 +228,7 @@ App.BackgroundOperationsController = Em.Controller.extend({
           status: request.Requests.request_status,
           isRunning: isRunning,
           startTime: App.dateTimeWithTimeZone(request.Requests.start_time),
-          endTime: App.dateTimeWithTimeZone(request.Requests.end_time)
+          endTime: request.Requests.end_time > 0 ? App.dateTimeWithTimeZone(request.Requests.end_time)
: request.Requests.end_time
         });
       } else {
         rq = Em.Object.create({
@@ -241,7 +241,7 @@ App.BackgroundOperationsController = Em.Controller.extend({
           hostsMap: {},
           tasks: [],
           startTime: App.dateTimeWithTimeZone(request.Requests.start_time),
-          endTime: App.dateTimeWithTimeZone(request.Requests.end_time),
+          endTime: request.Requests.end_time > 0 ? App.dateTimeWithTimeZone(request.Requests.end_time)
: request.Requests.end_time,
           dependentService: requestParams.dependentService,
           sourceRequestScheduleId: request.Requests.request_schedule && request.Requests.request_schedule.schedule_id,
           previousTaskStatusMap: {},


Mime
View raw message