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

Fixup user list icons and set default add to 'user'

Browse Source
This commit is contained in:
Johannes Zellner
2020-02-24 12:22:07 +01:00
parent 15c9052912
commit 3c0e674ee5
2 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/views/users.html
View File

@@ -48,7 +48,7 @@
<label class="control-label">Role</label>
<div class="control-label">
<!-- <select class="form-control" ng-model="useredit.role" ng-options="a.id as a.name for a in roles" ng-disabled="userInfo.role !== 'owner'"></select> -->
<select class="form-control" ng-model="useredit.role" ng-options="a.id as a.name for a in roles"></select>
<select class="form-control" ng-model="useradd.role" ng-options="a.id as a.name for a in roles"></select>
</div>
</div>
@@ -129,8 +129,7 @@
</div>
<input type="fallbackEmail" class="form-control" ng-model="useredit.fallbackEmail" name="fallbackEmail" required>
</div>
<!-- <div class="form-group" ng-hide="isMe(useredit.userInfo) || userInfo.role !== 'owner'"> -->
<div class="form-group" ng-hide="isMe(useredit.userInfo)">
<div class="form-group" ng-hide="isMe(useredit.userInfo) || userInfo.role === 'user' || userInfo.role === 'usermanager'">
<label class="control-label">Role</label>
<div class="control-label">
<select class="form-control" ng-model="useredit.role" ng-options="a.id as a.name for a in roles"></select>
@@ -396,7 +395,9 @@
</tr>
<tr ng-repeat="user in users" ng-class="{'text-muted': !user.active}">
<td>
<i class="fa fa-briefcase arrow" ng-show="user.active && user.admin" uib-tooltip="This user can manage apps, groups and other users" tooltip-class="long nowrap"></i>
<i class="fas fa-user-tie arrow" ng-show="user.active && user.role === 'owner'" uib-tooltip="This user is the owner" tooltip-class="long nowrap"></i>
<i class="fa fa-briefcase arrow" ng-show="user.active && user.role === 'admin'" uib-tooltip="This user is an admin" tooltip-class="long nowrap"></i>
<i class="fas fa-users-cog arrow" ng-show="user.active && user.role === 'usermanager'" uib-tooltip="This user can manage groups and other users" tooltip-class="long nowrap"></i>
<i class="fa fa-ban" ng-show="!user.active" uib-tooltip="User is inactive"></i>
</td>
<td class="hand elide-table-cell" ng-click="useredit.show(user)" ng-show="user.username">