External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-01-19 13:41:28 -03:30
Code Issues Packages Projects Releases Wiki Activity

Fixed bug where labels that matched existing labels appeared to be getting combined on JT create/edit

Browse Source
This commit is contained in:
Michael Abashian 2016-06-16 13:47:51 -04:00
parent 27f0224b90
commit 5a7cbd90c6
2 changed files with 22 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
awx/ui/client/src/job-templates/add/job-templates-add.controller.js
View File

@ -513,8 +513,19 @@
data.survey_enabled = ($scope.survey_enabled &&
$scope.survey_exists) ? $scope.survey_enabled : false;
// The idea here is that we want to find the new option elements that also have a label that exists in the dom
$("#job_templates_labels > option").filter("[data-select2-tag=true]").each(function(optionIndex, option) {
$("#job_templates_labels").siblings(".select2").first().find(".select2-selection__choice").each(function(labelIndex, label) {
if($(option).text() === $(label).attr('title')) {
// Mark that the option has a label present so that we can filter by that down below
$(option).attr('data-label-is-present', true);
}
});
});
$scope.newLabels = $("#job_templates_labels > option")
.filter("[data-select2-tag=true]")
.filter("[data-label-is-present=true]")
.map((i, val) => ({name: $(val).text()}));
Rest.setUrl(defaultUrl);

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

@ -630,8 +630,19 @@ export default
data.survey_enabled = ($scope.survey_enabled &&
$scope.survey_exists) ? $scope.survey_enabled : false;
// The idea here is that we want to find the new option elements that also have a label that exists in the dom
$("#job_templates_labels > option").filter("[data-select2-tag=true]").each(function(optionIndex, option) {
$("#job_templates_labels").siblings(".select2").first().find(".select2-selection__choice").each(function(labelIndex, label) {
if($(option).text() === $(label).attr('title')) {
// Mark that the option has a label present so that we can filter by that down below
$(option).attr('data-label-is-present', true);
}
});
});
$scope.newLabels = $("#job_templates_labels > option")
.filter("[data-select2-tag=true]")
.filter("[data-label-is-present=true]")
.map((i, val) => ({name: $(val).text()}));
Rest.setUrl(defaultUrl + $state.params.id);