Skip to content
Snippets Groups Projects
Commit 4ef63e51 authored by Jorrit Schaap's avatar Jorrit Schaap
Browse files

Task #8574: cascade ajax data load calls

parent 2df8931a
No related branches found
No related tags found
No related merge requests found
...@@ -80,6 +80,8 @@ dataControllerMod.controller('DataController', ...@@ -80,6 +80,8 @@ dataControllerMod.controller('DataController',
self.dataService.resources = result.resourceitems; self.dataService.resources = result.resourceitems;
self.dataService.resourceDict = toIdBasedDict(self.dataService.resources); self.dataService.resourceDict = toIdBasedDict(self.dataService.resources);
mapResourcesToGroups(); mapResourcesToGroups();
getResourceGroupClaims();
}); });
}; };
...@@ -95,6 +97,8 @@ dataControllerMod.controller('DataController', ...@@ -95,6 +97,8 @@ dataControllerMod.controller('DataController',
self.dataService.resourceGroups = result.resourcegroups; self.dataService.resourceGroups = result.resourcegroups;
self.dataService.resourceGroupsDict = toIdBasedDict(self.dataService.resourceGroups); self.dataService.resourceGroupsDict = toIdBasedDict(self.dataService.resourceGroups);
mapResourcesToGroups(); mapResourcesToGroups();
getResources();
}); });
}; };
...@@ -102,6 +106,8 @@ dataControllerMod.controller('DataController', ...@@ -102,6 +106,8 @@ dataControllerMod.controller('DataController',
$http.get('/rest/resourcegroupclaims').success(function(result) { $http.get('/rest/resourcegroupclaims').success(function(result) {
self.dataService.resourceGroupClaims = result.resourcegroupclaims; self.dataService.resourceGroupClaims = result.resourcegroupclaims;
self.dataService.resourceGroupClaimDict = toIdBasedDict(self.dataService.resourceGroupClaims); self.dataService.resourceGroupClaimDict = toIdBasedDict(self.dataService.resourceGroupClaims);
setTimeout(function() { getResourceClaims() }, 100);
}); });
}; };
...@@ -117,12 +123,9 @@ dataControllerMod.controller('DataController', ...@@ -117,12 +123,9 @@ dataControllerMod.controller('DataController',
}); });
}; };
getTasks();
getTaskTypes(); getTaskTypes();
getTaskStatusTypes(); getTaskStatusTypes();
getTasks();
getResourceGroups(); getResourceGroups();
getResourceGroupClaims();
getResources();
getResourceClaims();
} }
]); ]);
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment