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

Do not use special wizard page controller for dns view

Browse Source
This commit is contained in:
Johannes Zellner
2015-10-30 21:04:05 +01:00
parent a55675b440
commit 40da8736d4
1 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -28,7 +28,7 @@ app.config(['$routeProvider', function ($routeProvider) {
controller: 'StepController',
templateUrl: 'views/setup/step2.html'
}).when('/step3', {
controller: 'CustomDomainController',
controller: 'StepController',
templateUrl: 'views/setup/step3.html'
}).when('/step4', {
controller: 'FinishController',
@@ -194,17 +194,12 @@ app.controller('StepController', ['$scope', '$route', '$location', 'Wizard', fun
image = null;
};
image.src = $scope.wizard.availableAvatars[randomIndex].data || $scope.wizard.availableAvatars[randomIndex].url;
} else if ($route.current.templateUrl === 'views/setup/step3.html' && Wizard.dnsConfig.provider === 'caas') {
$location.path('/step4'); // not using custom domain
}
}]);
app.controller('CustomDomainController', [ '$scope', '$location', 'Wizard', function ($scope, $location, Wizard) {
$scope.wizard = Wizard;
if (Wizard.dnsConfig.provider === 'caas') $location.path('/step4'); // not using custom domain
}]);
app.controller('FinishController', ['$scope', '$location', 'Wizard', 'Client', function ($scope, $location, Wizard, Client) {
$scope.wizard = Wizard;
@@ -247,7 +242,9 @@ app.controller('SetupController', ['$scope', '$location', 'Client', 'Wizard', fu
};
} else {
Wizard.dnsConfig = {
provider: 'caas'
provider: 'caas',
accessKeyId: '',
secretAccessKey: ''
};
}