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

changes from PR feedback: removing ghost action icon

Browse Source 
and fixing a bug where the list of job templates was improperly
updated when a job was running and live events were received.
This commit is contained in:
Jared Tabor
2017-10-26 16:50:12 -07:00
parent 5e349590fd
commit 4fbfddaa93
2 changed files with 24 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
awx/ui/client/src/projects/projects-templates.route.js
View File

@@ -33,6 +33,7 @@ export default {
ListDefinition: ['TemplateList', '$transition$', (TemplateList, $transition$) => { ListDefinition: ['TemplateList', '$transition$', (TemplateList, $transition$) => {
let id = $transition$.params().project_id; let id = $transition$.params().project_id;
TemplateList.actions.add.ngClick = `$state.go('templates.addJobTemplate', {project_id: ${id}})`; TemplateList.actions.add.ngClick = `$state.go('templates.addJobTemplate', {project_id: ${id}})`;
TemplateList.basePath = 'job_templates';
return TemplateList; return TemplateList;
}], }],
Dataset: ['ListDefinition', 'QuerySet', '$stateParams', 'GetBasePath', '$interpolate', '$rootScope', Dataset: ['ListDefinition', 'QuerySet', '$stateParams', 'GetBasePath', '$interpolate', '$rootScope',

44
awx/ui/client/src/shared/form-generator.js
View File

@@ -1950,29 +1950,31 @@ angular.module('FormGenerator', [GeneratorHelpers.name, 'Utilities', listGenerat
if (collection.fieldActions) { if (collection.fieldActions) {
html += "<td class=\"List-actionsContainer\"><div class=\"List-tableCell List-actionButtonCell actions\">"; html += "<td class=\"List-actionsContainer\"><div class=\"List-tableCell List-actionButtonCell actions\">";
for (act in collection.fieldActions) { for (act in collection.fieldActions) {
fAction = collection.fieldActions[act]; if (act !== 'columnClass') {
html += "<button id=\"" + ((fAction.id) ? fAction.id : act + "-action") + "\" "; fAction = collection.fieldActions[act];
html += (fAction.awToolTip) ? 'aw-tool-tip="' + fAction.awToolTip + '"' : ''; html += "<button id=\"" + ((fAction.id) ? fAction.id : act + "-action") + "\" ";
html += (fAction.dataPlacement) ? 'data-placement="' + fAction.dataPlacement + '"' : ''; html += (fAction.awToolTip) ? 'aw-tool-tip="' + fAction.awToolTip + '"' : '';
html += (fAction.href) ? "href=\"" + fAction.href + "\" " : ""; html += (fAction.dataPlacement) ? 'data-placement="' + fAction.dataPlacement + '"' : '';
html += (fAction.ngClick) ? this.attr(fAction, 'ngClick') : ""; html += (fAction.href) ? "href=\"" + fAction.href + "\" " : "";
html += (fAction.ngHref) ? this.attr(fAction, 'ngHref') : ""; html += (fAction.ngClick) ? this.attr(fAction, 'ngClick') : "";
html += (fAction.ngShow) ? this.attr(fAction, 'ngShow') : ""; html += (fAction.ngHref) ? this.attr(fAction, 'ngHref') : "";
html += " class=\"List-actionButton "; html += (fAction.ngShow) ? this.attr(fAction, 'ngShow') : "";
html += (act === 'delete') ? "List-actionButton--delete" : ""; html += " class=\"List-actionButton ";
html += "\""; html += (act === 'delete') ? "List-actionButton--delete" : "";
html += "\"";
html += ">"; html += ">";
if (fAction.iconClass) { if (fAction.iconClass) {
html += "<i class=\"" + fAction.iconClass + "\"></i>"; html += "<i class=\"" + fAction.iconClass + "\"></i>";
} else { } else {
html += SelectIcon({ html += SelectIcon({
action: act action: act
}); });
}
// html += SelectIcon({ action: act });
//html += (fAction.label) ? "<span class=\"list-action-label\"> " + fAction.label + "</span>": "";
html += "</button>";
} }
// html += SelectIcon({ action: act });
//html += (fAction.label) ? "<span class=\"list-action-label\"> " + fAction.label + "</span>": "";
html += "</button>";
} }
html += "</div></td>"; html += "</div></td>";
html += "</tr>\n"; html += "</tr>\n";