IntenseWebs/pgadmin4
3
0
Fork 0
mirror of https://github.com/pgadmin-org/pgadmin4.git synced 2025-02-25 18:55:31 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fixed SQL panel black screen issue when detaching it in runtime. Fixes #6334

Browse Source
This commit is contained in:
Akshay Joshi 2021-04-15 16:40:35 +05:30
parent cb7bcaf939
commit b4d44541bb
4 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docs/en_US/release_notes_5_2.rst
View File

@ -32,6 +32,7 @@ Bug fixes
| `Issue #6325 <https://redmine.postgresql.org/issues/6325>`_ - Ensure that the file format for the storage manager should be 'All files' and for other dialogs, it should remember the last selected format. | `Issue #6325 <https://redmine.postgresql.org/issues/6325>`_ - Ensure that the file format for the storage manager should be 'All files' and for other dialogs, it should remember the last selected format.
| `Issue #6327 <https://redmine.postgresql.org/issues/6327>`_ - Ensure that while comparing domains check function dependencies should be considered in schema diff. | `Issue #6327 <https://redmine.postgresql.org/issues/6327>`_ - Ensure that while comparing domains check function dependencies should be considered in schema diff.
| `Issue #6333 <https://redmine.postgresql.org/issues/6333>`_ - Fixed sizing issue of help dialog for Query Tool and ERD Tool when open in the new browser tab. | `Issue #6333 <https://redmine.postgresql.org/issues/6333>`_ - Fixed sizing issue of help dialog for Query Tool and ERD Tool when open in the new browser tab.
| `Issue #6334 <https://redmine.postgresql.org/issues/6334>`_ - Fixed SQL panel black screen issue when detaching it in runtime.
| `Issue #6338 <https://redmine.postgresql.org/issues/6338>`_ - Added missing dependency 'xdg-utils' for the desktop packages in RPM and Debian. | `Issue #6338 <https://redmine.postgresql.org/issues/6338>`_ - Added missing dependency 'xdg-utils' for the desktop packages in RPM and Debian.
| `Issue #6344 <https://redmine.postgresql.org/issues/6344>`_ - Fixed cannot unpack non-iterable response object error when selecting any partition. | `Issue #6344 <https://redmine.postgresql.org/issues/6344>`_ - Fixed cannot unpack non-iterable response object error when selecting any partition.
| `Issue #6356 <https://redmine.postgresql.org/issues/6356>`_ - Mark the Apache HTTPD config file as such in the web DEB and RPM packages. | `Issue #6356 <https://redmine.postgresql.org/issues/6356>`_ - Mark the Apache HTTPD config file as such in the web DEB and RPM packages.

6
web/pgadmin/browser/static/js/browser.js
View File

@ -489,6 +489,12 @@ define('pgadmin.browser', [
setTimeout(function() { setTimeout(function() {
obj.editor.setValue('-- ' + select_object_msg); obj.editor.setValue('-- ' + select_object_msg);
obj.editor.refresh(); obj.editor.refresh();
/* In case of Runtime we need to make height of sql_textarea
* to 101% to fix the black screen issue with NWjs.
*/
if (pgAdmin['pgadmim_runtime'] === 'True') {
$('.pg-panel-content .sql_textarea').addClass('runtime_sql_textarea');
}
}, 10); }, 10);
// Initialise the treeview // Initialise the treeview

1
web/pgadmin/browser/templates/browser/js/utils.js
View File

@ -47,6 +47,7 @@ define('pgadmin.browser.utils',
pgAdmin['csrf_token_header'] = '{{ current_app.config.get('WTF_CSRF_HEADERS')[0] }}'; pgAdmin['csrf_token_header'] = '{{ current_app.config.get('WTF_CSRF_HEADERS')[0] }}';
pgAdmin['csrf_token'] = '{{ csrf_token() }}'; pgAdmin['csrf_token'] = '{{ csrf_token() }}';
pgAdmin['server_mode'] = '{{ current_app.config.get('SERVER_MODE') }}'; pgAdmin['server_mode'] = '{{ current_app.config.get('SERVER_MODE') }}';
pgAdmin['pgadmim_runtime'] = '{{ current_app.PGADMIN_RUNTIME }}';
/* Get the inactivity related config */ /* Get the inactivity related config */
pgAdmin['user_inactivity_timeout'] = {{ current_app.config.get('USER_INACTIVITY_TIMEOUT') }}; pgAdmin['user_inactivity_timeout'] = {{ current_app.config.get('USER_INACTIVITY_TIMEOUT') }};

6
web/pgadmin/tools/sqleditor/static/scss/_sqleditor.scss
View File

@ -14,6 +14,12 @@
height: 100%; height: 100%;
} }
.wcFloating {
& .runtime_sql_textarea {
height: 101% !important;
}
}
.sql_textarea .CodeMirror-scroll { .sql_textarea .CodeMirror-scroll {
z-index: 0; z-index: 0;
} }