vbatts/quay
Archived
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Handle hostname changes in the config panel

Browse source 
Fixes #436
This commit is contained in:
Joseph Schorr 2015-09-02 17:21:38 -04:00
parent 0a91a1d9d8
commit f6cca81178
6 changed files with 31 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

6
static/js/pages/setup.js
View file

@ -93,6 +93,8 @@
$scope.stepProgress = [];
$scope.hasSSL = false;
$scope.hostname = null;
$scope.currentConfig = null;
$scope.currentState = {
'hasDatabaseSSLCert': false
};
@ -147,6 +149,8 @@
$scope.configurationSaved = function(config) {
$scope.hasSSL = config['PREFERRED_URL_SCHEME'] == 'https';
$scope.hostname = config['SERVER_HOSTNAME'];
$scope.currentConfig = config;
$scope.currentStep = $scope.States.VALID_CONFIG;
};
@ -298,7 +302,7 @@
$scope.checkStatus = function() {
ContainerService.checkStatus(function(resp) {
$scope.currentStep = resp['status'];
}, $scope.hasSSL);
}, $scope.currentConfig);
};
// Load the initial status.

7
static/js/pages/superuser.js
View file

@ -30,12 +30,14 @@
$scope.logsScrolled = false;
$scope.csrf_token = encodeURIComponent(window.__token);
$scope.dashboardActive = false;
$scope.currentConfig = null;
$scope.setDashboardActive = function(active) {
$scope.dashboardActive = active;
};
$scope.configurationSaved = function() {
$scope.configurationSaved = function(config) {
$scope.currentConfig = config;
$scope.requiresRestart = true;
};
@ -321,6 +323,7 @@
$scope.requiresRestart = resp['requires_restart'];
if ($scope.configStatus == 'ready') {
$scope.currentConfig = null;
$scope.loadUsers();
} else {
var message = "Installation of this product has not yet been completed." +
@ -331,7 +334,7 @@
var title = "Installation Incomplete";
CoreDialog.fatal(title, message);
}
});
}, $scope.currentConfig);
};
// Load the initial status.