Merge resistanceisfutile into master

This commit is contained in:
Joseph Schorr 2015-03-23 15:39:08 -04:00
commit 85d6500daa
7 changed files with 91 additions and 3 deletions

View file

@ -140,7 +140,7 @@
$scope.showSuperuserPanel = function() {
$('#setupModal').modal('hide');
var prefix = $scope.hasSSL ? 'https' : 'http';
var hostname = $scope.hostname;
var hostname = $scope.hostname || document.location.hostname;
window.location = prefix + '://' + hostname + '/superuser';
};