From 5dd1472d6b407b59cfe5b2c300268df4843edd7c Mon Sep 17 00:00:00 2001 From: Akshay Joshi Date: Wed, 20 Mar 2019 18:54:49 +0530 Subject: [PATCH] 1) Fixed issue in Select2 Control, added undefined/null check. 2) Fixed the width of the delete cell. --- .../browser/server_groups/servers/static/js/variable.js | 2 +- web/pgadmin/static/js/backform.pgadmin.js | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/web/pgadmin/browser/server_groups/servers/static/js/variable.js b/web/pgadmin/browser/server_groups/servers/static/js/variable.js index 7c79fda9f..3228c8fcc 100644 --- a/web/pgadmin/browser/server_groups/servers/static/js/variable.js +++ b/web/pgadmin/browser/server_groups/servers/static/js/variable.js @@ -360,7 +360,7 @@ function(gettext, _, $, Backbone, Backform, Backgrid, Alertify, pgAdmin, pgNode) // Insert Delete Cell into Grid if (data.disabled == false && data.canDelete) { gridSchema.columns.unshift({ - name: 'pg-backform-delete', label: '', + name: 'pg-backform-delete width_percent_5', label: '', cell: Backgrid.Extension.DeleteCell, editable: false, cell_priority: -1, }); diff --git a/web/pgadmin/static/js/backform.pgadmin.js b/web/pgadmin/static/js/backform.pgadmin.js index 0342be3ae..ef69a8d94 100644 --- a/web/pgadmin/static/js/backform.pgadmin.js +++ b/web/pgadmin/static/js/backform.pgadmin.js @@ -1922,7 +1922,8 @@ define([ onSelect: function (evt) { var sel2Options = this.field.get('select2'); - if (sel2Options.multiple && sel2Options.preserveSelectionOrder) { + if (!_.isUndefined(sel2Options) && !_.isNull(sel2Options) && + sel2Options.multiple && sel2Options.preserveSelectionOrder) { var element = evt.params.data.element; var $element = $(element);