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

AC-175 on Job Events page, Event is the now the only linkd or clickable column. Clicking expands or collapses parent nodes.

Browse Source
This commit is contained in:
chouseknecht
2013-06-30 03:59:39 -04:00
parent 1eb82e2f01
commit 184430d0a2
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -23,7 +23,7 @@ angular.module('JobEventsListDefinition', [])
key: true, key: true,
nosort: true, nosort: true,
searchable: false, searchable: false,
ngClick: "viewJobEvent(\{\{ jobevent.id \}\})", link: false
}, },
status: { status: {
label: 'Status', label: 'Status',
@@ -38,13 +38,12 @@ angular.module('JobEventsListDefinition', [])
event_display: { event_display: {
label: 'Event', label: 'Event',
hasChildren: true, hasChildren: true,
ngClick: "viewJobEvent(\{\{ jobevent.id \}\})", ngClick: "toggleChildren(\{\{ jobevent.id \}\}, '\{\{ jobevent.related.children \}\}')",
nosort: true, nosort: true,
searchable: false searchable: false
}, },
host: { host: {
label: 'Host', label: 'Host',
ngClick: "viewJobEvent(\{\{ jobevent.id \}\})",
ngBind: 'jobevent.summary_fields.host.name', ngBind: 'jobevent.summary_fields.host.name',
searchField: 'hosts__name', searchField: 'hosts__name',
nosort: true, nosort: true,

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

@@ -105,7 +105,7 @@ angular.module('GeneratorHelpers', ['GeneratorHelpers'])
else if (field.ngClick) { else if (field.ngClick) {
html += "<a href=\"\"" + Attr(field, 'ngClick') + "\">"; html += "<a href=\"\"" + Attr(field, 'ngClick') + "\">";
} }
else { else if (field.link == undefined || field.link) {
html += "<a href=\"#/" + base + "/{{" + list.iterator + ".id }}\">"; html += "<a href=\"#/" + base + "/{{" + list.iterator + ".id }}\">";
} }
} }