wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #21752 from owncloud/files-delete-fix

Browse source 
Only check selection for delete permissions, not parent folder
This commit is contained in:
Thomas Müller 2016-01-26 16:13:10 +01:00
commit 22010517f5
2 changed files with 1 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
apps/files/js/filelist.js
View file

@ -2305,7 +2305,6 @@
*/
updateSelectionSummary: function() {
var summary = this._selectionSummary.summary;
var canDelete;
var selection;
if (summary.totalFiles === 0 && summary.totalDirs === 0) {
@ -2316,7 +2315,6 @@
this.$el.find('.selectedActions').addClass('hidden');
}
else {
canDelete = (this.getDirectoryPermissions() & OC.PERMISSION_DELETE) && this.isSelectedDeletable();
this.$el.find('.selectedActions').removeClass('hidden');
this.$el.find('#headerSize a>span:first').text(OC.Util.humanFileSize(summary.totalSize));
@ -2338,7 +2336,7 @@
this.$el.find('#headerName a.name>span:first').text(selection);
this.$el.find('#modified a>span:first').text('');
this.$el.find('table').addClass('multiselect');
this.$el.find('.delete-selected').toggleClass('hidden', !canDelete);
this.$el.find('.delete-selected').toggleClass('hidden', !this.isSelectedDeletable());
}
},

10
apps/files/tests/js/filelistSpec.js
View file

@ -1705,16 +1705,6 @@ describe('OCA.Files.FileList tests', function() {
});
});
describe('Selection overlay', function() {
it('show delete action according to directory permissions', function() {
fileList.setFiles(testFiles);
$('#permissions').val(OC.PERMISSION_READ | OC.PERMISSION_DELETE);
$('.select-all').click();
expect(fileList.$el.find('.delete-selected').hasClass('hidden')).toEqual(false);
$('.select-all').click();
$('#permissions').val(OC.PERMISSION_READ);
$('.select-all').click();
expect(fileList.$el.find('.delete-selected').hasClass('hidden')).toEqual(true);
});
it('show doesnt show the delete action if one or more files are not deletable', function () {
fileList.setFiles(testFiles);
$('#permissions').val(OC.PERMISSION_READ | OC.PERMISSION_DELETE);