Merge pull request #18318 from owncloud/files-sidebar-fixtabs

Improve right sidebar tabs behavior

2 files changed, 15 insertions, 2 deletions

diff --git a/apps/files_sharing/js/share.js b/apps/files_sharing/js/share.js
index 04700b84011..c124d390d04 100644
--- a/apps/files_sharing/js/share.js
+++ b/apps/files_sharing/js/share.js
@@ -60,6 +60,14 @@
 				return tr;
 			};
 
+			var oldElementToFile = fileList.elementToFile;
+			fileList.elementToFile = function($el) {
+				var fileInfo = oldElementToFile.apply(this, arguments);
+				fileInfo.sharePermissions = $el.attr('data-share-permissions') || undefined;
+				fileInfo.shareOwner = $el.attr('data-share-owner') || undefined;
+				return fileInfo;
+			};
+
 			// use delegate to catch the case with multiple file lists
 			fileList.$el.on('fileActionsReady', function(ev){
 				var fileList = ev.fileList;
diff --git a/apps/files_sharing/js/sharetabview.js b/apps/files_sharing/js/sharetabview.js
index 5f4a21a4a57..ee572b747ea 100644
--- a/apps/files_sharing/js/sharetabview.js
+++ b/apps/files_sharing/js/sharetabview.js
@@ -10,7 +10,7 @@
 
 (function() {
 	var TEMPLATE =
-		'<div>Owner: {{owner}}';
+		'<div><ul>{{#if owner}}<li>Owner: {{owner}}</li>{{/if}}</ul></div>';
 
 	/**
 	 * @memberof OCA.Sharing
@@ -37,8 +37,13 @@
 			}
 
 			if (this.model) {
+				console.log(this.model);
+				var owner = this.model.get('shareOwner');
+				if (owner === OC.currentUser) {
+					owner = null;
+				}
 				this.$el.append(this._template({
-					owner: this.model.get('shareOwner') || OC.currentUser
+					owner: owner
 				}));
 
 			} else {