unified way to display remote shares and mail shares

Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>

diff --git a/apps/files_sharing/lib/Controller/ShareesAPIController.php b/apps/files_sharing/lib/Controller/ShareesAPIController.php
index 58648156a99e886832230c8d8dc6bfb73d8f811f..1e5bca468214fc2a2fbaf46dac2fdcff05cdd851 100644 (file)
--- 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 6ad0576b6fa919f36f715017603c24b261f402a6..890fdb6eda0e493e9c488328f4e22e150bfd192f 100644 (file)
--- 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;

diff --git a/core/js/sharedialogshareelistview.js b/core/js/sharedialogshareelistview.js
index 66ed85eda33f78414e4a3c6c63ac136488250065..cca698905c200ba8b6a78130f56c004abaf22d55 100644 (file)
--- a/core/js/sharedialogshareelistview.js
+++ b/core/js/sharedialogshareelistview.js
@@ -24,7 +24,7 @@
                                        '{{#if avatarEnabled}}' +
                                        '<div class="avatar {{#if modSeed}}imageplaceholderseed{{/if}}" data-username="{{shareWith}}" {{#if modSeed}}data-seed="{{shareWith}} {{shareType}}"{{/if}}></div>' +
                                        '{{/if}}' +
-                                       '<span class="has-tooltip username" title="{{shareWith}}">{{shareWithDisplayName}}</span>' +
+                                       '<span class="has-tooltip username" title="{{shareWithTitle}}">{{shareWithDisplayName}}</span>' +
                                        '<span class="sharingOptionsGroup">' +
                                                '{{#if editPermissionPossible}}' +
                                                '<span class="shareOption">' +
@@ -141,6 +141,7 @@
                getShareeObject: function(shareIndex) {
                        var shareWith = this.model.getShareWith(shareIndex);
                        var shareWithDisplayName = this.model.getShareWithDisplayName(shareIndex);
+                       var shareWithTitle = '';
                        var shareType = this.model.getShareType(shareIndex);
 
                        var hasPermissionOverride = {};
@@ -148,6 +149,16 @@
                                shareWithDisplayName = shareWithDisplayName + " (" + t('core', 'group') + ')';
                        } else if (shareType === OC.Share.SHARE_TYPE_REMOTE) {
                                shareWithDisplayName = shareWithDisplayName + " (" + t('core', 'remote') + ')';
+                       } else if (shareType === OC.Share.SHARE_TYPE_EMAIL) {
+                               shareWithDisplayName = shareWithDisplayName + " (" + t('core', 'email') + ')';
+                       }
+
+                       if (shareType === OC.Share.SHARE_TYPE_GROUP) {
+                               shareWithTitle = shareWith + " (" + t('core', 'group') + ')';
+                       } else if (shareType === OC.Share.SHARE_TYPE_REMOTE) {
+                               shareWithTitle = shareWith + " (" + t('core', 'remote') + ')';
+                       } else if (shareType === OC.Share.SHARE_TYPE_EMAIL) {
+                               shareWithTitle = shareWith + " (" + t('core', 'email') + ')';
                        }
 
                        return _.extend(hasPermissionOverride, {
@@ -160,6 +171,7 @@
                                wasMailSent: this.model.notificationMailWasSent(shareIndex),
                                shareWith: shareWith,
                                shareWithDisplayName: shareWithDisplayName,
+                               shareWithTitle: shareWithTitle,
                                shareType: shareType,
                                shareId: this.model.get('shares')[shareIndex].id,
                                modSeed: shareType !== OC.Share.SHARE_TYPE_USER,

diff --git a/core/js/sharedialogview.js b/core/js/sharedialogview.js
index c22d9469da8d0df36266ca977599bcfb80d237dc..129206b0931cc61e066c443d08b6d1b9321eef13 100644 (file)
--- a/core/js/sharedialogview.js
+++ b/core/js/sharedialogview.js
@@ -272,16 +272,9 @@
                                        sharee: text
                                });
                        } else if (item.value.shareType === OC.Share.SHARE_TYPE_REMOTE) {
-                               if (item.value.server) {
-                                       text = t('core', '{sharee} (at {server})', {
-                                               sharee: text,
-                                               server: item.value.server
-                                       });
-                               } else {
                                        text = t('core', '{sharee} (remote)', {
                                                sharee: text
                                        });
-                               }
                        } else if (item.value.shareType === OC.Share.SHARE_TYPE_EMAIL) {
                                text = t('core', '{sharee} (email)', {
                                        sharee: text