From e207a82dbbe30afe1d8c68e33d277aed4b124434 Mon Sep 17 00:00:00 2001 From: Akshay Joshi Date: Tue, 5 Dec 2023 12:28:09 +0530 Subject: [PATCH] Remove the 'Close Window' submenu specifically for OSX to prevent unintended closure of the entire application. #6814 (partial fixed) --- docs/en_US/release_notes_8_1.rst | 5 +++++ runtime/src/js/pgadmin.js | 5 ++++- .../servers/databases/schemas/tables/indexes/utils.py | 2 +- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/docs/en_US/release_notes_8_1.rst b/docs/en_US/release_notes_8_1.rst index 262bb3eca..3de1f10fc 100644 --- a/docs/en_US/release_notes_8_1.rst +++ b/docs/en_US/release_notes_8_1.rst @@ -30,15 +30,20 @@ Housekeeping Bug fixes ********* + | `Issue #6095 `_ - Provide a way to bypass the SSL cert verification for OAuth2 provider. | `Issue #6488 `_ - Fixed an issue where database name was missing in an error message if name contains any special characters. | `Issue #6717 `_ - Ensure that indexes created by constraints are visible in the object explorer when "Show system objects" is enabled. | `Issue #6803 `_ - Fixed an issue where reading process logs throws an error when DATA_DIR is moved to a networked drive. + | `Issue #6814 `_ - Remove the 'Close Window' submenu specifically for OSX to prevent unintended closure of the entire application. + | `Issue #6842 `_ - Rename all references of 'Execute query' to 'Execute script' to be more relevant. | `Issue #6887 `_ - Fixed an issue where syntax error was not highlighting in query tool. | `Issue #6921 `_ - Fixed an issue where on entering full screen, the option label is not changed to 'Exit Full Screen' in desktop mode. | `Issue #6950 `_ - Ensure that the Authentication Source in the drop-down of the UserManagement dialog aligns with the entries specified for AUTHENTICATION_SOURCES in the configuration file. | `Issue #6958 `_ - Reverse engineer serial columns when generating ERD for database/table. | `Issue #6964 `_ - Fixed an issue where the Schema was not visible in the dropdown for table properties or when creating a new table. + | `Issue #6968 `_ - Fixed an issue where option key was not registering in PSQL tool. | `Issue #6984 `_ - Fixed an issue where the Vacuum option INDEX_CLEANUP have an incorrect value ('AUTO') for database versions < 14. | `Issue #6989 `_ - Fixed an issue where the pgAdmin page went blank when clicking the delete button in the User Management dialog. | `Issue #7000 `_ - Ensure that correct timezone is set for Docker deployments. + | `Issue #7011 `_ - Fixed an issue where all rows and filter rows buttons of object explorer toolbar were disabled for views and other supported nodes. | `Issue #7017 `_ - Fixed an issue where schema diff tool is not loading preferences on start. diff --git a/runtime/src/js/pgadmin.js b/runtime/src/js/pgadmin.js index dd32dc53f..5f773e045 100644 --- a/runtime/src/js/pgadmin.js +++ b/runtime/src/js/pgadmin.js @@ -264,7 +264,10 @@ function launchPgAdminWindow() { // Create Mac Builtin Menu if (platform() === 'darwin') { nativeMenu.createMacBuiltin('pgAdmin 4'); - nativeMenu?.items[0].submenu.removeAt(0) + // Remove 'About pgAdmin 4' submenu + nativeMenu?.items[0].submenu.removeAt(0); + // Remove 'Close Window' submenu + nativeMenu?.items[2].submenu.removeAt(1); pgAdminMainScreen.menu = nativeMenu; } diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/utils.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/utils.py index 5a45a6214..0b7b7e31f 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/utils.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/utils.py @@ -15,7 +15,7 @@ from pgadmin.utils.ajax import internal_server_error from pgadmin.utils.exception import ObjectGone, ExecuteError from functools import wraps -AUTO_CREATE_INDEX_MSG = "-- This primary key index is automatically " \ +AUTO_CREATE_INDEX_MSG = "-- This constraint index is automatically " \ "generated from a constraint with an identical name.\n-- " \ "For more details, refer to the Constraints node. Note that this type " \ "of index is only visible \n-- when the 'Show system objects?' is set " \