diff --git a/web/pgadmin/static/bundle/slickgrid.js b/web/pgadmin/static/bundle/slickgrid.js index 60b0ee92..befb67e2 100644 --- a/web/pgadmin/static/bundle/slickgrid.js +++ b/web/pgadmin/static/bundle/slickgrid.js @@ -1,4 +1,5 @@ import 'slickgrid/lib/jquery.event.drag-2.3.0'; +import 'slickgrid/lib/jquery-ui-1.11.3'; import 'slickgrid/slick.core'; import 'slickgrid/slick.grid'; import 'slickgrid/slick.dataview'; diff --git a/web/pgadmin/static/js/backgrid.pgadmin.js b/web/pgadmin/static/js/backgrid.pgadmin.js index 48ee98cd..87ef146c 100644 --- a/web/pgadmin/static/js/backgrid.pgadmin.js +++ b/web/pgadmin/static/js/backgrid.pgadmin.js @@ -119,6 +119,7 @@ // extract the values from the models var l = func(left, attr), r = func(right, attr), t; + if (_.isUndefined(l) || _.isUndefined(r)) return; var types = ['number-cell', 'integer-cell']; if (_.include(types, type)) {