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

Got rid of the location url regex for sockets and started using the $state.is().

Browse Source
This commit is contained in:
Michael Abashian
2016-03-02 09:04:11 -05:00
parent fb0b760216
commit 268f5165f7
1 changed files with 13 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
awx/ui/client/src/app.js
View File

@@ -898,9 +898,9 @@ var tower = angular.module('Tower', [
}]); }]);
}]) }])
.run(['$q', '$compile', '$cookieStore', '$rootScope', '$log', 'CheckLicense', '$location', 'Authorization', 'LoadBasePaths', 'Timer', 'ClearScope', 'Socket', .run(['$q', '$compile', '$cookieStore', '$rootScope', '$log', '$state', 'CheckLicense', '$location', 'Authorization', 'LoadBasePaths', 'Timer', 'ClearScope', 'Socket',
'LoadConfig', 'Store', 'ShowSocketHelp', 'AboutAnsibleHelp', 'pendoService', 'LoadConfig', 'Store', 'ShowSocketHelp', 'AboutAnsibleHelp', 'pendoService',
function ($q, $compile, $cookieStore, $rootScope, $log, CheckLicense, $location, Authorization, LoadBasePaths, Timer, ClearScope, Socket, function ($q, $compile, $cookieStore, $rootScope, $log, $state, CheckLicense, $location, Authorization, LoadBasePaths, Timer, ClearScope, Socket,
LoadConfig, Store, ShowSocketHelp, AboutAnsibleHelp, pendoService) { LoadConfig, Store, ShowSocketHelp, AboutAnsibleHelp, pendoService) {
@@ -976,33 +976,28 @@ var tower = angular.module('Tower', [
' status changed to ' + data.status + ' status changed to ' + data.status +
' send to ' + $location.$$url); ' send to ' + $location.$$url);
var urlToCheck = $location.$$url;
if (urlToCheck.indexOf("?") !== -1) {
urlToCheck = urlToCheck.substr(0, urlToCheck.indexOf("?"));
}
// this acts as a router...it emits the proper // this acts as a router...it emits the proper
// value based on what URL the user is currently // value based on what URL the user is currently
// accessing. // accessing.
if (urlToCheck === '/jobs') { if ($state.is('jobs')) {
$rootScope.$emit('JobStatusChange-jobs', data); $rootScope.$emit('JobStatusChange-jobs', data);
} else if (/\/jobs\/(\d)+\/stdout/.test(urlToCheck) || } else if ($state.is('jobDetail') ||
/\/ad_hoc_commands\/(\d)+/.test(urlToCheck) || $state.is('adHocJobStdout') ||
/\/inventory_sync\/(\d)+/.test(urlToCheck) || $state.is('inventorySyncStdout') ||
/\/management_job\/(\d)+/.test(urlToCheck) || $state.is('managementJobStdout') ||
/\/scm_update\/(\d)+/.test(urlToCheck)) { $state.is('scmUpdateStdout') {
$log.debug("sending status to standard out"); $log.debug("sending status to standard out");
$rootScope.$emit('JobStatusChange-jobStdout', data); $rootScope.$emit('JobStatusChange-jobStdout', data);
} else if (/\/jobs\/(\d)+/.test(urlToCheck)) { } else if ($state.is('jobDetail')) {
$rootScope.$emit('JobStatusChange-jobDetails', data); $rootScope.$emit('JobStatusChange-jobDetails', data);
} else if (urlToCheck === '/home') { } else if ($state.is('dashboard')) {
$rootScope.$emit('JobStatusChange-home', data); $rootScope.$emit('JobStatusChange-home', data);
} else if (urlToCheck === '/portal') { } else if ($state.is('portal')) {
$rootScope.$emit('JobStatusChange-portal', data); $rootScope.$emit('JobStatusChange-portal', data);
} else if (urlToCheck === '/projects') { } else if ($state.is('projects')) {
$rootScope.$emit('JobStatusChange-projects', data); $rootScope.$emit('JobStatusChange-projects', data);
} else if (/\/inventories\/(\d)+\/manage/.test(urlToCheck)) { } else if ($state.is('inventoryManage')) {
$rootScope.$emit('JobStatusChange-inventory', data); $rootScope.$emit('JobStatusChange-inventory', data);
} }
}); });