External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-07 01:17:37 -02:30
Code Issues Packages Projects Releases Wiki Activity

Fix up some minor issues so we can display job events

Browse Source
This commit is contained in:
Matthew Jones
2014-04-18 13:58:06 -04:00
parent af830ee50d
commit 007df8c5a6
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
awx/main/signals.py
View File

@@ -105,11 +105,10 @@ def emit_job_event_detail(sender, **kwargs):
event_data=instance.event_data, event_data=instance.event_data,
failed=instance.failed, failed=instance.failed,
changed=instance.changed, changed=instance.changed,
host=instance.host, host=instance.host.id,
play=instance.play, play=instance.play,
role=instance.role, role=instance.role,
task=instance.task, task=instance.task)
parent=instance.parent.id)
emit_websocket_notification('/socket.io/job_events', 'job_events-' + str(instance.id), event_serialized) emit_websocket_notification('/socket.io/job_events', 'job_events-' + str(instance.id), event_serialized)
post_save.connect(update_inventory_computed_fields, sender=Host) post_save.connect(update_inventory_computed_fields, sender=Host)

4
awx/ui/static/js/controllers/Sockets.js
View File

@@ -38,7 +38,7 @@ function SocketsController ($scope, $compile, ClearScope, Socket) {
e = angular.element(document.getElementById('jobs-container')); e = angular.element(document.getElementById('jobs-container'));
e.append(html); e.append(html);
$compile(e)(jobs_scope); $compile(e)(jobs_scope);
html = "<div class=\"alert alert-info\"><strong>Socket url</strong>: {{ socket_url }} &nbsp;<strong>Status:</strong> {{ socket_status }} {{ socket_reason }}</div>\n" + html = "<div class=\"alert alert-info\"><strong>Socket url</strong>: {{ socket_url }} &nbsp;<strong>Status:</strong> {{ socket_status }} {{ socket_reason }}</div>\n" +
"<form class=\"form-inline\">\n" + "<form class=\"form-inline\">\n" +
"<div class=\"form-group\">\n" + "<div class=\"form-group\">\n" +
@@ -78,7 +78,7 @@ function SocketsController ($scope, $compile, ClearScope, Socket) {
job_events_scope.subscribeToJobEvent = function() { job_events_scope.subscribeToJobEvent = function() {
job_events_scope.jobs_list.push(job_events_scope.job_id); job_events_scope.jobs_list.push(job_events_scope.job_id);
job_events_socket.on("job_events-" + job_events_scope.job_id, function(data) { job_events_socket.on("job_events-" + job_events_scope.job_id, function(data) {
jobs_scope.messages.push(data); job_events_scope.messages.push(data);
}); });
}; };
} }