Merge pull request #23433 from owncloud/stable82_fix_22128

Do not show hash if parent is shared by link

1 files changed, 15 insertions, 2 deletions

diff --git a/core/js/sharedialogshareelistview.js b/core/js/sharedialogshareelistview.js
index f18d7fde067..b4c70fe418a 100644
--- a/core/js/sharedialogshareelistview.js
+++ b/core/js/sharedialogshareelistview.js
@@ -129,10 +129,23 @@
 			}
 			var displayName = this.model.getShareWithDisplayName(shareIndex);
 			if(!_.isUndefined(this._collections[id])) {
-				this._collections[id].text = this._collections[id].text + ", " + displayName;
+				if (this.model.getShareType(shareIndex) === OC.Share.SHARE_TYPE_LINK) {
+					this._collections[id].text = this._collections[id].text + ", " + t('core', 'by link');
+				} else {
+					this._collections[id].text = this._collections[id].text + ", " + displayName;
+				}
 			} else {
 				this._collections[id] = {};
-				this._collections[id].text = t('core', 'Shared in {item} with {user}', {'item': id, user: displayName});
+				if (this.model.getShareType(shareIndex) === OC.Share.SHARE_TYPE_LINK) {
+					this._collections[id].text = t('core', 'Shared in {item} by link', {
+						'item': id
+					});
+				} else {
+					this._collections[id].text = t('core', 'Shared in {item} with {user}', {
+						'item': id,
+						user: displayName
+					});
+				}
 				this._collections[id].id = id;
 				this._collections[id].isCollection = true;
 			}