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

local_settings

Browse Source 
Fixed more bits where undefined $AnsibleConfig was breaking things.
This commit is contained in:
Chris Houseknecht
2014-07-25 14:16:15 -04:00
parent 7139b5b25a
commit f8d70f03ea
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
awx/ui/static/js/app.js
View File

@@ -413,7 +413,7 @@ angular.module('Tower', [
function ($compile, $cookieStore, $rootScope, $log, CheckLicense, $location, Authorization, LoadBasePaths, ViewLicense, function ($compile, $cookieStore, $rootScope, $log, CheckLicense, $location, Authorization, LoadBasePaths, ViewLicense,
Timer, ClearScope, HideStream, Socket, LoadConfig) { Timer, ClearScope, HideStream, Socket, LoadConfig) {
var e, html, sock, checkCount; var e, html, sock, checkCount = 0;
function detectBrowser() { function detectBrowser() {
var ua = window.navigator.userAgent, var ua = window.navigator.userAgent,
@@ -586,7 +586,7 @@ angular.module('Tower', [
else { else {
checkCount = 0; checkCount = 0;
} }
}, 3000); }, 5000);
}); });
LoadConfig(); LoadConfig();

2
awx/ui/static/lib/ansible/RestServices.js
View File

@@ -17,7 +17,7 @@ angular.module('RestServices', ['ngCookies', 'AuthService'])
this.url = url; this.url = url;
}, },
checkExpired: function () { checkExpired: function () {
return $rootScope.sessionTimer.isExpired(); return ($rootScope.sessionTimer) ? $rootScope.sessionTimer.isExpired() : false;
}, },
pReplace: function () { pReplace: function () {
//in our url, replace :xx params with a value, assuming //in our url, replace :xx params with a value, assuming

2
awx/ui/static/lib/ansible/directives.js
View File

@@ -233,7 +233,7 @@ angular.module('AWDirectives', ['RestServices', 'Utilities', 'AuthService', 'Job
*/ */
.directive('awToolTip', function() { .directive('awToolTip', function() {
return function(scope, element, attrs) { return function(scope, element, attrs) {
var delay = (attrs.delay !== undefined && attrs.delay !== null) ? attrs.delay : $AnsibleConfig.tooltip_delay, var delay = (attrs.delay !== undefined && attrs.delay !== null) ? attrs.delay : ($AnsibleConfig) ? $AnsibleConfig.tooltip_delay : {show: 500, hide: 100},
placement; placement;
if (attrs.awTipPlacement) { if (attrs.awTipPlacement) {
placement = attrs.awTipPlacement; placement = attrs.awTipPlacement;