summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorDaniel Calviño Sánchez <danxuliu@gmail.com>2018-07-01 17:50:57 +0200
committerDaniel Calviño Sánchez <danxuliu@gmail.com>2018-08-08 14:25:44 +0200
commite1561f0e8fa0437e485820cadb8c225e8d10d3df (patch)
tree9afb363bb229627fda160132e5652f224d1afb01 /core
parent2d062daa11bdbbb1ac652e34869eaa0a1e550878 (diff)
downloadnextcloud-server-e1561f0e8fa0437e485820cadb8c225e8d10d3df.tar.gz
nextcloud-server-e1561f0e8fa0437e485820cadb8c225e8d10d3df.zip
Add custom handling for room shares to the resharer information
Like done with group shares, received room shares are described as such in the UI. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
Diffstat (limited to 'core')
-rw-r--r--core/js/sharedialogresharerinfoview.js11
1 files changed, 11 insertions, 0 deletions
diff --git a/core/js/sharedialogresharerinfoview.js b/core/js/sharedialogresharerinfoview.js
index fadd0a41f7b..06e18fef3f2 100644
--- a/core/js/sharedialogresharerinfoview.js
+++ b/core/js/sharedialogresharerinfoview.js
@@ -99,6 +99,17 @@
undefined,
{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}
+ );
} else {
sharedByText = t(
'core',