diff options
| author | Joas Schilling <213943+nickvergessen@users.noreply.github.com> | 2018-09-19 13:45:31 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-19 13:45:31 +0200 |
| commit | dda0dfd5f13ffae5d3bfe07659344abe9d7c1606 (patch) | |
| tree | cd0627aec1c6ca70b494b1d5e431f5023990ed93 /core/js | |
| parent | b75dde0c9a218f6154158d7fe54fd38d774a1970 (diff) | |
| parent | 7f0de11bd5d95a9ff3abc886328b90f15c5851a8 (diff) | |
| download | nextcloud-server-dda0dfd5f13ffae5d3bfe07659344abe9d7c1606.tar.gz nextcloud-server-dda0dfd5f13ffae5d3bfe07659344abe9d7c1606.zip | |
Merge pull request #11171 from nextcloud/bugfix/noid/shared-by-info-for-room-shares-without-names
Better shared-by info for conversations without names
Diffstat (limited to 'core/js')
| -rw-r--r-- | core/js/sharedialogresharerinfoview.js | 32 |
1 files changed, 22 insertions, 10 deletions
diff --git a/core/js/sharedialogresharerinfoview.js b/core/js/sharedialogresharerinfoview.js index 06e18fef3f2..b2d5a093990 100644 --- a/core/js/sharedialogresharerinfoview.js +++ b/core/js/sharedialogresharerinfoview.js @@ -100,16 +100,28 @@ {escape: false} ); } else if (this.model.getReshareType() === OC.Share.SHARE_TYPE_ROOM) { - sharedByText = t( - 'core', - 'Shared with you and the conversation {conversation} by {owner}', - { - conversation: this.model.getReshareWithDisplayName(), - owner: ownerDisplayName - }, - undefined, - {escape: false} - ); + if (this.model.get('reshare').share_with_displayname) { + sharedByText = t( + 'core', + 'Shared with you and the conversation {conversation} by {owner}', + { + conversation: this.model.getReshareWithDisplayName(), + owner: ownerDisplayName + }, + undefined, + {escape: false} + ); + } else { + sharedByText = t( + 'core', + 'Shared with you in a conversation by {owner}', + { + owner: ownerDisplayName + }, + undefined, + {escape: false} + ); + } } else { sharedByText = t( 'core', |