From d52ca395e8eb0de30fa3cf21f15c5beb82dde0a0 Mon Sep 17 00:00:00 2001
From: Jorrit Schaap <schaap@astron.nl>
Date: Wed, 28 Sep 2016 07:08:01 +0000
Subject: [PATCH] Task #9607: apply convertNullToUndefined for all loaded tasks
---
.../lib/static/app/controllers/datacontroller.js | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/SAS/ResourceAssignment/ResourceAssignmentEditor/lib/static/app/controllers/datacontroller.js b/SAS/ResourceAssignment/ResourceAssignmentEditor/lib/static/app/controllers/datacontroller.js
index 32e58d35e4a..78ca930a725 100644
--- a/SAS/ResourceAssignment/ResourceAssignmentEditor/lib/static/app/controllers/datacontroller.js
+++ b/SAS/ResourceAssignment/ResourceAssignmentEditor/lib/static/app/controllers/datacontroller.js
@@ -386,6 +386,9 @@ angular.module('raeApp').factory("dataService", ['$http', '$q', function($http,
if(task) {
task.starttime = self.convertDatestringToLocalUTCDate(task.starttime);
task.endtime = self.convertDatestringToLocalUTCDate(task.endtime);
+ task.ingest_status = self.convertNullToUndefined(task.ingest_status);
+ task.disk_usage = self.convertNullToUndefined(task.disk_usage);
+ task.disk_usage_readable = self.convertNullToUndefined(task.disk_usage_readable);
if(!self.taskDict.hasOwnProperty(task.id)) {
self.tasks.push(task);
@@ -427,6 +430,9 @@ angular.module('raeApp').factory("dataService", ['$http', '$q', function($http,
var task = result.tasks[i];
task.starttime = self.convertDatestringToLocalUTCDate(task.starttime);
task.endtime = self.convertDatestringToLocalUTCDate(task.endtime);
+ task.ingest_status = self.convertNullToUndefined(task.ingest_status);
+ task.disk_usage = self.convertNullToUndefined(task.disk_usage);
+ task.disk_usage_readable = self.convertNullToUndefined(task.disk_usage_readable);
}
var newTaskDict = self.toIdBasedDict(result.tasks);
@@ -462,6 +468,9 @@ angular.module('raeApp').factory("dataService", ['$http', '$q', function($http,
var task = result.tasks[i];
task.starttime = self.convertDatestringToLocalUTCDate(task.starttime);
task.endtime = self.convertDatestringToLocalUTCDate(task.endtime);
+ task.ingest_status = self.convertNullToUndefined(task.ingest_status);
+ task.disk_usage = self.convertNullToUndefined(task.disk_usage);
+ task.disk_usage_readable = self.convertNullToUndefined(task.disk_usage_readable);
}
var newTaskDict = self.toIdBasedDict(result.tasks);
@@ -827,6 +836,9 @@ angular.module('raeApp').factory("dataService", ['$http', '$q', function($http,
if(!task) {
changedTask.starttime = self.convertDatestringToLocalUTCDate(changedTask.starttime);
changedTask.endtime = self.convertDatestringToLocalUTCDate(changedTask.endtime);
+ changedTask.ingest_status = self.convertNullToUndefined(changedTask.ingest_status);
+ changedTask.disk_usage = self.convertNullToUndefined(changedTask.disk_usage);
+ changedTask.disk_usage_readable = self.convertNullToUndefined(changedTask.disk_usage_readable);
self.tasks.push(changedTask);
self.taskDict[changedTask.id] = changedTask;
}
--
GitLab