Merge pull request #7126 from nickvergessen/issue/6683
Only add files to file list when uploading to current directory
This commit is contained in:
commit
6b5a7035ee
|
@ -139,7 +139,8 @@ if (strpos($dir, '..') === false) {
|
||||||
'originalname' => $files['tmp_name'][$i],
|
'originalname' => $files['tmp_name'][$i],
|
||||||
'uploadMaxFilesize' => $maxUploadFileSize,
|
'uploadMaxFilesize' => $maxUploadFileSize,
|
||||||
'maxHumanFilesize' => $maxHumanFileSize,
|
'maxHumanFilesize' => $maxHumanFileSize,
|
||||||
'permissions' => $meta['permissions'] & $allowedPermissions
|
'permissions' => $meta['permissions'] & $allowedPermissions,
|
||||||
|
'directory' => \OC\Files\Filesystem::normalizePath(stripslashes($dir)),
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -166,7 +167,8 @@ if (strpos($dir, '..') === false) {
|
||||||
'originalname' => $files['tmp_name'][$i],
|
'originalname' => $files['tmp_name'][$i],
|
||||||
'uploadMaxFilesize' => $maxUploadFileSize,
|
'uploadMaxFilesize' => $maxUploadFileSize,
|
||||||
'maxHumanFilesize' => $maxHumanFileSize,
|
'maxHumanFilesize' => $maxHumanFileSize,
|
||||||
'permissions' => $meta['permissions'] & $allowedPermissions
|
'permissions' => $meta['permissions'] & $allowedPermissions,
|
||||||
|
'directory' => \OC\Files\Filesystem::normalizePath(stripslashes($dir)),
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -922,8 +922,8 @@ $(document).ready(function() {
|
||||||
data.context.find('td.filesize').text(humanFileSize(size));
|
data.context.find('td.filesize').text(humanFileSize(size));
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
// only append new file if dragged onto current dir's crumb (last)
|
// only append new file if uploaded into the current folder
|
||||||
if (data.context && data.context.hasClass('crumb') && !data.context.hasClass('last')) {
|
if (file.directory !== FileList.getCurrentDirectory()) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue