diff --git a/src/js/client.js b/src/js/client.js
index a4a73681e..52a1355e9 100644
--- a/src/js/client.js
+++ b/src/js/client.js
@@ -264,8 +264,6 @@ angular.module('Application').service('Client', ['$http', '$interval', 'md5', 'N
Client.prototype.setConfig = function (config) {
var that = this;
- config.managed = config.provider === 'caas';
-
angular.copy(config, this._config);
this._configListener.forEach(function (callback) {
diff --git a/src/js/main.js b/src/js/main.js
index 922b0660a..362d49cee 100644
--- a/src/js/main.js
+++ b/src/js/main.js
@@ -154,9 +154,7 @@ angular.module('Application').controller('MainController', ['$scope', '$route',
refreshNotifications();
- if (!$scope.config.managed) {
- $scope.updateSubscriptionStatus();
- }
+ $scope.updateSubscriptionStatus();
});
});
});
diff --git a/src/views/apps.html b/src/views/apps.html
index 84bc9f510..22e88a389 100644
--- a/src/views/apps.html
+++ b/src/views/apps.html
@@ -552,7 +552,7 @@
-
+
diff --git a/src/views/apps.js b/src/views/apps.js
index 2173d5238..dccaf6d6d 100644
--- a/src/views/apps.js
+++ b/src/views/apps.js
@@ -16,7 +16,7 @@ angular.module('Application').controller('AppsController', ['$scope', '$location
$scope.usedDomains = [];
$scope.groups = [];
$scope.users = [];
- $scope.backupConfig = {};
+ $scope.backupsEnabled = true;
$scope.disableIndexingTemplate = '# Disable search engine indexing\n\nUser-agent: *\nDisallow: /';
$scope.appConfigure = {
@@ -660,7 +660,7 @@ angular.module('Application').controller('AppsController', ['$scope', '$location
Client.getBackupConfig(function (error, backupConfig) {
if (error) return console.error(error);
- $scope.backupConfig = backupConfig;
+ $scope.backupEnabled = backupConfig.provider !== 'noop';
});
}
@@ -683,7 +683,7 @@ angular.module('Application').controller('AppsController', ['$scope', '$location
fetchUsers();
fetchGroups();
getDomains();
- if ($scope.user.admin && !$scope.config.managed) getBackupConfig(); // FIXME: detect disabled backups some other way
+ getBackupConfig();
}
var refreshAppsTimer = $interval(refreshInstalledApps, 5000);
diff --git a/src/views/backups.html b/src/views/backups.html
index 9e2e67e59..1f2e8c90e 100644
--- a/src/views/backups.html
+++ b/src/views/backups.html
@@ -171,7 +171,7 @@
{{ prettyProviderName(backupConfig.provider) }}
-
+
Location
@@ -182,7 +182,7 @@
-
+
Storage Format
@@ -230,7 +230,7 @@
-
+
diff --git a/src/views/backups.js b/src/views/backups.js
index f66bb5b80..e0fc2bc40 100644
--- a/src/views/backups.js
+++ b/src/views/backups.js
@@ -86,8 +86,6 @@ angular.module('Application').controller('BackupsController', ['$scope', '$locat
];
$scope.prettyProviderName = function (provider) {
- if ($scope.config.managed) return $scope.config.provider;
-
switch (provider) {
case 'caas': return 'Managed Cloudron';
default: return provider;
@@ -395,7 +393,7 @@ angular.module('Application').controller('BackupsController', ['$scope', '$locat
Client.onReady(function () {
fetchBackups();
- if (!$scope.config.managed) getBackupConfig();
+ getBackupConfig();
// show backup status
$scope.createBackup.checkStatus();
diff --git a/src/views/domains.html b/src/views/domains.html
index 6b90bdf1f..0fe6c97f8 100644
--- a/src/views/domains.html
+++ b/src/views/domains.html
@@ -363,11 +363,11 @@
-
+
Dynamic DNS
-
+
diff --git a/src/views/domains.js b/src/views/domains.js
index 6317abd64..19e9a2155 100644
--- a/src/views/domains.js
+++ b/src/views/domains.js
@@ -595,7 +595,7 @@ angular.module('Application').controller('DomainsController', ['$scope', '$locat
$scope.ready = true;
- if (!$scope.config.managed) {
+ if ($scope.config.features.dynamicDns) {
$scope.dyndnsConfigure.refresh();
}
});
diff --git a/src/views/settings.html b/src/views/settings.html
index 05c3c3466..56edfbf06 100644
--- a/src/views/settings.html
+++ b/src/views/settings.html
@@ -149,11 +149,11 @@
-
+
Cloudron.io Account
-
+
diff --git a/src/views/settings.js b/src/views/settings.js
index a8916bc76..a2a166a0c 100644
--- a/src/views/settings.js
+++ b/src/views/settings.js
@@ -422,9 +422,7 @@ angular.module('Application').controller('SettingsController', ['$scope', '$loca
$scope.update.checkStatus();
- if (!$scope.config.managed) {
- getSubscription();
- }
+ getSubscription();
});
// setup all the dialog focus handling
diff --git a/src/views/support.html b/src/views/support.html
index 6b1617b9f..a29daef92 100644
--- a/src/views/support.html
+++ b/src/views/support.html
@@ -49,11 +49,11 @@
-
+
Remote Support
-
+
diff --git a/src/views/support.js b/src/views/support.js
index 41806a6cb..2a3c80222 100644
--- a/src/views/support.js
+++ b/src/views/support.js
@@ -58,8 +58,6 @@ angular.module('Application').controller('SupportController', ['$scope', '$locat
};
Client.onReady(function () {
- if ($scope.config.managed) return;
-
Client.getRemoteSupport(function (error, enabled) {
if (error) return console.error(error);