Use property to check if a share entry is shared with the current user

Signed-off-by: Julius Härtl <jus@bitgrid.net>
nextcloud · Oct 31, 2018 · 9e88c56 · 9e88c56
1 parent 419b475
commit 9e88c56
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/core/js/share/sharedialogshareelistview.handlebars b/core/js/share/sharedialogshareelistview.handlebars
@@ -1,5 +1,6 @@
 <ul id="shareWithList" class="shareWithList">
 	{{#each sharees}}
+        {{#if !isShareWithCurrentUser}}
 		<li data-share-id="{{shareId}}" data-share-type="{{shareType}}" data-share-with="{{shareWith}}">
 			<div class="avatar {{#if modSeed}}imageplaceholderseed{{/if}}" data-username="{{shareWith}}" data-avatar="{{shareWithAvatar}}" data-displayname="{{shareWithDisplayName}}" {{#if modSeed}}data-seed="{{shareWith}} {{shareType}}"{{/if}}></div>
 			<span class="username" title="{{shareWithTitle}}">{{shareWithDisplayName}}</span>
@@ -17,7 +18,8 @@
 			</span>
 			{{/if}}
 		</li>
-		{{/each}}
+		{{/if}}
+    {{/each}}
 	{{#each linkReshares}}
 		<li data-share-id="{{shareId}}" data-share-type="{{shareType}}">
 			<div class="avatar" data-username="{{shareInitiator}}"></div>

diff --git a/core/js/sharedialogshareelistview.js b/core/js/sharedialogshareelistview.js
@@ -152,6 +152,7 @@
 				shareId: this.model.get('shares')[shareIndex].id,
 				modSeed: shareWithAvatar || (shareType !== OC.Share.SHARE_TYPE_USER && shareType !== OC.Share.SHARE_TYPE_CIRCLE && shareType !== OC.Share.SHARE_TYPE_ROOM),
 				owner: fileOwnerUid,
+				isShareWithCurrentUser: (shareType === OC.Share.SHARE_TYPE_USER && shareWith === oc_current_user),
 				canUpdateShareSettings: (sharedBy === oc_current_user || fileOwnerUid === oc_current_user),
 				isRemoteShare: shareType === OC.Share.SHARE_TYPE_REMOTE,
 				isRemoteGroupShare: shareType === OC.Share.SHARE_TYPE_REMOTE_GROUP,
@@ -366,9 +367,6 @@
 			if(_.isArray(sharees)) {
 				for (var i = 0; i < sharees.length; i++) {
 					data.sharees[i].popoverMenu = this.popoverMenuTemplate(sharees[i]);
-					if (data.sharees[i].shareType === OC.Share.SHARE_TYPE_USER && data.sharees[i].shareWith === OC.getCurrentUser().uid) {
-						data.sharees.splice(i, 1);
-					}
 				}
 			}
 			return OC.Share.Templates['sharedialogshareelistview'](data);