Fix redirection URLs in JavaScript
This commit is contained in:
parent
54103124e8
commit
af5489bf57
|
@ -79,10 +79,14 @@
|
|||
} else {
|
||||
newAddress = baseAddress;
|
||||
}
|
||||
|
||||
if (/theme=mobile/.test(window.location.search)) {
|
||||
return baseAddress + '/Contacts' + '?theme=mobile';
|
||||
newAddress = baseAddress + '/Contacts' + '?theme=mobile';
|
||||
}
|
||||
return newAddress.replace(/(Calendar|Mail)/, 'Contacts');
|
||||
else {
|
||||
newAddress = baseAddress + '/Contacts';
|
||||
}
|
||||
|
||||
return newAddress;
|
||||
};
|
||||
|
||||
|
|
|
@ -9,7 +9,7 @@
|
|||
angular.module('SOGo.Contacts', ['ngSanitize', 'ui.router', 'mm.foundation', 'mm.foundation.offcanvas', 'SOGo.Common'])
|
||||
|
||||
.constant('sgSettings', {
|
||||
'baseURL': '/SOGo/so/francis/Contacts'
|
||||
'baseURL': ApplicationBaseURL
|
||||
})
|
||||
|
||||
.config(['$stateProvider', '$urlRouterProvider', function($stateProvider, $urlRouterProvider) {
|
||||
|
|
|
@ -9,7 +9,7 @@
|
|||
angular.module('SOGo.Contacts', ['ionic', 'SOGo.Common', 'SOGo.Contacts'])
|
||||
|
||||
.constant('sgSettings', {
|
||||
'baseURL': '/SOGo/so/francis/Contacts'
|
||||
'baseURL': ApplicationBaseURL
|
||||
})
|
||||
|
||||
.run(function($ionicPlatform) {
|
||||
|
|
|
@ -7,7 +7,7 @@
|
|||
angular.module('SOGo.RootPage', ['SOGo.Authentication', 'SOGo.UIMobile', 'ionic'])
|
||||
|
||||
.constant('sgSettings', {
|
||||
'baseURL': '/SOGo/so/francis/'
|
||||
'baseURL': ApplicationBaseURL
|
||||
})
|
||||
|
||||
.run(function($ionicPlatform) {
|
||||
|
@ -48,9 +48,9 @@
|
|||
$urlRouterProvider.otherwise('/app/login');
|
||||
})
|
||||
|
||||
.controller('AppCtrl', function($scope) {
|
||||
$scope.ApplicationBaseURL = ApplicationBaseURL;
|
||||
})
|
||||
.controller('AppCtrl', ['$scope', 'sgSettings', function(Settings, $scope) {
|
||||
$scope.ApplicationBaseURL = Settings.baseURL;
|
||||
}])
|
||||
|
||||
.controller('LoginCtrl', ['$scope', 'Authentication', 'sgDialog', function($scope, Authentication, Dialog) {
|
||||
$scope.creds = { 'username': null, 'password': null };
|
||||
|
|
Loading…
Reference in a new issue