diff options
| author | Marcos Zuriaga <wolfi@wolfi.es> | 2016-10-04 20:59:55 +0300 |
|---|---|---|
| committer | Marcos Zuriaga <wolfi@wolfi.es> | 2016-10-04 20:59:55 +0300 |
| commit | 2259f002be833c7f041b96a9a7aae790601fadbd (patch) | |
| tree | 0d26ee4fbbcc5bfe7eb0529c09e67ea1971e673e /controller | |
| parent | d379abab18c51bde055caa11a2780540e96d90c0 (diff) | |
Added pending requests to the acl api
Diffstat (limited to 'controller')
| -rw-r--r-- | controller/sharecontroller.php | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/controller/sharecontroller.php b/controller/sharecontroller.php index 7ad87e2e..419649bc 100644 --- a/controller/sharecontroller.php +++ b/controller/sharecontroller.php @@ -348,9 +348,14 @@ class ShareController extends ApiController { public function getItemAcl($item_guid){ $acl = $this->shareService->getCredentialAclList($item_guid); + $pending = $this->shareService->getCredentialPendingAclList($item_guid); try { $credential = $this->credentialService->getCredentialByGUID($item_guid); if ($credential->getUserId() == $this->userId->getUID()){ + foreach ($pending as &$item){ + $item = $item->asACLJson(); + } + $acl = array_merge($acl, $pending); return new JSONResponse($acl); } else{ |