External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-03-23 20:05:03 -02:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2836 from jlmitch5/fixLabelDelete

Browse Source 
made lebel delete find all associated labels by recursively getting labels
This commit is contained in:
jlmitch5
2016-07-07 10:27:14 -04:00
committed by GitHub
parent b6ec87f18a 1977af41ac
commit bfb8781b02
1 changed files with 22 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
awx/ui/client/src/job-templates/edit/job-templates-edit.controller.js
View File

@@ -512,16 +512,33 @@ export default
} }
var orgDefer = $q.defer(); var orgDefer = $q.defer();
var associationDefer = $q.defer(); var associationDefer = $q.defer();
var associatedLabelsDefer = $q.defer();
var getNext = function(data, arr, resolve) {
Rest.setUrl(data.next);
Rest.get()
.success(function (data) {
if (data.next) {
getNext(data, arr.concat(data.results), resolve);
} else {
resolve.resolve(arr.concat(data.results));
}
});
};
Rest.setUrl(data.related.labels); Rest.setUrl(data.related.labels);
var currentLabels = Rest.get() Rest.get()
.then(function(data) { .success(function(data) {
return data.data.results if (data.next) {
.map(val => val.id); getNext(data, data.results, associatedLabelsDefer);
} else {
associatedLabelsDefer.resolve(data.results);
}
}); });
currentLabels.then(function (current) { associatedLabelsDefer.promise.then(function (current) {
current = current.map(data => data.id);
var labelsToAdd = $scope.labels var labelsToAdd = $scope.labels
.map(val => val.value); .map(val => val.value);
var labelsToDisassociate = current var labelsToDisassociate = current