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

Make the new domain available to setupdns view on migration

Browse Source
This commit is contained in:
Johannes Zellner
2018-01-11 16:30:03 +01:00
parent e96199927d
commit cbfd7cf1a6
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
webadmin/src/js/setupdns.js
View File

@@ -24,6 +24,9 @@ app.controller('SetupDNSController', ['$scope', '$http', '$timeout', 'Client', f
$scope.isDomain = false;
$scope.isSubdomain = false;
// If we migrate the api origin we have to poll the new location
if (search.admin_fqdn) Client.apiOrigin = 'https://' + search.admin_fqdn;
$scope.$watch('dnsCredentials.domain', function (newVal) {
if (!newVal) {
$scope.isDomain = false;

4
webadmin/src/views/domains.js
View File

@@ -199,6 +199,8 @@ angular.module('Application').controller('DomainsController', ['$scope', '$locat
},
submit: function () {
var setupDNSUrl = '/setupdns.html?admin_fqdn=my' + ($scope.domainMigrate.domain.provider === 'caas' ? '-' : '.') + $scope.domainMigrate.domain.domain;
$scope.domainMigrate.busy = true;
$scope.domainMigrate.error = null;
@@ -214,7 +216,7 @@ angular.module('Application').controller('DomainsController', ['$scope', '$locat
$('#domainMigrateModal').modal('hide');
$scope.domainMigrate.reset();
window.location.href = '/setupdns.html';
window.location.href = setupDNSUrl;
}
$scope.domainMigrate.busy = false;