upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-06-13 10:40:40 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Fix public download link when zip download is disabled

Browse source 
When zip download is disabled, the public download action defined in
public.js is overridden by the one in fileactions.js because of the JS
loading order.

This quick fix prevents the override to happen when a download action is
already defined.

There are additional changes that were required to make the download
action icon work when registered from the public page.
This commit is contained in:
Vincent Petry 2014-06-12 17:29:55 +02:00
parent b2fae8a8b7
commit 8ef1542ad0
2 changed files with 14 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
apps/files/js/fileactions.js
View file

@ -163,13 +163,18 @@ var FileActions = {
};
$(document).ready(function () {
var hasDownloadAction = false;
var downloadScope;
if ($('#allowZipDownload').val() == 1) {
var downloadScope = 'all';
downloadScope = 'all';
} else {
var downloadScope = 'file';
downloadScope = 'file';
}
if (typeof disableDownloadActions == 'undefined' || !disableDownloadActions) {
hasDownloadAction = FileActions.actions[downloadScope] && FileActions.actions[downloadScope].Download;
// do not override download action if it exists (might have been registered by an app already)
if ((typeof disableDownloadActions == 'undefined' || !disableDownloadActions) && !hasDownloadAction) {
FileActions.register(downloadScope, 'Download', OC.PERMISSION_READ, function () {
return OC.imagePath('core', 'actions/download');
}, function (filename) {

8
apps/files_sharing/js/public.js
View file

@ -25,13 +25,17 @@ $(document).ready(function() {
window.location = $(tr).find('a.name').attr('href');
}
});
FileActions.register('file', 'Download', OC.PERMISSION_READ, '', function(filename) {
FileActions.register('file', 'Download', OC.PERMISSION_READ, function() {
return OC.imagePath('core', 'actions/download');
}, function(filename) {
var tr = FileList.findFileEl(filename);
if (tr.length > 0) {
window.location = $(tr).find('a.name').attr('href');
}
});
FileActions.register('dir', 'Download', OC.PERMISSION_READ, '', function(filename) {
FileActions.register('dir', 'Download', OC.PERMISSION_READ, function() {
return OC.imagePath('core', 'actions/download');
}, function(filename) {
var tr = FileList.findFileEl(filename);
if (tr.length > 0) {
window.location = $(tr).find('a.name').attr('href')+'&download';