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

show if user is not activated yet

Browse Source
This commit is contained in:
Johannes Zellner
2016-09-28 12:20:45 +02:00
parent 11cfa2efaa
commit b0c470da5a
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
webadmin/src/views/users.html
View File

@@ -268,10 +268,13 @@
<td>
<i class="fa fa-briefcase arrow" ng-show="user.admin" uib-tooltip="This user can manage apps, groups and other users"></i>
</td>
<td class="hand elide-table-cell" ng-click="showUserEdit(user)">
<td class="hand elide-table-cell" ng-click="showUserEdit(user)" ng-show="user.username">
{{ user.username }}
<span class="text-muted">{{ user.email }}</span>
</td>
<td class="hand elide-table-cell" ng-click="showUserEdit(user)" ng-hide="user.username">
<span class="text-muted" uib-tooltip="User is not activated yet">{{ user.alternateEmail || user.email }}</span>
</td>
<td class="text-left hand elide-table-cell hidden-xs hidden-sm" ng-click="showUserEdit(user)">
<span class="group-badge" ng-repeat="groupId in user.groupIds | ignoreAdminGroup">{{ groupId }}</span>
</td>

2
webadmin/src/views/users.js
View File

@@ -333,7 +333,7 @@ angular.module('Application').controller('UsersController', ['$scope', '$locatio
$scope.userremove.error.username = null;
$scope.userremove.error.password = null;
if ($scope.userremove.username !== $scope.userremove.userInfo.username && $scope.userremove.username !== $scope.userremove.userInfo.email) {
if ($scope.userremove.username !== $scope.userremove.userInfo.username && $scope.userremove.username !== $scope.userremove.userInfo.email && $scope.userremove.username !== $scope.userremove.userInfo.alternateEmail) {
$scope.userremove.error.username = true;
$scope.userremove.username = '';
$scope.userremove_form.username.$setPristine();