From a49aff2db79aa5913ce000f6752e9347d170a63f Mon Sep 17 00:00:00 2001 From: Robin McCorkell Date: Fri, 15 Jan 2016 16:52:51 +0000 Subject: [PATCH 1/2] Only check selection for delete permissions, not parent folder --- apps/files/js/filelist.js | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js index d0c7687e5b6..35999b5d0ee 100644 --- a/apps/files/js/filelist.js +++ b/apps/files/js/filelist.js @@ -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()); } }, From df7db3685ebc4d188d604e1ccf94c4ecf0f2d5b1 Mon Sep 17 00:00:00 2001 From: Robin McCorkell Date: Fri, 15 Jan 2016 20:46:39 +0000 Subject: [PATCH 2/2] Remove faulty directory permissions test --- apps/files/tests/js/filelistSpec.js | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/apps/files/tests/js/filelistSpec.js b/apps/files/tests/js/filelistSpec.js index e6046f2197e..e9662b71b93 100644 --- a/apps/files/tests/js/filelistSpec.js +++ b/apps/files/tests/js/filelistSpec.js @@ -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);