Dont show the delete button for selected files if one of the selected files is not...

diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js
index bec0155e90e2df227e619e020c4a79f21814f887..6ffc10cdcbdbed96cca4dfa429e75632336e4a4a 100644 (file)
--- a/apps/files/js/filelist.js
+++ b/apps/files/js/filelist.js
@@ -526,7 +526,8 @@
                                mimetype: $el.attr('data-mime'),
                                type: $el.attr('data-type'),
                                size: parseInt($el.attr('data-size'), 10),
-                               etag: $el.attr('data-etag')
+                               etag: $el.attr('data-etag'),
+                               permissions: parseInt($el.attr('data-permissions'), 10)
                        };
                },
 
@@ -1636,7 +1637,7 @@
                                this.$el.find('.selectedActions').addClass('hidden');
                        }
                        else {
-                               canDelete = (this.getDirectoryPermissions() & OC.PERMISSION_DELETE);
+                               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));
                                var selection = '';
@@ -1656,6 +1657,15 @@
                        }
                },
 
+               /**
+                * Check whether all selected files are deletable
+                */
+               isSelectedDeletable: function() {
+                       return _.reduce(this.getSelectedFiles(), function(deletable, file) {
+                               return deletable && (file.permissions & OC.PERMISSION_DELETE);
+                       }, true);
+               },
+
                /**
                 * Returns whether all files are selected
                 * @return true if all files are selected, false otherwise