From c932a5e9245b0f69f855fabd9bd56faba927540a Mon Sep 17 00:00:00 2001
From: Jorrit Schaap <schaap@astron.nl>
Date: Mon, 11 Jul 2016 14:30:44 +0000
Subject: [PATCH] Task #9607: bug fix: return empty list in case a task has no
predecessors or successors, not None.
---
.../ResourceAssignmentDatabase/radb.py | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/SAS/ResourceAssignment/ResourceAssignmentDatabase/radb.py b/SAS/ResourceAssignment/ResourceAssignmentDatabase/radb.py
index 83feb71e677..b1bf277f74c 100644
--- a/SAS/ResourceAssignment/ResourceAssignmentDatabase/radb.py
+++ b/SAS/ResourceAssignment/ResourceAssignmentDatabase/radb.py
@@ -191,12 +191,6 @@ class RADatabase:
query += ' WHERE ' + ' AND '.join(conditions)
tasks = list(self._executeQuery(query, qargs, fetch=_FETCH_ALL))
- predIds = self.getTaskPredecessorIds()
- succIds = self.getTaskSuccessorIds()
-
- for task in tasks:
- task['predecessor_ids'] = predIds.get(task['id'], [])
- task['successor_ids'] = succIds.get(task['id'], [])
return tasks
@@ -220,6 +214,13 @@ class RADatabase:
task = dict(result) if result else None
+ if task:
+ if task['predecessor_ids'] is None:
+ task['predecessor_ids'] = []
+
+ if task['successor_ids'] is None:
+ task['successor_ids'] = []
+
return task
def _convertTaskTypeAndStatusToIds(self, task_status, task_type):
--
GitLab