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

rename location to subdomain

Browse Source
This commit is contained in:
Girish Ramakrishnan
2022-01-16 18:29:32 -08:00
parent fd9efe3da3
commit 63394a666e
7 changed files with 35 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/js/client.js
View File

@@ -637,7 +637,7 @@ angular.module('Application').service('Client', ['$http', '$interval', '$timeout
var that = this;
var data = {
appStoreId: id + '@' + manifest.version,
location: config.location,
subdomain: config.subdomain,
domain: config.domain,
portBindings: config.portBindings,
accessRestriction: config.accessRestriction,
@@ -657,7 +657,7 @@ angular.module('Application').service('Client', ['$http', '$interval', '$timeout
Client.prototype.cloneApp = function (appId, config, callback) {
var data = {
location: config.location,
subdomain: config.subdomain,
domain: config.domain,
portBindings: config.portBindings,
backupId: config.backupId
@@ -2083,7 +2083,7 @@ angular.module('Application').service('Client', ['$http', '$interval', '$timeout
if (app.manifest.postInstallMessage) {
var text= app.manifest.postInstallMessage;
// we chose - because underscore has special meaning in markdown
text = text.replace(/\$CLOUDRON-APP-LOCATION/g, app.location);
text = text.replace(/\$CLOUDRON-APP-LOCATION/g, app.subdomain);
text = text.replace(/\$CLOUDRON-APP-DOMAIN/g, app.domain);
text = text.replace(/\$CLOUDRON-APP-FQDN/g, app.fqdn);
text = text.replace(/\$CLOUDRON-APP-ORIGIN/g, 'https://' + app.fqdn);
@@ -3261,7 +3261,7 @@ angular.module('Application').service('Client', ['$http', '$interval', '$timeout
pre = pre ? (pre + ' ') : '';
return pre + (app.label || app.fqdn || app.location) + ' (' + app.manifest.title + ') ';
return pre + (app.label || app.fqdn || app.subdomain) + ' (' + app.manifest.title + ') ';
}
switch (eventLog.action) {
@@ -3316,7 +3316,7 @@ angular.module('Application').service('Client', ['$http', '$interval', '$timeout
} else {
return 'Certificate ' + appName('of', app) + ' was reset';
}
} else if (data.location) {
} else if (data.subdomain) {
if (data.fqdn !== data.app.fqdn) {
return 'Location ' + appName('of', app) + ' was changed to ' + data.fqdn;
} else if (!angular.equals(data.redirectDomains, data.app.redirectDomains)) {