IntenseWebs/pgadmin4
3
0
Fork 0
mirror of https://github.com/pgadmin-org/pgadmin4.git synced 2024-11-26 02:30:21 -06:00
Code Issues Packages Projects Releases Wiki Activity

Properly assign dropdownParent in Select2 controls. Fixes #4218

Browse Source
This commit is contained in:
Neel Patel 2019-04-30 12:57:17 +01:00 committed by Dave Page
parent 277bf85645
commit 34b59da526
3 changed files with 25 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docs/en_US/release_notes.rst
View File

@ -11,6 +11,7 @@ notes for it.
.. toctree:: .. toctree::
:maxdepth: 1 :maxdepth: 1
release_notes_4_7
release_notes_4_6 release_notes_4_6
release_notes_4_5 release_notes_4_5
release_notes_4_4 release_notes_4_4

17
docs/en_US/release_notes_4_7.rst Normal file
View File

@ -0,0 +1,17 @@
***********
Version 4.7
***********
Release date: 2019-05-30
This release contains a number of new features and fixes reported since the
release of pgAdmin4 4.6
Features
********
Bug fixes
*********
| `Bug #4218 <https://redmine.postgresql.org/issues/4218>`_ - Properly assign dropdownParent in Select2 controls.

14
web/pgadmin/static/js/backform.pgadmin.js
View File

@ -2017,13 +2017,6 @@ define([
if (!data.visible) if (!data.visible)
this.$el.addClass(Backform.hiddenClassName); this.$el.addClass(Backform.hiddenClassName);
// Dropdown body can be render at user given location
// If isDropdownParent flag is set to true then, By default we will
// display it on the control itself.
if (data.select2.isDropdownParent) {
select2Opts.dropdownParent = data.select2.dropdownParent || this.$el;
}
this.$el.html(this.template(data)).addClass(field.name); this.$el.html(this.template(data)).addClass(field.name);
var select2Opts = _.extend({ var select2Opts = _.extend({
@ -2032,6 +2025,13 @@ define([
options: (this.field.get('options') || this.defaults.options), options: (this.field.get('options') || this.defaults.options),
}); });
// Dropdown body can be render at user given location
// If isDropdownParent flag is set to true then, By default we will
// display it on the control itself.
if (data.select2.isDropdownParent) {
select2Opts.dropdownParent = data.select2.dropdownParent || this.$el;
}
// If disabled then no need to show placeholder // If disabled then no need to show placeholder
if (data.disabled || data.mode === 'properties') { if (data.disabled || data.mode === 'properties') {
select2Opts['placeholder'] = ''; select2Opts['placeholder'] = '';