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

admin is now simply a flag

Browse Source
This commit is contained in:
Girish Ramakrishnan
2018-07-26 15:45:52 -07:00
parent 314da7ace8
commit 9e9e651714
6 changed files with 20 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/views/users.html
View File

@@ -40,14 +40,14 @@
<label class="control-label">Groups</label>
<div class="control-label">
<div ng-show="groups.length <= 1">No groups available.</div>
<multiselect ng-show="groups.length > 1" ng-model="useradd.selectedGroups" options="group.name for group in groups | ignoreAdminGroup" data-compare-by="name" data-multiple="true"></multiselect>
<multiselect ng-show="groups.length > 1" ng-model="useradd.selectedGroups" options="group.name for group in groups" data-compare-by="name" data-multiple="true"></multiselect>
</div>
</div>
<div class="form-group">
<div class="checkbox">
<label>
<input type="checkbox" ng-model="useradd.superuser"> User is an <a href="https://cloudron.io/documentation/user-management/#administrators" target="_blank">administrator</a>
<input type="checkbox" ng-model="useradd.admin"> User is an <a href="https://cloudron.io/documentation/user-management/#administrators" target="_blank">administrator</a>
</label>
</div>
</div>
@@ -136,13 +136,13 @@
<label class="control-label">Groups</label>
<div class="control-label">
<div ng-show="groups.length <= 1">No groups available.</div>
<multiselect ng-show="groups.length > 1" ng-model="useredit.selectedGroups" options="group.name for group in groups | ignoreAdminGroup" data-compare-by="name" data-multiple="true"></multiselect>
<multiselect ng-show="groups.length > 1" ng-model="useredit.selectedGroups" options="group.name for group in groups" data-compare-by="name" data-multiple="true"></multiselect>
</div>
</div>
<div class="form-group" ng-hide="isMe(useredit.userInfo)">
<div class="checkbox">
<label>
<input type="checkbox" ng-model="useredit.superuser"> User is an <a href="https://cloudron.io/documentation/user-management/#administrators" target="_blank">administrator</a>
<input type="checkbox" ng-model="useredit.admin"> User is an <a href="https://cloudron.io/documentation/user-management/#administrators" target="_blank">administrator</a>
</label>
</div>
</div>
@@ -318,7 +318,7 @@
<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="useredit.show(user)">
<span class="group-badge" ng-repeat="groupId in user.groupIds | ignoreAdminGroup">
<span class="group-badge" ng-repeat="groupId in user.groupIds">
{{ groupsById[groupId].name }}
</span>
</td>
@@ -363,7 +363,7 @@
</tr>
</thead>
<tbody>
<tr ng-repeat="group in groups | ignoreAdminGroup">
<tr ng-repeat="group in groups">
<td class="hand elide-table-cell" style="text-overflow: ellipsis; white-space: nowrap;" ng-click="groupEdit.show(group)">
{{ group.name }}
</td>