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

Remove all .admin usage

Browse Source
This commit is contained in:
Johannes Zellner
2020-02-24 17:29:20 +01:00
parent 2674160acc
commit 7ce4effc2d
6 changed files with 9 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/views/appstore.html
View File

@@ -57,17 +57,17 @@
</div>
<!-- for spaces users, the User management is hidden. thus the admin flag check -->
<div class="form-group" ng-show="user.admin && appInstall.customAuth && !appInstall.app.manifest.addons.email">
<div class="form-group" ng-show="user.isAtLeastAdmin && appInstall.customAuth && !appInstall.app.manifest.addons.email">
<label class="control-label">User management</label>
<p>This app has it's own user management.</p>
</div>
<div class="form-group" ng-show="user.admin && appInstall.app.manifest.addons.email">
<div class="form-group" ng-show="user.isAtLeastAdmin && appInstall.app.manifest.addons.email">
<label class="control-label">User management</label>
<p>All users with a mailbox on this Cloudron have access.</p>
</div>
<div class="form-group" ng-show="user.admin && !appInstall.customAuth && !appInstall.app.manifest.addons.email">
<div class="form-group" ng-show="user.isAtLeastAdmin && !appInstall.customAuth && !appInstall.app.manifest.addons.email">
<label class="control-label">User management</label>
<div class="radio" ng-show="appInstall.optionalSso">
<label>
@@ -155,7 +155,7 @@
<div class="modal-footer">
<button type="button" class="btn btn-success pull-left" ng-click="openSubscriptionSetup()" ng-show="appInstall.state === 'subscriptionRequired'">Setup Subscription</button>
<button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
<button type="button" class="btn btn-danger" ng-show="user.admin && appInstall.state === 'resourceConstraint'" ng-click="appInstall.showForm(true)">Install anyway</button>
<button type="button" class="btn btn-danger" ng-show="user.isAtLeastAdmin && appInstall.state === 'resourceConstraint'" ng-click="appInstall.showForm(true)">Install anyway</button>
<button type="button" class="btn btn-success" ng-show="appInstall.state === 'appInfo'" ng-click="appInstall.showForm()">Install</button>
<button type="button" class="btn btn-success" ng-show="appInstall.state === 'installForm'" ng-click="appInstall.submit()" ng-disabled="appInstallForm.$invalid || appInstall.busy"><i class="fa fa-circle-notch fa-spin" ng-show="appInstall.busy"></i> Install {{ appInstall.needsOverwrite ? 'and overwrite DNS' : '' }}</button>
</div>