zware/awx
1
0
Fork 0
mirror of https://github.com/ZwareBear/awx.git synced 2026-05-17 17:18:37 -05:00
Code Issues Packages Projects Releases Wiki Activity

Websockets live updating portal mode

Browse Source 
fixed issue with websockets not updating view in portal mode
This commit is contained in:
Jared Tabor
2014-11-05 13:07:23 -05:00
parent 43f46f830f
commit ae55f1c0d3
8 changed files with 43 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files
awx/ui/static/js/controllers/Jobs.js
+1 -2
View File
@@ -77,10 +77,9 @@ function JobsListController ($rootScope, $log, $scope, $compile, $routeParams, C
case 'pending':
case 'waiting':
queued_scope.search('queued_job');
break;
case 'successful':
completed_scope.search('completed_job');
break;
case 'successful':
case 'failed':
case 'error':
case 'canceled':
awx/ui/static/js/controllers/Portal.js
+30 -39
View File
@@ -79,7 +79,6 @@ function PortalController($scope, $compile, $routeParams, $rootScope, $location,
searchSize: 'col-lg-6 col-md-6'
});
$rootScope.flashMessage = null;
SearchInit({
scope: $scope,
@@ -120,48 +119,40 @@ function PortalController($scope, $compile, $routeParams, $rootScope, $location,
$('.list-well:eq(1)').css('margin-top' , '0px');
});
// function processEvent(event) {
// switch(event.status) {
// case 'running':
// jobs_scope.search('running_job');
// jobs_scope.search('queued_job');
// break;
// case 'new':
// case 'pending':
// case 'waiting':
// jobs_scope.search('queued_job');
// break;
// case 'successful':
// jobs_scope.search('completed_job');
// case 'failed':
// case 'error':
// case 'canceled':
// jobs_scope.search('completed_job');
// jobs_scope.search('running_job');
// jobs_scope.search('queued_job');
// }
// }
function processEvent(event) {
switch(event.status) {
case 'running':
jobs_scope.search('portal_job');
// queued_scope.search('queued_job');
break;
case 'new':
case 'pending':
jobs_scope.search('portal_job');
break;
case 'waiting':
jobs_scope.search('portal_job');
// completed_scope.search('completed_job');
break;
case 'successful':
// // console.log('successful');
// running_scope.search('running_job');
// completed_scope.search('completed_job');
// break;
case 'failed':
case 'error':
case 'canceled':
jobs_scope.search('portal_job');
// running_scope.search('running_job');
// queued_scope.search('queued_job');
}
}
if ($rootScope.removeJobStatusChange) {
$rootScope.removeJobStatusChange();
}
$rootScope.removeJobStatusChange = $rootScope.$on('JobStatusChange', function() {
jobs_scope.refreshJobs();
// if(data.status==='pending'){
// // $scope.refresh();
// $('#portal-jobs').empty();
// // $rootScope.flashMessage = null;
// PortalJobsWidget({
// scope: $scope,
// target: 'portal-jobs',
// searchSize: 'col-lg-6 col-md-6'
// });
// }
//x`processEvent(data);
$rootScope.removeJobStatusChange = $rootScope.$on('JobStatusChange', function(e, event) {
// jobs_scope.search('portal_job');
processEvent(event);
});