From c7ed4ffbf95d60002bcb3e20a76b585863bf85ed Mon Sep 17 00:00:00 2001
From: Jorrit Schaap <schaap@astron.nl>
Date: Tue, 22 Mar 2016 15:13:39 +0000
Subject: [PATCH] Task #8887: typo's
---
.../ResourceAssignmentDatabase/radb.py | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/SAS/ResourceAssignment/ResourceAssignmentDatabase/radb.py b/SAS/ResourceAssignment/ResourceAssignmentDatabase/radb.py
index c722819f9cc..1916e8235e5 100644
--- a/SAS/ResourceAssignment/ResourceAssignmentDatabase/radb.py
+++ b/SAS/ResourceAssignment/ResourceAssignmentDatabase/radb.py
@@ -830,7 +830,7 @@ class RADatabase:
self._executeQuery(query, values)
if validate:
- self.validateResourceClaimsStatus([self.getResourceClaims(resource_claim_ids)], commit=False)
+ self.validateResourceClaimsStatus(self.getResourceClaims(resource_claim_ids), commit=False)
self.validateResourceClaimsStatusForMovedClaims(claimsBeforeUpdate, commit=False)
if commit:
@@ -895,11 +895,6 @@ class RADatabase:
return self.validateResourceClaimsStatus(claims, commit)
def validateResourceClaimsStatus(self, claims, commit=True):
- # cache status_id's for conflift and claimed
- claimsStatuses = self.getResourceClaimStatuses()
- conflistStatusId = next(cs['id'] for cs in claimsStatuses if cs['name'] == 'conflict')
- claimedStatusId = next(cs['id'] for cs in claimsStatuses if cs['name'] == 'claimed')
-
resource_ids = [c['resource_id'] for c in claims]
task_ids = list(set(c['task_id'] for c in claims))
exclude_task_ids = [-t for t in task_ids]
@@ -908,6 +903,11 @@ class RADatabase:
logger.info("validating status of %d resource claim(s) for task_id(s) %s" % (len(claims), to_csv_string(task_ids)))
+ # cache status_id's for conflift and claimed
+ claimsStatuses = self.getResourceClaimStatuses()
+ conflistStatusId = next(cs['id'] for cs in claimsStatuses if cs['name'] == 'conflict')
+ claimedStatusId = next(cs['id'] for cs in claimsStatuses if cs['name'] == 'claimed')
+
# get all claims for given resource_ids, within the given timeframe
otherClaims = self.getResourceClaims(resource_ids=resource_ids,
lower_bound=min_starttime,
--
GitLab