From 4ef63e51b4920cd38b140c328ab34659e292c51a Mon Sep 17 00:00:00 2001
From: Jorrit Schaap <schaap@astron.nl>
Date: Tue, 17 Nov 2015 15:21:23 +0000
Subject: [PATCH] Task #8574: cascade ajax data load calls
---
.../lib/static/app/controllers/datacontroller.js | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/SAS/ResourceAssignment/ResourceAssignmentEditor/lib/static/app/controllers/datacontroller.js b/SAS/ResourceAssignment/ResourceAssignmentEditor/lib/static/app/controllers/datacontroller.js
index 6201fef3342..228ebb01b1a 100644
--- a/SAS/ResourceAssignment/ResourceAssignmentEditor/lib/static/app/controllers/datacontroller.js
+++ b/SAS/ResourceAssignment/ResourceAssignmentEditor/lib/static/app/controllers/datacontroller.js
@@ -80,6 +80,8 @@ dataControllerMod.controller('DataController',
self.dataService.resources = result.resourceitems;
self.dataService.resourceDict = toIdBasedDict(self.dataService.resources);
mapResourcesToGroups();
+
+ getResourceGroupClaims();
});
};
@@ -95,6 +97,8 @@ dataControllerMod.controller('DataController',
self.dataService.resourceGroups = result.resourcegroups;
self.dataService.resourceGroupsDict = toIdBasedDict(self.dataService.resourceGroups);
mapResourcesToGroups();
+
+ getResources();
});
};
@@ -102,6 +106,8 @@ dataControllerMod.controller('DataController',
$http.get('/rest/resourcegroupclaims').success(function(result) {
self.dataService.resourceGroupClaims = result.resourcegroupclaims;
self.dataService.resourceGroupClaimDict = toIdBasedDict(self.dataService.resourceGroupClaims);
+
+ setTimeout(function() { getResourceClaims() }, 100);
});
};
@@ -117,12 +123,9 @@ dataControllerMod.controller('DataController',
});
};
- getTasks();
getTaskTypes();
getTaskStatusTypes();
+ getTasks();
getResourceGroups();
- getResourceGroupClaims();
- getResources();
- getResourceClaims();
}
]);
--
GitLab