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

Remove altDomain ui bits

Browse Source
This commit is contained in:
Johannes Zellner
2018-02-08 09:44:35 +01:00
parent 512f6a1166
commit 35cc592d61
3 changed files with 10 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
webadmin/src/views/apps.js
View File

@@ -18,7 +18,6 @@ angular.module('Application').controller('AppsController', ['$scope', '$location
app: {},
domain: '',
location: '',
usingAltDomain: false,
advancedVisible: false,
portBindings: {},
portBindingsEnabled: {},
@@ -41,26 +40,13 @@ angular.module('Application').controller('AppsController', ['$scope', '$location
return !!(tmp.users.length || tmp.groups.length);
},
isAltDomainValid: function () {
return ngTld.isValid($scope.appConfigure.location);
},
isAltDomainSubdomain: function () {
return ngTld.isSubdomain($scope.appConfigure.location);
},
isAltDomainNaked: function () {
return ngTld.isNakedDomain($scope.appConfigure.location);
},
show: function (app) {
$scope.reset();
// fill relevant info from the app
$scope.appConfigure.app = app;
$scope.appConfigure.location = app.altDomain || app.location;
$scope.appConfigure.location = app.location;
$scope.appConfigure.domain = $scope.domains.filter(function (d) { return d.domain === app.domain; })[0];
$scope.appConfigure.usingAltDomain = !!app.altDomain;
$scope.appConfigure.portBindingsInfo = app.manifest.tcpPorts || {}; // Portbinding map only for information
$scope. Option = app.accessRestriction ? 'groups' : 'any';
$scope.appConfigure.memoryLimit = app.memoryLimit || app.manifest.memoryLimit || (256 * 1024 * 1024);
@@ -129,9 +115,8 @@ angular.module('Application').controller('AppsController', ['$scope', '$location
}
var data = {
location: $scope.appConfigure.usingAltDomain ? $scope.appConfigure.app.location : $scope.appConfigure.location,
altDomain: $scope.appConfigure.usingAltDomain ? $scope.appConfigure.location : null,
domain: $scope.appConfigure.usingAltDomain ? undefined : $scope.appConfigure.domain.domain,
location: $scope.appConfigure.location,
domain: $scope.appConfigure.domain.domain,
portBindings: finalPortBindings,
accessRestriction: finalAccessRestriction,
cert: $scope.appConfigure.certificateFile,
@@ -275,7 +260,6 @@ angular.module('Application').controller('AppsController', ['$scope', '$location
$scope.appConfigure.domain = null;
$scope.appConfigure.location = '';
$scope.appConfigure.advancedVisible = false;
$scope.appConfigure.usingAltDomain = false;
$scope.appConfigure.portBindings = {}; // This is the actual model holding the env:port pair
$scope.appConfigure.portBindingsEnabled = {}; // This is the actual model holding the enabled/disabled flag
$scope.appConfigure.certificateFile = null;
@@ -346,17 +330,6 @@ angular.module('Application').controller('AppsController', ['$scope', '$location
});
};
$scope.useAltDomain = function (use, domain) {
$scope.appConfigure.usingAltDomain = use;
$scope.appConfigure.domain = domain;
if (use) {
$scope.appConfigure.location = '';
} else {
$scope.appConfigure.location = $scope.appConfigure.app.location;
}
};
$scope.showInformation = function (app) {
$scope.reset();