From fe0577be5f088ad3109dee995aa7906178354f80 Mon Sep 17 00:00:00 2001 From: Akshay Joshi Date: Fri, 26 Aug 2022 14:38:35 +0530 Subject: [PATCH] Ensure that the Import/Export server menu option is visible. Fixes #7646 --- docs/en_US/release_notes.rst | 1 + docs/en_US/release_notes_6_14.rst | 20 +++++++++++++++++++ .../static/js/import_export_servers.js | 2 +- .../import_export_servers/static/js/index.js | 3 +-- 4 files changed, 23 insertions(+), 3 deletions(-) create mode 100644 docs/en_US/release_notes_6_14.rst diff --git a/docs/en_US/release_notes.rst b/docs/en_US/release_notes.rst index 907a7af26..9c0329907 100644 --- a/docs/en_US/release_notes.rst +++ b/docs/en_US/release_notes.rst @@ -11,6 +11,7 @@ notes for it. .. toctree:: :maxdepth: 1 + release_notes_6_14 release_notes_6_13 release_notes_6_12 release_notes_6_11 diff --git a/docs/en_US/release_notes_6_14.rst b/docs/en_US/release_notes_6_14.rst new file mode 100644 index 000000000..0916db3fe --- /dev/null +++ b/docs/en_US/release_notes_6_14.rst @@ -0,0 +1,20 @@ +************ +Version 6.14 +************ + +Release date: 2022-09-22 + +This release contains a number of bug fixes and new features since the release of pgAdmin 4 v6.13. + +New features +************ + + +Housekeeping +************ + + +Bug fixes +********* + + | `Issue #7646 `_ - Ensure that the Import/Export server menu option is visible. diff --git a/web/pgadmin/tools/import_export_servers/static/js/import_export_servers.js b/web/pgadmin/tools/import_export_servers/static/js/import_export_servers.js index e137ae2a0..587e744a0 100644 --- a/web/pgadmin/tools/import_export_servers/static/js/import_export_servers.js +++ b/web/pgadmin/tools/import_export_servers/static/js/import_export_servers.js @@ -41,7 +41,7 @@ export default class ImportExportServersModule { icon: 'fa fa-shopping-cart', }]; - this.pgBrowser.add_menus(menus); + pgBrowser.add_menus(menus); } // This is a callback function to show import/export servers when user click on menu item. diff --git a/web/pgadmin/tools/import_export_servers/static/js/index.js b/web/pgadmin/tools/import_export_servers/static/js/index.js index e0b4bd604..4aeb92b4c 100644 --- a/web/pgadmin/tools/import_export_servers/static/js/index.js +++ b/web/pgadmin/tools/import_export_servers/static/js/index.js @@ -7,13 +7,12 @@ // ////////////////////////////////////////////////////////////// import pgAdmin from 'sources/pgadmin'; -import pgBrowser from 'top/browser/static/js/browser'; import ImportExportServersModule from './import_export_servers'; if(!pgAdmin.Tools) { pgAdmin.Tools = {}; } -pgAdmin.Tools.ImportExportServersModule = ImportExportServersModule.getInstance(pgAdmin, pgBrowser); +pgAdmin.Tools.ImportExportServersModule = ImportExportServersModule.getInstance(); module.exports = { ImportExportServersModule: ImportExportServersModule,