You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by ma...@apache.org on 2017/10/16 18:35:29 UTC
[1/2] airavata-php-gateway git commit: [JIRA-ISSUE: 2444] Added User
list with username, email, firstname, lastname fields Issue Resolved
Repository: airavata-php-gateway
Updated Branches:
refs/heads/develop 5276a786f -> 702abd766
[JIRA-ISSUE: 2444] Added User list with username, email, firstname, lastname fields
Issue Resolved
Project: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/commit/f48ea90e
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/f48ea90e
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/f48ea90e
Branch: refs/heads/develop
Commit: f48ea90e0f1aa2de0e1a860222b2adf635b88fb2
Parents: 85c0766
Author: stephenpaul2727 <st...@gmail.com>
Authored: Sun Oct 8 14:45:42 2017 -0400
Committer: stephenpaul2727 <st...@gmail.com>
Committed: Sun Oct 8 14:45:42 2017 -0400
----------------------------------------------------------------------
app/libraries/IamAdminServicesUtilities.php | 2 +-
app/libraries/Keycloak/Keycloak.php | 3 ++-
app/views/admin/manage-users.blade.php | 13 ++++++++++---
3 files changed, 13 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/f48ea90e/app/libraries/IamAdminServicesUtilities.php
----------------------------------------------------------------------
diff --git a/app/libraries/IamAdminServicesUtilities.php b/app/libraries/IamAdminServicesUtilities.php
index fbb208e..3ba50df 100644
--- a/app/libraries/IamAdminServicesUtilities.php
+++ b/app/libraries/IamAdminServicesUtilities.php
@@ -33,7 +33,7 @@ class IamAdminServicesUtilities {
$user_profiles = IamAdminServices::getUsersWithRole($authz_token, $role_name);
$users = [];
foreach ($user_profiles as $user_profile) {
- $users[] = $user_profile->userId;
+ array_push($users, (object)["firstName"=>$user_profile->firstName,"lastName"=>$user_profile->lastName,"email"=>implode(",",$user_profile->emails),"userName"=>$user_profile->userId]);
}
return $users;
}
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/f48ea90e/app/libraries/Keycloak/Keycloak.php
----------------------------------------------------------------------
diff --git a/app/libraries/Keycloak/Keycloak.php b/app/libraries/Keycloak/Keycloak.php
index 25a059e..18dce8f 100644
--- a/app/libraries/Keycloak/Keycloak.php
+++ b/app/libraries/Keycloak/Keycloak.php
@@ -251,7 +251,7 @@ class Keycloak {
$users = $this->users->getUsers($this->realm);
$usernames = [];
foreach ($users as $user) {
- $usernames[] = $user->username;
+ array_push($usernames, (object)["firstName"=>$user->firstName,"lastName"=>$user->lastName,"email"=>$user->email,"userName"=>$user->username]);
}
return $usernames;
}
@@ -447,3 +447,4 @@ class Keycloak {
return $json;
}
}
+
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/f48ea90e/app/views/admin/manage-users.blade.php
----------------------------------------------------------------------
diff --git a/app/views/admin/manage-users.blade.php b/app/views/admin/manage-users.blade.php
index c8ea524..1b038cb 100644
--- a/app/views/admin/manage-users.blade.php
+++ b/app/views/admin/manage-users.blade.php
@@ -54,7 +54,11 @@
<table class="table table-striped table-condensed">
<tr>
+ <th>First Name</th>
+ <th>Last Name</th>
<th>Username</th>
+ <th>Email</th>
+
<th>
Role :
<select onchange="location = this.options[this.selectedIndex].value;">
@@ -77,10 +81,13 @@
</tr>
@foreach( (array)$users as $user)
<tr class="user-row">
- <td>{{ $user }}</td>
+ <td>{{ $user->firstName }}</td>
+ <td>{{ $user->lastName }}</td>
+ <td>{{ $user->userName }}</td>
+ <td>{{ $user->email }}</td>
<td>
<button class="button btn btn-default check-roles" type="button"
- data-username="{{$user}}">Check All Roles
+ data-username="{{$user->userName}}">Check All Roles
</button>
<div class="user-roles"></div>
</td>
@@ -280,4 +287,4 @@
});
}
</script>
-@stop
\ No newline at end of file
+@stop
[2/2] airavata-php-gateway git commit: Merge branch
'user_list_enhancement' of
https://github.com/stephenpaul2727/airavata-php-gateway into develop
Posted by ma...@apache.org.
Merge branch 'user_list_enhancement' of https://github.com/stephenpaul2727/airavata-php-gateway into develop
Project: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/commit/702abd76
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/702abd76
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/702abd76
Branch: refs/heads/develop
Commit: 702abd7664426bdcc365c19309d1e6b1921964b7
Parents: 5276a78 f48ea90
Author: Marcus Christie <ma...@iu.edu>
Authored: Mon Oct 16 14:35:17 2017 -0400
Committer: Marcus Christie <ma...@iu.edu>
Committed: Mon Oct 16 14:35:17 2017 -0400
----------------------------------------------------------------------
app/libraries/IamAdminServicesUtilities.php | 2 +-
app/libraries/Keycloak/Keycloak.php | 3 ++-
app/views/admin/manage-users.blade.php | 13 ++++++++++---
3 files changed, 13 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/702abd76/app/libraries/Keycloak/Keycloak.php
----------------------------------------------------------------------