From 84e617b2014cd99a036f480cee23233e97bc2d4a Mon Sep 17 00:00:00 2001 From: Kyle Spearrin Date: Thu, 20 Apr 2017 23:49:33 -0400 Subject: [PATCH] list details about user w/ access to all subvaults --- src/app/organization/organizationPeopleController.js | 3 ++- .../organizationSubvaultsUsersController.js | 3 ++- src/app/organization/views/organizationPeople.html | 2 ++ .../views/organizationSubvaultsUsers.html | 12 +++++++++--- 4 files changed, 15 insertions(+), 5 deletions(-) diff --git a/src/app/organization/organizationPeopleController.js b/src/app/organization/organizationPeopleController.js index 7f231e2792..f06038142b 100644 --- a/src/app/organization/organizationPeopleController.js +++ b/src/app/organization/organizationPeopleController.js @@ -89,7 +89,8 @@ name: list.Data[i].Name, email: list.Data[i].Email, status: list.Data[i].Status, - type: list.Data[i].Type + type: list.Data[i].Type, + accessAllSubvaults: list.Data[i].AccessAllSubvaults }; users.push(user); diff --git a/src/app/organization/organizationSubvaultsUsersController.js b/src/app/organization/organizationSubvaultsUsersController.js index 959e2ed180..7a0696e539 100644 --- a/src/app/organization/organizationSubvaultsUsersController.js +++ b/src/app/organization/organizationSubvaultsUsersController.js @@ -25,7 +25,8 @@ email: userList.Data[i].Email, type: userList.Data[i].Type, status: userList.Data[i].Status, - readOnly: userList.Data[i].ReadOnly + readOnly: userList.Data[i].ReadOnly, + accessAllSubvaults: userList.Data[i].AccessAllSubvaults }); } $scope.users = users; diff --git a/src/app/organization/views/organizationPeople.html b/src/app/organization/views/organizationPeople.html index d4d003fa1b..ea26aa56d7 100644 --- a/src/app/organization/views/organizationPeople.html +++ b/src/app/organization/views/organizationPeople.html @@ -64,6 +64,8 @@ {{user.email}} +
{{user.name}}
diff --git a/src/app/organization/views/organizationSubvaultsUsers.html b/src/app/organization/views/organizationSubvaultsUsers.html index b3be81f022..1619a91a94 100644 --- a/src/app/organization/views/organizationSubvaultsUsers.html +++ b/src/app/organization/views/organizationSubvaultsUsers.html @@ -15,18 +15,23 @@
- + @@ -37,8 +42,9 @@ {{user.email}}
{{user.name}}
-
+ + {{user.type | enumName: 'OrgUserType'}}