jjkiers/cloudron-box
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Also use adminFqdn in setup.js

Browse Source
This commit is contained in:
Johannes Zellner
2017-01-10 23:43:49 +01:00
parent d68ae4866c
commit 18007be9e1
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
webadmin/src/js/setup.js
View File

@@ -61,8 +61,8 @@ app.controller('SetupController', ['$scope', '$http', 'Client', function ($scope
}
// if we are here from the ip first go to the real domain if already setup
if (status.provider !== 'caas' && status.configState.domain && ('my.' + status.configState.domain) !== window.location.hostname) {
window.location.href = 'https://my.' + status.configState.domain + '/setup.html';
if (status.provider !== 'caas' && status.adminFqdn && status.adminFqdn !== window.location.hostname) {
window.location.href = 'https://my.' + status.adminFqdn + '/setup.html';
return;
}
@@ -72,7 +72,7 @@ app.controller('SetupController', ['$scope', '$http', 'Client', function ($scope
}
// if we don't have a domain yet, first go to domain setup
if (!status.configState.domain) {
if (!status.adminFqdn) {
window.location.href = '/setupdns.html';
return;
}