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

Fix email display logic again

Browse Source
This commit is contained in:
Girish Ramakrishnan
2017-01-30 22:55:20 -08:00
parent 34a3dd6d46
commit 854d29330c
4 changed files with 22 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -116,7 +116,7 @@
</div>
</div>
<p ng-show="!appConfigure.app.manifest.addons.email" class="text-danger">
<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>

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

@@ -11,6 +11,7 @@ angular.module('Application').controller('AppsController', ['$scope', '$location
$scope.groups = [];
$scope.users = [];
$scope.restartAppBusy = false;
$scope.mailConfig = {};
$scope.appConfigure = {
busy: false,
@@ -559,6 +560,14 @@ angular.module('Application').controller('AppsController', ['$scope', '$location
});
}
function getMailConfig() {
Client.getMailConfig(function (error, mailConfig) {
if (error) return console.error(error);
$scope.mailConfig = mailConfig;
});
}
Client.onReady(function () {
Client.refreshUserInfo(function (error) {
if (error) return console.error(error);
@@ -567,6 +576,7 @@ angular.module('Application').controller('AppsController', ['$scope', '$location
fetchUsers();
fetchGroups();
fetchDnsConfig();
getMailConfig();
}
});
});

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

@@ -86,7 +86,7 @@
</div>
</div>
<p ng-show="!appInstall.app.manifest.addons.email" class="text-danger">
<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>

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

@@ -18,6 +18,7 @@ angular.module('Application').controller('AppStoreController', ['$scope', '$loca
$scope.searchString = '';
$scope.validAppstoreAccount = false;
$scope.appstoreConfig = null;
$scope.mailConfig = {};
$scope.showRequestUpgrade = function () {
// wait for dialog to be fully closed to avoid modal behavior breakage when moving to a different view already
@@ -542,6 +543,14 @@ 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;
@@ -560,6 +569,7 @@ angular.module('Application').controller('AppStoreController', ['$scope', '$loca
fetchUsers();
fetchGroups();
fetchDnsConfig();
getMailConfig();
fetchAppstoreConfig(function (error) {
if (error) console.error(error);