From 184430d0a2f1c5bb37881ddcea3fa57a1dfc8ad1 Mon Sep 17 00:00:00 2001 From: chouseknecht Date: Sun, 30 Jun 2013 03:59:39 -0400 Subject: [PATCH] AC-175 on Job Events page, Event is the now the only linkd or clickable column. Clicking expands or collapses parent nodes. --- awx/ui/static/js/lists/JobEvents.js | 5 ++--- awx/ui/static/lib/ansible/generator-helpers.js | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/awx/ui/static/js/lists/JobEvents.js b/awx/ui/static/js/lists/JobEvents.js index b402060fba..8dc69e7c7d 100644 --- a/awx/ui/static/js/lists/JobEvents.js +++ b/awx/ui/static/js/lists/JobEvents.js @@ -23,7 +23,7 @@ angular.module('JobEventsListDefinition', []) key: true, nosort: true, searchable: false, - ngClick: "viewJobEvent(\{\{ jobevent.id \}\})", + link: false }, status: { label: 'Status', @@ -38,13 +38,12 @@ angular.module('JobEventsListDefinition', []) event_display: { label: 'Event', hasChildren: true, - ngClick: "viewJobEvent(\{\{ jobevent.id \}\})", + ngClick: "toggleChildren(\{\{ jobevent.id \}\}, '\{\{ jobevent.related.children \}\}')", nosort: true, searchable: false }, host: { label: 'Host', - ngClick: "viewJobEvent(\{\{ jobevent.id \}\})", ngBind: 'jobevent.summary_fields.host.name', searchField: 'hosts__name', nosort: true, diff --git a/awx/ui/static/lib/ansible/generator-helpers.js b/awx/ui/static/lib/ansible/generator-helpers.js index 56b5943903..3b00c38b54 100644 --- a/awx/ui/static/lib/ansible/generator-helpers.js +++ b/awx/ui/static/lib/ansible/generator-helpers.js @@ -105,7 +105,7 @@ angular.module('GeneratorHelpers', ['GeneratorHelpers']) else if (field.ngClick) { html += ""; } - else { + else if (field.link == undefined || field.link) { html += ""; } }