diff options
| author | Vincent Petry <pvince81@owncloud.com> | 2013-12-09 16:03:23 +0100 |
|---|---|---|
| committer | Vincent Petry <pvince81@owncloud.com> | 2014-01-16 17:50:07 +0100 |
| commit | d44b98d3dd1c8147228b23101aa89b3f0171ec81 (patch) | |
| tree | d55fdc0eb4675c18126c74529bd2ca6426304cf9 | |
| parent | a4e842f19a25bf5e42bb4d837475dbdb2f0d49cc (diff) | |
| download | nextcloud-server-d44b98d3dd1c8147228b23101aa89b3f0171ec81.tar.gz nextcloud-server-d44b98d3dd1c8147228b23101aa89b3f0171ec81.zip | |
Fix to not destroy draggable when no draggable was set
When a dir has no delete permission, the draggable isn't initialized on
files. This fix makes sure we don't try to destroy a draggable when it
wasn't inited in the first place.
Fixes #6254
Backport of 8135828 to stable6
| -rw-r--r-- | apps/files/js/filelist.js | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js index c02ab70ce8d..30aea9c8c8d 100644 --- a/apps/files/js/filelist.js +++ b/apps/files/js/filelist.js @@ -300,7 +300,10 @@ var FileList={ }, remove:function(name){ var fileEl = FileList.findFileEl(name); - fileEl.find('td.filename').draggable('destroy'); + if (fileEl.data('permissions') & OC.PERMISSION_DELETE) { + // file is only draggable when delete permissions are set + fileEl.find('td.filename').draggable('destroy'); + } fileEl.remove(); FileList.updateFileSummary(); if ( ! $('tr[data-file]').exists() ) { |