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

Remove various subscription upgrade hooks

Browse Source 
it's in free plan for quite a while now
This commit is contained in:
Girish Ramakrishnan
2022-05-26 14:13:13 -07:00
parent fb109008fa
commit 74aac4876a
7 changed files with 13 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/views/users.html
View File

@@ -103,7 +103,7 @@
<div class="form-group" ng-show="userInfo.isAtLeastAdmin">
<label class="control-label">{{ 'users.user.role' | tr }} <sup><a ng-href="https://docs.cloudron.io/user-management/#roles" class="help" target="_blank"><i class="fa fa-question-circle"></i></a></sup></label>
<div class="control-label">
<select class="form-control" uib-tooltip="{{ config.features.userRoles ? '' : 'Only available in the business plan' }}" ng-disabled="!config.features.userRoles" ng-model="useradd.role" ng-options="role.id as role.name disable when role.disabled for role in roles"></select>
<select class="form-control" ng-model="useradd.role" ng-options="role.id as role.name disable when role.disabled for role in roles"></select>
</div>
</div>
@@ -229,7 +229,7 @@
<div class="form-group" ng-show="!isMe(useredit.userInfo) && userInfo.isAtLeastAdmin">
<label class="control-label">{{ 'users.user.role' | tr }} <sup><a ng-href="https://docs.cloudron.io/user-management/#roles" class="help" target="_blank"><i class="fa fa-question-circle"></i></a></sup></label>
<div class="control-label">
<select class="form-control" uib-tooltip="{{ config.features.userRoles ? '' : 'Only available in the business plan' }}" ng-disabled="!config.features.userRoles" ng-model="useredit.role" ng-options="role.id as role.name disable when role.disabled for role in roles"></select>
<select class="form-control" ng-model="useredit.role" ng-options="role.id as role.name disable when role.disabled for role in roles"></select>
</div>
</div>
<div class="form-group">
@@ -679,7 +679,7 @@
</td>
<td class="text-right no-wrap" style="vertical-align: bottom">
<button ng-show="isMe(user) && userInfo.isAtLeastOwner && user.isAtLeastOwner && !config.features.userRoles" class="btn btn-xs btn-default" ng-click="transferOwnership.show()" uib-tooltip="{{ 'users.users.transferOwnershipTooltip' | tr }}"><i class="fas fa-random"></i></button>
<button ng-show="isMe(user) && userInfo.isAtLeastOwner && user.isAtLeastOwner" class="btn btn-xs btn-default" ng-click="transferOwnership.show()" uib-tooltip="{{ 'users.users.transferOwnershipTooltip' | tr }}"><i class="fas fa-random"></i></button>
<button ng-disabled="!canEdit(user)" ng-show="!user.inviteAccepted && !isMe(user) && !user.source" class="btn btn-xs btn-default" ng-click="invitation.show(user)" uib-tooltip="{{ 'users.users.invitationTooltip' | tr }}"><i class="fas fa-paper-plane"></i></button>
<button ng-show="user.source" class="btn btn-xs btn-default" ng-click="makeLocal.show(user)" uib-tooltip="{{ 'users.users.makeLocalTooltip' | tr }}"><i class="fas fa-thumbtack" style="width: 10.5px;"></i></button>
<button ng-disabled="!canEdit(user)" ng-show="user.inviteAccepted && !user.source" class="btn btn-xs btn-default" ng-click="passwordReset.show(user)" uib-tooltip="{{ 'users.users.resetPasswordTooltip' | tr }}"><i class="fas fa-key"></i></button>
@@ -758,7 +758,7 @@
<div class="card card-large" ng-show="user.isAtLeastAdmin">
<form name="profileConfigForm" role="form" novalidate ng-submit="profileConfig.submit()" autocomplete="off">
<fieldset ng-disabled="profileConfig.busy || !config.features.profileConfig">
<fieldset ng-disabled="profileConfig.busy">
<div class="checkbox">
<label>
<input type="checkbox" ng-model="profileConfig.editableUserProfiles"> {{ 'users.settings.allowProfileEditCheckbox' | tr }} <sup><a ng-href="https://docs.cloudron.io/user-management/#lock-profile" class="help" target="_blank"><i class="fa fa-question-circle"></i></a></sup>
@@ -774,13 +774,7 @@
<br/>
<div class="row" ng-hide="config.features.profileConfig">
<div class="col-md-12">
<span>{{ 'users.settings.subscriptionRequired' | tr }} <a href="" class="pull-right" ng-click="openSubscriptionSetup()">{{ 'users.settings.subscriptionRequiredAction' | tr }}</a></span>
</div>
</div>
<div class="row" ng-show="config.features.profileConfig">
<div class="row">
<div class="col-md-12">
<span class="has-error" ng-show="profileConfig.errorMessage">{{ profileConfig.errorMessage }}</span>