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

Another attempt on fixing the user edit with roles business

Browse Source
This commit is contained in:
Johannes Zellner
2020-03-07 14:05:58 -08:00
parent e240ac1fa5
commit 385d275f59
2 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/views/users.html
View File

@@ -397,22 +397,22 @@
<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="user.role === 'owner' || useredit.show(user)" ng-show="user.username">
<td class="hand elide-table-cell" ng-click="canEdit(user) && useredit.show(user)" ng-show="user.username">
{{ user.displayName }} &nbsp; <span class="text-muted">{{ user.username }}</span> &nbsp; <i ng-show="user.source" class="far fa-address-book" uib-tooltip="From external LDAP directory"></i>
</td>
<td class="hand elide-table-cell" ng-click="user.role === 'owner' || useredit.show(user)" ng-hide="user.username">
<td class="hand elide-table-cell" ng-click="canEdit(user) && useredit.show(user)" ng-hide="user.username">
<span class="text-muted" uib-tooltip="User is not activated yet">{{ user.fallbackEmail }}</span>
</td>
<td class="text-left hand elide-table-cell hidden-xs hidden-sm" ng-click="user.role === 'owner' || useredit.show(user)">
<td class="text-left hand elide-table-cell hidden-xs hidden-sm" ng-click="canEdit(user) && useredit.show(user)">
<span class="group-badge" ng-repeat="groupId in user.groupIds">
{{ groupsById[groupId].name }}
</span>
</td>
<td class="text-right no-wrap" style="vertical-align: bottom">
<button ng-disabled="isMe(user) || user.role === 'owner' || user.source" class="btn btn-xs btn-default" ng-click="invitation.show(user)" uib-tooltip="Reset password link"><i class="fa fa-paper-plane"></i></button>
<button ng-disabled="user.role === 'owner'" class="btn btn-xs btn-default" ng-click="useredit.show(user)" uib-tooltip="Edit User"><i class="fa fa-pencil-alt"></i></button>
<button ng-disabled="isMe(user) || user.role === 'owner'" class="btn btn-xs btn-danger" ng-click="userremove.show(user)" uib-tooltip="Remove User"><i class="far fa-trash-alt"></i></button>
<button ng-disabled="!canEdit(user) || isMe(user) || user.source" class="btn btn-xs btn-default" ng-click="invitation.show(user)" uib-tooltip="Reset password link"><i class="fa fa-paper-plane"></i></button>
<button ng-disabled="!canEdit(user)" class="btn btn-xs btn-default" ng-click="useredit.show(user)" uib-tooltip="Edit User"><i class="fa fa-pencil-alt"></i></button>
<button ng-disabled="!canEdit(user) || isMe(user)" class="btn btn-xs btn-danger" ng-click="userremove.show(user)" uib-tooltip="Remove User"><i class="far fa-trash-alt"></i></button>
</td>
</tr>
</tbody>