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

Removed Status filter from Job Events page. Changed form attribute 'notSearchable' to 'searchable' -cause it just makes more sense.

Browse Source
This commit is contained in:
chouseknecht 2013-06-28 11:40:31 -04:00
parent 7065086a1c
commit 114bc05b8d
4 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
awx/ui/static/js/helpers/search.js
View File

@ -37,7 +37,7 @@ angular.module('SearchHelper', ['RestServices', 'Utilities', 'RefreshHelper'])
else {
sort_order = (list.fields[fld].desc) ? '-' + fld : fld;
}
if (list.fields[fld].notSearchable == undefined || list.fields[fld].notSearchable == false) {
if (list.fields[fld].searchable == undefined || list.fields[fld].searchable == true) {
scope[iterator + 'SearchField'] = fld;
scope[iterator + 'SearchFieldLabel'] = list.fields[fld].label;
}
@ -46,9 +46,9 @@ angular.module('SearchHelper', ['RestServices', 'Utilities', 'RefreshHelper'])
}
if (!scope[iterator + 'SearchField']) {
// A field marked as key may also be notSearchable
// A field marked as key may not be 'searchable'
for (fld in list.fields) {
if (list.fields[fld].notSearchable == undefined || list.fields[fld].notSearchable == false) {
if (list.fields[fld].searchable == undefined || list.fields[fld].searchable == true) {
scope[iterator + 'SearchField'] = fld;
scope[iterator + 'SearchFieldLabel'] = list.fields[fld].label;
break;

7
awx/ui/static/js/lists/JobEvents.js
View File

@ -22,7 +22,7 @@ angular.module('JobEventsListDefinition', [])
label: 'Date',
key: true,
nosort: true,
notSearchable: true,
searchable: false,
ngClick: "viewJobEvent(\{\{ jobevent.id \}\})",
},
event_display: {
@ -30,7 +30,7 @@ angular.module('JobEventsListDefinition', [])
hasChildren: true,
ngClick: "viewJobEvent(\{\{ jobevent.id \}\})",
nosort: true,
notSearchable: true
searchable: false
},
host: {
label: 'Host',
@ -47,7 +47,8 @@ angular.module('JobEventsListDefinition', [])
searchField: 'failed',
searchType: 'boolean',
searchOptions: [{ name: "success", value: 0 }, { name: "error", value: 1 }],
nosort: true
nosort: true,
searchable: false,
}
},

8
awx/ui/static/js/lists/JobHosts.js
View File

@ -27,11 +27,11 @@ angular.module('JobHostDefinition', [])
},
ok: {
label: 'Success',
notSearchable: true
searchable: false
},
changed: {
label: 'Changed',
notSearchable: true
searchable: false
},
failures: {
label: 'Failure',
@ -39,11 +39,11 @@ angular.module('JobHostDefinition', [])
},
dark: {
label: 'Unreachable',
notSearchable: true
searchable: false
},
skipped: {
label: 'Skipped',
notSearchable: true
searchable: false
}
},

2
awx/ui/static/lib/ansible/generator-helpers.js
View File

@ -177,7 +177,7 @@ angular.module('GeneratorHelpers', ['GeneratorHelpers'])
html += "<ul class=\"dropdown-menu\" id=\"" + iterator + "SearchDropdown\">\n";
for ( var fld in form.fields) {
if (form.fields[fld].notSearchable == undefined || form.fields[fld].notSearchable == false) {
if (form.fields[fld].searchable == undefined || form.fields[fld].searchable == true) {
html += "<li><a href=\"\" ng-click=\"setSearchField('" + iterator + "','";
html += fld + "','" + form.fields[fld].label + "')\">"
+ form.fields[fld].label + "</a></li>\n";