From 81d32e216def0d92ed5179d81859e9187581d4ba Mon Sep 17 00:00:00 2001 From: Jared Tabor Date: Thu, 7 Jul 2016 14:27:39 -0700 Subject: [PATCH] fixing tooltip for host events on job detail panel --- awx/ui/client/src/job-detail/job-detail.partial.html | 2 +- awx/ui/client/src/job-detail/job-detail.service.js | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/awx/ui/client/src/job-detail/job-detail.partial.html b/awx/ui/client/src/job-detail/job-detail.partial.html index 578e17510f..18c90cf646 100644 --- a/awx/ui/client/src/job-detail/job-detail.partial.html +++ b/awx/ui/client/src/job-detail/job-detail.partial.html @@ -354,7 +354,7 @@ - {{ result.name }}{{ result.name }} + {{ result.name }}{{ result.name }} {{ result.item }} {{ result.msg }} diff --git a/awx/ui/client/src/job-detail/job-detail.service.js b/awx/ui/client/src/job-detail/job-detail.service.js index 080339e7dd..e5578349a5 100644 --- a/awx/ui/client/src/job-detail/job-detail.service.js +++ b/awx/ui/client/src/job-detail/job-detail.service.js @@ -39,6 +39,13 @@ export default } catch(err){return;} }, + processsEventTip: function(event, status){ + try{ + var string = `Event ID: ${ event.id }
Status: ${ _.capitalize(status.status)}. Click for details`; + return typeof item === 'object' ? JSON.stringify(string) : string; + } + catch(err){return;} + }, // Generate a helper class for job_event statuses // the stack for which status to display is // unreachable > failed > changed > ok @@ -88,6 +95,7 @@ export default var status = self.processEventStatus(event); var msg = self.processEventMsg(event); var item = self.processEventItem(event); + var tip = self.processsEventTip(event, status); results.push({ id: event.id, status: status.status, @@ -96,6 +104,7 @@ export default task_id: event.parent, name: event.event_data.host, created: event.created, + tip: typeof tip === 'undefined' ? undefined : tip, msg: typeof msg === 'undefined' ? undefined : msg, item: typeof item === 'undefined' ? undefined : item });