diff options
| author | Bjoern Schiessle <bjoern@schiessle.org> | 2016-10-25 16:24:49 +0200 |
|---|---|---|
| committer | Bjoern Schiessle <bjoern@schiessle.org> | 2016-11-01 19:54:40 +0100 |
| commit | 392c8a115f136b4aa63ee759cf359595256d153d (patch) | |
| tree | cb631a34bdb9ebb51c12ca6d9cd831cd62ac1df5 /apps/files_sharing | |
| parent | 8c8a019b7eb3de0262712aa145e5cd7e4f3cd2bd (diff) | |
| download | nextcloud-server-392c8a115f136b4aa63ee759cf359595256d153d.tar.gz nextcloud-server-392c8a115f136b4aa63ee759cf359595256d153d.zip | |
unified way to display remote shares and mail shares
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
Diffstat (limited to 'apps/files_sharing')
| -rw-r--r-- | apps/files_sharing/lib/Controller/ShareesAPIController.php | 4 | ||||
| -rw-r--r-- | apps/files_sharing/tests/Controller/ShareAPIControllerTest.php | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/apps/files_sharing/lib/Controller/ShareesAPIController.php b/apps/files_sharing/lib/Controller/ShareesAPIController.php index 58648156a99..1e5bca46821 100644 --- a/apps/files_sharing/lib/Controller/ShareesAPIController.php +++ b/apps/files_sharing/lib/Controller/ShareesAPIController.php @@ -298,7 +298,7 @@ class ShareesAPIController extends OCSController { $foundRemoteById = true; } $this->result['exact']['remotes'][] = [ - 'label' => $contact['FN'], + 'label' => $contact['FN'] . " ($cloudId)", 'value' => [ 'shareType' => Share::SHARE_TYPE_REMOTE, 'shareWith' => $cloudId, @@ -307,7 +307,7 @@ class ShareesAPIController extends OCSController { ]; } else { $this->result['remotes'][] = [ - 'label' => $contact['FN'], + 'label' => $contact['FN'] . " ($cloudId)", 'value' => [ 'shareType' => Share::SHARE_TYPE_REMOTE, 'shareWith' => $cloudId, diff --git a/apps/files_sharing/tests/Controller/ShareAPIControllerTest.php b/apps/files_sharing/tests/Controller/ShareAPIControllerTest.php index 6ad0576b6fa..890fdb6eda0 100644 --- a/apps/files_sharing/tests/Controller/ShareAPIControllerTest.php +++ b/apps/files_sharing/tests/Controller/ShareAPIControllerTest.php @@ -23,8 +23,10 @@ */ namespace OCA\Files_Sharing\Tests\Controller; +use OC\ContactsManager; use OCP\AppFramework\Http\DataResponse; use OCP\AppFramework\OCS\OCSNotFoundException; +use OCP\Contacts; use OCP\Files\Folder; use OCP\IL10N; use OCA\Files_Sharing\Controller\ShareAPIController; |