Merge pull request #10692 from nextcloud/deleted-share-remove-actions

Do not show action menu if no actions are available
nextcloud · Aug 16, 2018 · 2b5ec37 · 2b5ec37
2 parents b0af604 + 5647f85
commit 2b5ec37
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 4 deletions.
diff --git a/apps/files/js/fileactions.js b/apps/files/js/fileactions.js
@@ -558,7 +558,27 @@
 				}
 			});
 
-			this._renderMenuTrigger($tr, context);
+			function objectValues(obj) {
+				var res = [];
+				for (var i in obj) {
+					if (obj.hasOwnProperty(i)) {
+						res.push(obj[i]);
+					}
+				}
+				return res;
+			}
+			// polyfill
+			if (!Object.values) {
+				Object.values = objectValues;
+			}
+
+			var menuActions = Object.values(this.actions.all).filter(function (action) {
+				return action.type !== OCA.Files.FileActions.TYPE_INLINE;
+			});
+			// do not render the menu if nothing is in it
+			if (menuActions.length > 0) {
+				this._renderMenuTrigger($tr, context);
+			}
 
 			if (triggerEvent){
 				fileList.$fileList.trigger(jQuery.Event("fileActionsReady", {fileList: fileList, $files: $tr}));

diff --git a/apps/files_sharing/js/share.js b/apps/files_sharing/js/share.js
@@ -42,14 +42,16 @@
 			var fileActions = fileList.fileActions;
 			var oldCreateRow = fileList._createRow;
 			fileList._createRow = function(fileData) {
+
+				var tr = oldCreateRow.apply(this, arguments);
+				var sharePermissions = OCA.Sharing.Util.getSharePermissions(fileData);
 
 				if (fileData.permissions === 0) {
 					// no permission, disabling sidebar
+					delete fileActions.actions.all.Comment;
 					delete fileActions.actions.all.Details;
+					delete fileActions.actions.all.Goto;
 				}
-
-				var tr = oldCreateRow.apply(this, arguments);
-				var sharePermissions = OCA.Sharing.Util.getSharePermissions(fileData);
 				tr.attr('data-share-permissions', sharePermissions);
 				if (fileData.shareOwner) {
 					tr.attr('data-share-owner', fileData.shareOwner);