External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-03-27 13:55:04 -02:30
Code Issues Packages Projects Releases Wiki Activity

Synced code between list view and related list view. Column displaying icon with text rather than actual value (i.e. true/false for has_active_failures) works consistently. Changed icon and text for our has_active_failures column -preparing it to link to hosts/N/job_events data.

Browse Source
This commit is contained in:
chouseknecht
2013-06-14 12:17:31 -04:00
parent 703bc0fca1
commit ab9b9f84c5
16 changed files with 791 additions and 1113 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -758,31 +758,52 @@ angular.module('FormGenerator', ['GeneratorHelpers'])
html += "<td ";
html += (rfield['class']) ? 'class="'+ rfield['class'] + '"' : "";
html += ">";
if (rfield.icon) {
if (rfield.ngShowIcon) {
html += "<i ng-show=\"" + rfield.ngShowIcon + "\" class=\"" + rfield.icon + "\"></i>";
// Add ngShow
html += (rfield.ngShow) ? "<span " + this.attr(rfield,'ngShow') + ">" : "";
// Start link:/linkTo:/ngClick:
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 += this.icon(rfield.icon);
html += "<a href=\"#/" + base + "/{{" + form.related[itm].iterator + ".id }}\">";
}
}
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>";
}
// Add icon:
if (rfield.ngShowIcon) {
html += "<i ng-show=\"" + rfield.ngShowIcon + "\" class=\"" + rfield.icon + "\"></i> ";
}
else {
html += this.icon(rfield.icon) + " ";
}
// Add data binds
if (rfield.showValue == undefined || rfield.showValue == true) {
if (rfield.ngBind) {
html += "{{ " + rfield.ngBind + " }}";
}
else {
html += "{{" + form.related[itm].iterator + "." + fld + "}}";
}
}
// Add additional text:
if (rfield.text) {
html += rfield.text;
}
// close the link
html += (rfield.key || rfield.link || rfield.linkTo || rfield.ngClick) ? "</a>" : "";
// close ngShow
html += (rfield.ngShow) ? "</span>" : "";
html += "</td>\n";
}

28
ansibleworks/ui/static/lib/ansible/list-generator.js
View File

@@ -227,6 +227,11 @@ angular.module('ListGenerator', ['GeneratorHelpers'])
html += "\" ";
html += (list.fields[fld].ngClass) ? this.attr(list.fields[fld], 'ngClass') : "";
html += ">\n";
// Add ngShow
html += (list.fields[fld].ngShow) ? "<span " + this.attr(list.fields[fld],'ngShow') + ">" : "";
// Start the Link
if ((list.fields[fld].key || list.fields[fld].link || list.fields[fld].linkTo || list.fields[fld].ngClick )
&& options.mode != 'lookup' && options.mode != 'select') {
if (list.fields[fld].linkTo) {
@@ -239,14 +244,16 @@ angular.module('ListGenerator', ['GeneratorHelpers'])
html += "<a href=\"#/" + base + "/{{" + list.iterator + ".id }}\">";
}
}
// Add icon:
if (list.fields[fld].ngShowIcon) {
html += "<i ng-show=\"" + list.fields[fld].ngShowIcon + "\" class=\"" + list.fields[fld].icon + "\"></i>";
html += "<i ng-show=\"" + list.fields[fld].ngShowIcon + "\" class=\"" + list.fields[fld].icon + "\"></i> ";
}
else {
html += this.icon(list.fields[fld].icon);
html += this.icon(list.fields[fld].icon) + " ";
}
// Add data binds
if (list.fields[fld].showValue == undefined || list.fields[fld].showValue == true) {
if (list.fields[fld].ngBind) {
html += "{{ " + list.fields[fld].ngBind + " }}";
@@ -255,8 +262,21 @@ angular.module('ListGenerator', ['GeneratorHelpers'])
html += "{{" + list.iterator + "." + fld + "}}";
}
}
// Add additional text:
if (list.fields[fld].text) {
html += list.fields[fld].text;
}
// close the link
if ((list.fields[fld].key || list.fields[fld].link || list.fields[fld].linkTo || list.fields[fld].ngClick )
&& options.mode != 'lookup' && options.mode != 'select') {
html += "</a>";
}
// close ngShow
html += (list.fields[fld].ngShow) ? "</span>" : "";
html += ((list.fields[fld].key || list.fields[fld].link) && options.mode != 'lookup' && options.mode != 'select') ? "</a>" : "";
html += "</td>\n";
}