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

Schedules / Activity Stream

Browse Source 
Changed status_change to schedule_change in schedules socket on test page. Started fixing activity stream brokeness.
This commit is contained in:
Chris Houseknecht
2014-07-17 16:45:46 -04:00
parent e17a9a9e1d
commit 4df2fbc38f
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -91,7 +91,7 @@ function SocketsController ($scope, $compile, ClearScope, Socket) {
test_scope.messages.push(data); test_scope.messages.push(data);
}); });
schedules_socket.on("status_changed", function(data) { schedules_socket.on("schedule_changed", function(data) {
schedules_scope.messages.push(data); schedules_scope.messages.push(data);
}); });

6
awx/ui/static/js/widgets/Stream.js
View File

@@ -19,9 +19,9 @@ angular.module('StreamWidget', ['RestServices', 'Utilities', 'StreamListDefiniti
// Try not to overlap footer. Because stream is positioned absolute, the parent // Try not to overlap footer. Because stream is positioned absolute, the parent
// doesn't resize correctly when stream is loaded. // doesn't resize correctly when stream is loaded.
var sheight = $('#stream-content').height(), var sheight = $('#stream-content').height(),
theight = parseInt($('#tab-content-container').css('min-height').replace(/px/, '')), theight = parseInt($('#main-view').css('min-height').replace(/px/, '')),
height = (theight < sheight) ? sheight : theight; height = (theight < sheight) ? sheight : theight;
$('#tab-content-container').css({ $('#main-view').css({
"min-height": height "min-height": height
}); });
}; };
@@ -79,7 +79,7 @@ angular.module('StreamWidget', ['RestServices', 'Utilities', 'StreamListDefiniti
stream.detach(); stream.detach();
stream.empty(); stream.empty();
stream.unbind(); stream.unbind();
$('#tab-content-container').css({ $('#main-view').css({
'min-height': 0 'min-height': 0
}); //let the parent height go back to normal }); //let the parent height go back to normal
}, 500); }, 500);