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

Merge pull request #2745 from mabashian/job-cancel-button

Browse Source 
Fix job cancel button icon
This commit is contained in:
Michael Abashian
2016-07-01 13:56:14 -04:00
committed by GitHub
parent 3bdc50dca6 03ab52ad07
commit 27abf03452
3 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
awx/ui/client/src/helpers/search.js
View File

@@ -343,6 +343,11 @@ export default
var i, modifier, var i, modifier,
widgets = (list.searchWidgets) ? list.searchWidgets : 1; widgets = (list.searchWidgets) ? list.searchWidgets : 1;
// Initialize SearchParams as an empty string if it's not defined. If we don't do this and SearchParams === undefined
// then 'undefined' will sneak into the string as we are concatenating and the request will never get sent since we
// regex search for 'undefined' in the doSearch section of this process.
scope[iterator + 'SearchParams'] = (!scope[iterator + 'SearchParams'] || scope[iterator + 'SearchParams'] === undefined) ? '' : scope[iterator + 'SearchParams'];
for (i = 1; i <= widgets; i++) { for (i = 1; i <= widgets; i++) {
modifier = (i === 1) ? '' : i; modifier = (i === 1) ? '' : i;
scope[iterator + 'HoldInput' + modifier] = true; scope[iterator + 'HoldInput' + modifier] = true;

3
awx/ui/client/src/shared/generator-helpers.js
View File

@@ -184,6 +184,9 @@ angular.module('GeneratorHelpers', [systemStatus.name])
case 'copy': case 'copy':
icon = "fa-copy"; icon = "fa-copy";
break; break;
case 'cancel':
icon = "fa-minus-circle";
break;
} }
icon += (size) ? " " + size : ""; icon += (size) ? " " + size : "";
return Icon(icon); return Icon(icon);

3
awx/ui/client/src/shared/list-generator/list-generator.factory.js
View File

@@ -545,8 +545,7 @@ export default ['$location', '$compile', '$rootScope', 'SearchWidget', 'Paginate
innerTable += (fAction.href) ? "href=\"" + fAction.href + "\" " : ""; innerTable += (fAction.href) ? "href=\"" + fAction.href + "\" " : "";
innerTable += (fAction.ngHref) ? "ng-href=\"" + fAction.ngHref + "\" " : ""; innerTable += (fAction.ngHref) ? "ng-href=\"" + fAction.ngHref + "\" " : "";
innerTable += "class=\"List-actionButton "; innerTable += "class=\"List-actionButton ";
innerTable += (field_action === 'delete') ? "List-actionButton--delete" : ""; innerTable += (field_action === 'delete' || field_action === 'cancel') ? "List-actionButton--delete" : "";
innerTable += (field_action === 'cancel') ? "cancel red-txt" : "";
innerTable += "\" "; innerTable += "\" ";
// rowBeingEdited === '{{ " + list.iterator + ".id }}' && listBeingEdited === '" + list.name + "' ? 'List-tableRow--selected' : ''"; // rowBeingEdited === '{{ " + list.iterator + ".id }}' && listBeingEdited === '" + list.name + "' ? 'List-tableRow--selected' : ''";
innerTable += (field_action === 'edit') ? "ng-class=\"[rowBeingEdited === '{{ " + list.iterator + ".id }}' && listBeingEdited === '" + list.name + "' ? 'List-editButton--selected' : '']\"" : ""; innerTable += (field_action === 'edit') ? "ng-class=\"[rowBeingEdited === '{{ " + list.iterator + ".id }}' && listBeingEdited === '" + list.name + "' ? 'List-editButton--selected' : '']\"" : "";