From 46cd3de4bab78a457bae3cc1764b827eafa443a2 Mon Sep 17 00:00:00 2001
From: Jorrit Schaap <schaap@astron.nl>
Date: Thu, 17 Mar 2016 15:43:15 +0000
Subject: [PATCH] Task #8887: only reset taks conflict status to prescheduled
---
SAS/ResourceAssignment/ResourceAssignmentDatabase/radb.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/SAS/ResourceAssignment/ResourceAssignmentDatabase/radb.py b/SAS/ResourceAssignment/ResourceAssignmentDatabase/radb.py
index 60b603cd051..6ff7d8906fa 100644
--- a/SAS/ResourceAssignment/ResourceAssignmentDatabase/radb.py
+++ b/SAS/ResourceAssignment/ResourceAssignmentDatabase/radb.py
@@ -861,7 +861,7 @@ class RADatabase:
for task_id in task_ids:
if self.getResourceClaims(task_id=task_id, status=conflistStatusId):
self.updateTask(task_id=task_id, task_status='conflict', commit=False)
- else:
+ elif self.getTask(task_id)['status'] == 'conflict':
self.updateTask(task_id=task_id, task_status='prescheduled', commit=False)
if commit:
--
GitLab