From 22b63ecd12cc49844133cb6f3e9f35c246b7b6e1 Mon Sep 17 00:00:00 2001 From: Vincent Petry Date: Tue, 18 Aug 2015 11:35:21 +0200 Subject: [PATCH 1/2] Load missing JS dep in public link page --- apps/files_sharing/templates/public.php | 1 + 1 file changed, 1 insertion(+) diff --git a/apps/files_sharing/templates/public.php b/apps/files_sharing/templates/public.php index 2962f62520..43c76125e1 100644 --- a/apps/files_sharing/templates/public.php +++ b/apps/files_sharing/templates/public.php @@ -16,6 +16,7 @@ OCP\Util::addStyle('files', 'files'); OCP\Util::addStyle('files', 'upload'); OCP\Util::addScript('files', 'filesummary'); OCP\Util::addScript('files', 'breadcrumb'); +OCP\Util::addScript('files', 'fileinfomodel'); OCP\Util::addScript('files', 'files'); OCP\Util::addScript('files', 'filelist'); OCP\Util::addscript('files', 'keyboardshortcuts'); From 37a842a18e094b075ca6a97fd5879647fce9dc21 Mon Sep 17 00:00:00 2001 From: Vincent Petry Date: Tue, 18 Aug 2015 11:35:40 +0200 Subject: [PATCH 2/2] Only show delete action in menu when delete permission exists This reverts an older decision where we said the delete action must always appear but be grayed out when the permission is missing. The actions menu obsoletes that. --- apps/files/js/fileactions.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/files/js/fileactions.js b/apps/files/js/fileactions.js index 1d0493f214..f3f137a053 100644 --- a/apps/files/js/fileactions.js +++ b/apps/files/js/fileactions.js @@ -616,7 +616,7 @@ name: 'Delete', mime: 'all', // permission is READ because we show a hint instead if there is no permission - permissions: OC.PERMISSION_READ, + permissions: OC.PERMISSION_DELETE, icon: function() { return OC.imagePath('core', 'actions/delete'); },