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

Added has_active_failures to Hosts view under Inventory detail. There is now a Failures column. A red dot (icon-circle) displays for hosts where has_active_failures == true, otherwise the column is empty.

Browse Source
This commit is contained in:
chouseknecht 2013-06-12 16:12:07 -04:00
parent 3bb0323b02
commit 614607fd0e
4 changed files with 38 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ansibleworks/ui/static/css/ansible-ui.css
View File

@ -290,6 +290,7 @@
/* Jobs page */
.job-error, .job-failed,
.active-failures-true,
input[type="text"].job-failed,
input[type="text"].job-error
{
@ -305,6 +306,7 @@
.job-running,
.job-success,
.job-successful,
.active-failures-false,
input[type="text"].job-success,
input[type="text"].job-successful
{

10
ansibleworks/ui/static/js/forms/Inventories.js
View File

@ -92,6 +92,16 @@ angular.module('InventoryFormDefinition', [])
},
description: {
label: 'Description'
},
has_active_failures: {
label: 'Failures',
showValue: false,
ngShow: "\{\{ host.has_active_failures \}\}",
icon: 'icon-circle',
"class": 'active-failures-\{\{ host.has_active_failures \}\}',
searchField: 'has_active_failures',
searchType: 'boolean',
searchOptions: [{ name: "No", value: 0 }, { name: "Yes", value: 1 }]
}
},

34
ansibleworks/ui/static/lib/ansible/form-generator.js
View File

@ -753,21 +753,33 @@ angular.module('FormGenerator', ['GeneratorHelpers'])
for (var fld in form.related[itm].fields) {
cnt++;
rfield = form.related[itm].fields[fld];
html += "<td>";
if ((rfield.key || rfield.link || rfield.linkTo || rfield.ngClick )) {
if (rfield.linkTo) {
html += "<a href=\"#" + rfield.linkTo + "\">";
}
else if (rfield.ngClick) {
html += "<a href=\"\"" + this.attr(rfield, 'ngClick') + "\">";
html += "<td ";
html += (rfield['class']) ? 'class="'+ rfield['class'] + '"' : "";
html += ">";
if (rfield.icon) {
if (rfield.ngShow) {
html += "<i ng-show=\"" + rfield.ngShow + "\" class=\"" + rfield.icon + "\"></i>";
}
else {
html += "<a href=\"#/" + base + "/{{" + form.related[itm].iterator + ".id }}\">";
html += this.attr(rfield,'icon');
}
}
html += "{{ " + form.related[itm].iterator + "." + fld + " }}";
if ((rfield.key || rfield.link || rfield.linkTo || rfield.ngClick )) {
html += "</a>";
if (rfield.showValue == undefined || rfield.showValue == true) {
if ((rfield.key || rfield.link || rfield.linkTo || rfield.ngClick )) {
if (rfield.linkTo) {
html += "<a href=\"#" + rfield.linkTo + "\">";
}
else if (rfield.ngClick) {
html += "<a href=\"\"" + this.attr(rfield, 'ngClick') + "\">";
}
else {
html += "<a href=\"#/" + base + "/{{" + form.related[itm].iterator + ".id }}\">";
}
}
html += "{{ " + form.related[itm].iterator + "." + fld + " }}";
if ((rfield.key || rfield.link || rfield.linkTo || rfield.ngClick )) {
html += "</a>";
}
}
html += "</td>\n";
}

4
ansibleworks/ui/static/lib/ansible/generator-helpers.js
View File

@ -42,7 +42,9 @@ angular.module('GeneratorHelpers', [])
html += "</div>\n";
html += "<select ng-show=\"" + iterator + "SelectShow\" ng-model=\""+ iterator + "SearchSelectValue\" ng-change=\"search('" + iterator + "')\" ";
html += "ng-options=\"c.name for c in " + iterator + "SearchSelectOpts\" class=\"search-select\"></select>\n";
html += "ng-options=\"c.name for c in " + iterator + "SearchSelectOpts\" class=\"search-select";
html += (useMini) ? " field-mini-height" : "";
html += "\"></select>\n";
html += "<input ng-hide=\"" + iterator + "SelectShow || " + iterator + "InputHide\" class=\"input-medium";
html += (useMini) ? " field-mini-height" : "";