aboutsummaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorRoeland Jago Douma <rullzer@users.noreply.github.com>2018-08-09 10:41:38 +0200
committerGitHub <noreply@github.com>2018-08-09 10:41:38 +0200
commitca0f2f63eb19f0d92d83c1ebbd1a29d2c7c45e08 (patch)
tree490f552a0dac4396b87336a34a0340cff31ab2cc /apps
parenta21c93a3cf991ee58b1cda3762aa84f43bc42afd (diff)
parent5109743383cdea5e73d1562f7a82051ed3a40a15 (diff)
downloadnextcloud-server-ca0f2f63eb19f0d92d83c1ebbd1a29d2c7c45e08.tar.gz
nextcloud-server-ca0f2f63eb19f0d92d83c1ebbd1a29d2c7c45e08.zip
Merge pull request #10537 from MartB/mselect_fix
Fix multiSelectMenu for public shares #10536
Diffstat (limited to 'apps')
-rw-r--r--apps/files_sharing/js/public.js19
-rw-r--r--apps/files_sharing/lib/Controller/ShareController.php1
2 files changed, 19 insertions, 1 deletions
diff --git a/apps/files_sharing/js/public.js b/apps/files_sharing/js/public.js
index 998964b2d8a..64ffe8bbf2e 100644
--- a/apps/files_sharing/js/public.js
+++ b/apps/files_sharing/js/public.js
@@ -72,7 +72,24 @@ OCA.Sharing.PublicApp = {
fileActions: fileActions,
detailsViewEnabled: false,
filesClient: filesClient,
- enableUpload: true
+ enableUpload: true,
+ multiSelectMenu: [
+ {
+ name: 'copyMove',
+ displayName: t('files', 'Move or copy'),
+ iconClass: 'icon-external',
+ },
+ {
+ name: 'download',
+ displayName: t('files', 'Download'),
+ iconClass: 'icon-download',
+ },
+ {
+ name: 'delete',
+ displayName: t('files', 'Delete'),
+ iconClass: 'icon-delete',
+ }
+ ]
}
);
this.files = OCA.Files.Files;
diff --git a/apps/files_sharing/lib/Controller/ShareController.php b/apps/files_sharing/lib/Controller/ShareController.php
index 6ebffed2b58..9594d6e71f5 100644
--- a/apps/files_sharing/lib/Controller/ShareController.php
+++ b/apps/files_sharing/lib/Controller/ShareController.php
@@ -399,6 +399,7 @@ class ShareController extends AuthPublicShareController {
\OCP\Util::addScript('files', 'fileinfomodel');
\OCP\Util::addScript('files', 'newfilemenu');
\OCP\Util::addScript('files', 'files');
+ \OCP\Util::addScript('files', 'filemultiselectmenu');
\OCP\Util::addScript('files', 'filelist');
\OCP\Util::addScript('files', 'keyboardshortcuts');
}