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

Merge pull request #5578 from jaredevantabor/host-event-stdout

Browse Source 
host event stdout changes
This commit is contained in:
Jared Tabor
2017-02-28 12:36:00 -08:00
committed by GitHub
parent 9db49d9819 9cbf9a5c47
commit 5592d44ec1
3 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
awx/ui/client/src/job-results/host-event/host-event-modal.partial.html
View File

@@ -33,7 +33,7 @@
</div> </div>
<div class="HostEvent-field"> <div class="HostEvent-field">
<span class="HostEvent-field--label">MODULE</span> <span class="HostEvent-field--label">MODULE</span>
<span class="HostEvent-field--content">{{module_name}}</span> <span class="HostEvent-field--content HostEvent-field--monospaceContent">{{module_name}}</span>
</div> </div>
</div> </div>

5
awx/ui/client/src/job-results/host-event/host-event.block.less
View File

@@ -126,6 +126,9 @@
max-width: 13em; max-width: 13em;
flex: 0 1 13em; flex: 0 1 13em;
} }
.HostEvent-field--monospaceContent{
font-family: monospace;
}
.HostEvent-details--left, .HostEvent-details--right{ .HostEvent-details--left, .HostEvent-details--right{
flex: 1 1 47%; flex: 1 1 47%;
} }
@@ -175,7 +178,7 @@
border-right: 1px solid #ccc; border-right: 1px solid #ccc;
border-bottom-left-radius: 5px; border-bottom-left-radius: 5px;
color: #999; color: #999;
font-family: monospace; font-family: Monaco, Menlo, Consolas, "Courier New", monospace;
position: fixed; position: fixed;
padding: 4px 3px 0 5px; padding: 4px 3px 0 5px;
text-align: right; text-align: right;

6
awx/ui/client/src/job-results/host-event/host-event.controller.js
View File

@@ -52,9 +52,9 @@
// grab standard out & standard error if present from the host // grab standard out & standard error if present from the host
// event's "res" object, for things like Ansible modules // event's "res" object, for things like Ansible modules
try{ try{
$scope.module_name = hostEvent.event_data.res.invocation.module_name || hostEvent.event_data.task_action || "No result found"; $scope.module_name = hostEvent.event_data.task_action || "No result found";
$scope.stdout = hostEvent.event_data.res.stdout; $scope.stdout = hostEvent.event_data.res.stdout ? hostEvent.event_data.res.stdout : hostEvent.event_data.res.stdout === "" ? " " : undefined;
$scope.stderr = hostEvent.event_data.res.stderr; $scope.stderr = hostEvent.event_data.res.stderr ? hostEvent.event_data.res.stderr : hostEvent.event_data.res.stderr === "" ? " " : undefined;
$scope.json = hostEvent.event_data.res; $scope.json = hostEvent.event_data.res;
} }
catch(err){ catch(err){