Merge pull request #8728 An error occurred from owncloud/sharing_fix_reshare

allow resharing of files with only share permissions

apps/files/js/filelist.js

@@ -522,12 +522,6 @@
 				mime = mime || 'httpd/unix-directory';
 			}
 
-			// user should always be able to rename a share mount point
-			var allowRename = 0;
-			if (fileData.isShareMountPoint) {
-				allowRename = OC.PERMISSION_UPDATE;
-			}
-
 			//containing tr
 			var tr = $('<tr></tr>').attr({
 				"data-id" : fileData.id,
@@ -537,7 +531,7 @@
 				"data-mime": mime,
 				"data-mtime": mtime,
 				"data-etag": fileData.etag,
-				"data-permissions": fileData.permissions | allowRename || this.getDirectoryPermissions()
+				"data-permissions": fileData.permissions || this.getDirectoryPermissions()
 			});
 
 			if (type === 'dir') {

apps/files_sharing/js/share.js

@@ -21,6 +21,11 @@ $(document).ready(function() {
 				var tr = oldCreateRow.apply(this, arguments);
 				if (fileData.shareOwner) {
 					tr.attr('data-share-owner', fileData.shareOwner);
+					// user should always be able to rename a mount point
+					if (fileData.isShareMountPoint) {
+						tr.attr('data-permissions', fileData.permissions | OC.PERMISSION_UPDATE);
+						tr.attr('data-reshare-permissions', fileData.permissions);
+					}
 				}
 				return tr;
 			};
@@ -78,7 +83,11 @@ $(document).ready(function() {
 			if ($(tr).data('type') == 'dir') {
 				itemType = 'folder';
 			}
-			var possiblePermissions = $(tr).data('permissions');
+			var possiblePermissions = $(tr).data('reshare-permissions');
+			if (_.isUndefined(possiblePermissions)) {
+				possiblePermissions = $(tr).data('permissions');
+			}
+
 			var appendTo = $(tr).find('td.filename');
 			// Check if drop down is already visible for a different file
 			if (OC.Share.droppedDown) {