From 000668425195f1968319a6446ccacda5fcf3b893 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Calvi=C3=B1o=20S=C3=A1nchez?= Date: Sun, 1 Jul 2018 17:50:57 +0200 Subject: [PATCH] Add custom handling for room shares to the resharer information MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Like done with group shares, received room shares are described as such in the UI. Signed-off-by: Daniel Calviño Sánchez --- core/js/sharedialogresharerinfoview.js | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/core/js/sharedialogresharerinfoview.js b/core/js/sharedialogresharerinfoview.js index f4bf9afa0b24b..ebf99d0f15d41 100644 --- a/core/js/sharedialogresharerinfoview.js +++ b/core/js/sharedialogresharerinfoview.js @@ -95,6 +95,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',