From 72ba5bdaeee8ab6aff8a1496c70f629bae320c55 Mon Sep 17 00:00:00 2001 From: Khushboo Vashi Date: Tue, 18 Dec 2018 09:45:06 +0000 Subject: [PATCH] Fix drop/drop cascade regression. Fixes #3823 --- web/pgadmin/browser/static/js/collection.js | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/web/pgadmin/browser/static/js/collection.js b/web/pgadmin/browser/static/js/collection.js index cda6fb98d..87b44ed3b 100644 --- a/web/pgadmin/browser/static/js/collection.js +++ b/web/pgadmin/browser/static/js/collection.js @@ -218,10 +218,7 @@ define([ tooltip: gettext('Delete/Drop'), extraClasses: ['btn-default', 'delete_multiple'], icon: 'fa fa-lg fa-trash-o', - disabled: _.isFunction(that.canDrop) ? - function() { - return !(that.canDrop.apply(self, arguments)); - } : (!that.canDrop), + disabled: (_.isFunction(that.canDrop)) ? !(that.canDrop.apply(self, [data, item])) : (!that.canDrop), register: function(btn) { btn.on('click',() => { onDrop('drop'); @@ -235,10 +232,7 @@ define([ tooltip: gettext('Drop Cascade'), extraClasses: ['btn-default', 'delete_multiple_cascade'], icon: '', - disabled: _.isFunction(that.canDropCascade) ? - function() { - return !(that.canDropCascade.apply(self, arguments)); - } : (!that.canDropCascade), + disabled: (_.isFunction(that.canDropCascade)) ? !(that.canDropCascade.apply(self, [data, item])) : (!that.canDropCascade), register: function(btn) { btn.on('click',() => { onDrop('dropCascade');