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

Fixup sso message display in postinstall and info dialogs

Browse Source
This commit is contained in:
Johannes Zellner
2020-10-15 16:49:49 +02:00
parent 48f089e136
commit 7948d68ac7
2 changed files with 2 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/views/apps.html
+2 -4
View File
@@ -13,9 +13,8 @@
</h5>
</div>
<div class="modal-body">
<p ng-show="appPostInstallConfirm.customAuth && !appPostInstallConfirm.app.manifest.addons.email"></p>
<p ng-show="appPostInstallConfirm.app.manifest.addons.email">This app is set up to allow all users with a mailbox on this Cloudron. Login with the email and Cloudron password to access the mailbox.</p>
<p ng-show="!appPostInstallConfirm.customAuth && !appPostInstallConfirm.app.manifest.addons.email"> This app is set up to authenticate with the Cloudron User Directory. Cloudron users can login and use {{ appPostInstallConfirm.app.manifest.title }}.</p>
<p ng-show="appPostInstallConfirm.app.sso && !appPostInstallConfirm.app.manifest.addons.email"> This app is set up to authenticate with the Cloudron User Directory. Cloudron users can login and use {{ appPostInstallConfirm.app.manifest.title }}.</p>
<div ng-bind-html="appPostInstallConfirm.app.manifest.postInstallMessage | markdown2html"></div>
<div ng-show="appPostInstallConfirm.app.manifest.documentationUrl">
@@ -58,9 +57,8 @@
If you need further help, refer to Cloudron's <a target="_blank" ng-href="{{ appInfo.app.manifest.forumUrl || 'https://forum.cloudron.io' }}">{{ appInfo.app.manifest.title }} forum section</a>.
</p>
<p ng-show="appInfo.customAuth && !appInstall.app.manifest.addons.email"></p>
<p ng-show="appInfo.app.manifest.addons.email">This app is set up to allow all users with a mailbox on this Cloudron. Login with the email and Cloudron password to access the mailbox.</p>
<p ng-show="!appInfo.customAuth && !appInfo.app.manifest.addons.email"> This app is set up to authenticate with the Cloudron User Directory. Cloudron users can login and use {{ appInfo.app.manifest.title }}.</p>
<p ng-show="appInfo.app.sso && !appInfo.app.manifest.addons.email"> This app is set up to authenticate with the Cloudron User Directory. Cloudron users can login and use {{ appInfo.app.manifest.title }}.</p>
<a ng-show="appInfo.app.manifest.postInstallMessage" href="" data-toggle="collapse" data-parent="#accordion" data-target="#appinfoPostinstallMessage">
<i class="fa fa-angle-right"></i>
src/views/apps.js
-4
View File
@@ -40,13 +40,11 @@ angular.module('Application').controller('AppsController', ['$scope', '$timeout'
app: {},
message: '',
confirmed: false,
customAuth: false,
show: function (app) {
$scope.appPostInstallConfirm.app = app;
$scope.appPostInstallConfirm.message = app.manifest.postInstallMessage;
$scope.appPostInstallConfirm.confirmed = false;
$scope.appPostInstallConfirm.customAuth = !(app.manifest.addons['ldap'] || app.manifest.addons['oauth']);
$('#appPostInstallConfirmModal').modal('show');
@@ -66,12 +64,10 @@ angular.module('Application').controller('AppsController', ['$scope', '$timeout'
$scope.appInfo = {
app: {},
message: '',
customAuth: false,
show: function (app) {
$scope.appInfo.app = app;
$scope.appInfo.message = app.manifest.postInstallMessage;
$scope.appInfo.customAuth = !(app.manifest.addons['ldap'] || app.manifest.addons['oauth']);
$('#appinfoPostinstallMessage').collapse('hide');
$('#appInfoModal').modal('show');