shaba/awx
1
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2024-10-31 23:51:09 +03:00
Code Releases Activity

Merge pull request #2699 from jlmitch5/fixLabelsIssues

Browse Source 
Fix labels issues
This commit is contained in:
jlmitch5 2016-06-29 17:11:35 -04:00 committed by GitHub
commit b0c899c6ff
3 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
awx/ui/client/src/job-templates/labels/labelsList.directive.js
View File

@ -7,7 +7,8 @@ export default
'ProcessErrors',
'Prompt',
'$q',
function(templateUrl, Wait, Rest, GetBasePath, ProcessErrors, Prompt, $q) {
'$filter',
function(templateUrl, Wait, Rest, GetBasePath, ProcessErrors, Prompt, $q, $filter) {
return {
restrict: 'E',
scope: false,
@ -49,15 +50,17 @@ export default
scope.deleteLabel = function(templateId, templateName, labelId, labelName) {
var action = function () {
$('#prompt-modal').modal('hide');
scope.seeMoreInactive = true;
Wait('start');
var url = GetBasePath("job_templates") + templateId + "/labels/";
Rest.setUrl(url);
Rest.post({"disassociate": true, "id": labelId})
.success(function () {
Wait('stop');
scope.search("job_template");
Wait('stop');
})
.error(function (data, status) {
Wait('stop');
ProcessErrors(scope, data, status, null, { hdr: 'Error!',
msg: 'Could not disacssociate label from JT. Call to ' + url + ' failed. DELETE returned status: ' + status });
});
@ -65,7 +68,7 @@ export default
Prompt({
hdr: 'Remove Label from ' + templateName,
body: '<div class="Prompt-bodyQuery">Confirm the removal of the <span class="Prompt-emphasis">' + labelName + '</span> label.</div>',
body: '<div class="Prompt-bodyQuery">Confirm the removal of the <span class="Prompt-emphasis">' + $filter('sanitize')(labelName) + '</span> label.</div>',
action: action,
actionText: 'REMOVE'
});

7
awx/ui/client/src/shared/Utilities.js
View File

@ -608,8 +608,8 @@ angular.module('Utilities', ['RestServices', 'Utilities', 'sanitizeFilter'])
* ]
* ```
*/
.factory('CreateSelect2', [
function () {
.factory('CreateSelect2', ['$filter',
function ($filter) {
return function (params) {
var element = params.element,
@ -641,6 +641,9 @@ angular.module('Utilities', ['RestServices', 'Utilities', 'sanitizeFilter'])
containerCssClass: 'Form-dropDown',
width: '100%',
minimumResultsForSearch: Infinity,
escapeMarkup: function(m) {
return $filter('sanitize')(m);
}
};
// multiple-choice directive calls select2 but needs to do so without this custom adapter

1
awx/ui/client/src/shared/prompt/prompt.less
View File

@ -3,6 +3,7 @@
.Prompt-bodyQuery {
margin-bottom: 20px;
color: @default-interface-txt;
word-break: break-word;
}
.Prompt-bodyTarget {