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 /core | |
| 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 'core')
| -rw-r--r-- | core/js/sharedialogshareelistview.js | 14 | ||||
| -rw-r--r-- | core/js/sharedialogview.js | 7 |
2 files changed, 13 insertions, 8 deletions
diff --git a/core/js/sharedialogshareelistview.js b/core/js/sharedialogshareelistview.js index 66ed85eda33..cca698905c2 100644 --- 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 c22d9469da8..129206b0931 100644 --- 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 |