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

Always show warning if an app requires email to be enabled for the selected domain

Browse Source 
We can be smarter in the future and show this based on currently
selected domain from the dropdown
This commit is contained in:
Johannes Zellner
2018-01-23 16:51:51 +01:00
parent f94380b2dd
commit bc164281db
4 changed files with 4 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
webadmin/src/views/apps.html
View File

@@ -110,8 +110,8 @@
<br/>
</div>
<p ng-show="!mailConfig.enabled && appConfigure.app.manifest.addons.email" class="text-danger">
This app requires <a href="#/settings">Cloudron Email</a> to be enabled.
<p ng-show="appConfigure.app.manifest.addons.email" class="text-danger">
This app requires <a href="#/email">Cloudron Email</a> to be enabled on this domain.
</p>
<a href="" ng-click="appConfigure.advancedVisible = true" ng-hide="appConfigure.advancedVisible">Advanced settings...</a>

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

@@ -10,7 +10,6 @@ angular.module('Application').controller('AppsController', ['$scope', '$location
$scope.domains = [];
$scope.groups = [];
$scope.users = [];
$scope.mailConfig = {};
$scope.backupConfig = {};
$scope.appConfigure = {
@@ -497,14 +496,6 @@ angular.module('Application').controller('AppsController', ['$scope', '$location
});
}
function getMailConfig() {
Client.getMailConfig(function (error, mailConfig) {
if (error) return console.error(error);
$scope.mailConfig = mailConfig;
});
}
function getBackupConfig() {
Client.getBackupConfig(function (error, backupConfig) {
if (error) return console.error(error);
@@ -521,7 +512,6 @@ angular.module('Application').controller('AppsController', ['$scope', '$location
fetchUsers();
fetchGroups();
getDomains();
getMailConfig();
getBackupConfig();
}

4
webadmin/src/views/appstore.html
View File

@@ -102,8 +102,8 @@
<br/>
</div>
<p ng-show="!mailConfig.enabled && appInstall.app.manifest.addons.email" class="text-danger">
This app requires <a href="#/settings">Cloudron Email</a> to be enabled.
<p ng-show="appInstall.app.manifest.addons.email" class="text-danger">
This app requires <a href="#/email">Cloudron Email</a> to be enabled on this domain.
</p>
<div class="hide">

10
webadmin/src/views/appstore.js
View File

@@ -18,7 +18,6 @@ angular.module('Application').controller('AppStoreController', ['$scope', '$loca
$scope.searchString = '';
$scope.validAppstoreAccount = false;
$scope.appstoreConfig = null;
$scope.mailConfig = {};
$scope.showView = function (view) {
// wait for dialog to be fully closed to avoid modal behavior breakage when moving to a different view already
@@ -527,14 +526,6 @@ angular.module('Application').controller('AppStoreController', ['$scope', '$loca
});
}
function getMailConfig() {
Client.getMailConfig(function (error, mailConfig) {
if (error) return console.error(error);
$scope.mailConfig = mailConfig;
});
}
function init() {
$scope.ready = false;
@@ -548,7 +539,6 @@ angular.module('Application').controller('AppStoreController', ['$scope', '$loca
fetchUsers();
fetchGroups();
getMailConfig();
// domains is required since we populate the dropdown with domains[0]
Client.getDomains(function (error, result) {