Skip to content
Permalink
Browse files
AIRAVATA-2571 User enabled instead of email verified
  • Loading branch information
machristie committed Jan 4, 2018
1 parent 092026e commit f562846623659a0c37830fad197fc7f6003f722e
Showing 2 changed files with 8 additions and 5 deletions.
@@ -259,7 +259,8 @@ public function listUsers(){
$users = $this->users->getUsers($this->realm);
$usernames = [];
foreach ($users as $user) {
array_push($usernames, (object)["firstName"=>$user->firstName,"lastName"=>$user->lastName,"email"=>$user->email,"emailVerified"=>$user->emailVerified,"userName"=>$user->username]);
Log::debug("user", array($user));
array_push($usernames, (object)["firstName"=>$user->firstName,"lastName"=>$user->lastName,"email"=>$user->email,"userEnabled"=>$user->enabled,"userName"=>$user->username]);
}
return $usernames;
}
@@ -275,7 +276,7 @@ public function searchUsers($phrase){
$users = $this->users->searchUsers($this->realm, $phrase);
$usernames = [];
foreach ($users as $user) {
array_push($usernames, (object)["firstName"=>$user->firstName,"lastName"=>$user->lastName,"email"=>$user->email,"userName"=>$user->username]);
array_push($usernames, (object)["firstName"=>$user->firstName,"lastName"=>$user->lastName,"email"=>$user->email,"userEnabled"=>$user->enabled,"userName"=>$user->username]);
}
return $usernames;
}
@@ -374,6 +375,7 @@ public function getUserProfile($username){
$result["email"] = $user->email;
$result["firstname"] = $user->firstName;
$result["lastname"] = $user->lastName;
$result["userEnabled"] = $user->enabled;
return $result;
}else{
return [];
@@ -58,7 +58,7 @@
<th>Last Name</th>
<th>Username</th>
<th>Email</th>
<th>Email Verified</th>
<th>User Enabled</th>

<th>
Role :
@@ -86,14 +86,15 @@
<td>{{ $user->lastName }}</td>
<td>{{ $user->userName }}</td>
<td>{{ $user->email }}</td>
@if($user->emailVerified)
@if($user->userEnabled)
<td class="text-success"><span class="glyphicon glyphicon-ok"></span></td>
@else
<td class="text-danger"><span class="glyphicon glyphicon-remove"></span></td>
@endif
<td>
<button class="button btn btn-default check-roles" type="button"
data-username="{{$user->userName}}">Check All Roles
data-username="{{$user->userName}}"
@if(!$user->userEnabled)disabled @endif>Check All Roles
</button>
<div class="user-roles"></div>
</td>

0 comments on commit f562846

Please sign in to comment.