Skip to content

Commit e207a82

Browse files
committed
Remove the 'Close Window' submenu specifically for OSX to prevent unintended closure of the entire application. #6814 (partial fixed)
1 parent 9cf3288 commit e207a82

File tree

3 files changed

+10
-2
lines changed

3 files changed

+10
-2
lines changed

docs/en_US/release_notes_8_1.rst

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,15 +30,20 @@ Housekeeping
3030
Bug fixes
3131
*********
3232

33+
| `Issue #6095 <https://github.com/pgadmin-org/pgadmin4/issues/6095>`_ - Provide a way to bypass the SSL cert verification for OAuth2 provider.
3334
| `Issue #6488 <https://github.com/pgadmin-org/pgadmin4/issues/6488>`_ - Fixed an issue where database name was missing in an error message if name contains any special characters.
3435
| `Issue #6717 <https://github.com/pgadmin-org/pgadmin4/issues/6717>`_ - Ensure that indexes created by constraints are visible in the object explorer when "Show system objects" is enabled.
3536
| `Issue #6803 <https://github.com/pgadmin-org/pgadmin4/issues/6803>`_ - Fixed an issue where reading process logs throws an error when DATA_DIR is moved to a networked drive.
37+
| `Issue #6814 <https://github.com/pgadmin-org/pgadmin4/issues/6814>`_ - Remove the 'Close Window' submenu specifically for OSX to prevent unintended closure of the entire application.
38+
| `Issue #6842 <https://github.com/pgadmin-org/pgadmin4/issues/6842>`_ - Rename all references of 'Execute query' to 'Execute script' to be more relevant.
3639
| `Issue #6887 <https://github.com/pgadmin-org/pgadmin4/issues/6887>`_ - Fixed an issue where syntax error was not highlighting in query tool.
3740
| `Issue #6921 <https://github.com/pgadmin-org/pgadmin4/issues/6921>`_ - Fixed an issue where on entering full screen, the option label is not changed to 'Exit Full Screen' in desktop mode.
3841
| `Issue #6950 <https://github.com/pgadmin-org/pgadmin4/issues/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.
3942
| `Issue #6958 <https://github.com/pgadmin-org/pgadmin4/issues/6958>`_ - Reverse engineer serial columns when generating ERD for database/table.
4043
| `Issue #6964 <https://github.com/pgadmin-org/pgadmin4/issues/6964>`_ - Fixed an issue where the Schema was not visible in the dropdown for table properties or when creating a new table.
44+
| `Issue #6968 <https://github.com/pgadmin-org/pgadmin4/issues/6968>`_ - Fixed an issue where option key was not registering in PSQL tool.
4145
| `Issue #6984 <https://github.com/pgadmin-org/pgadmin4/issues/6984>`_ - Fixed an issue where the Vacuum option INDEX_CLEANUP have an incorrect value ('AUTO') for database versions < 14.
4246
| `Issue #6989 <https://github.com/pgadmin-org/pgadmin4/issues/6989>`_ - Fixed an issue where the pgAdmin page went blank when clicking the delete button in the User Management dialog.
4347
| `Issue #7000 <https://github.com/pgadmin-org/pgadmin4/issues/7000>`_ - Ensure that correct timezone is set for Docker deployments.
48+
| `Issue #7011 <https://github.com/pgadmin-org/pgadmin4/issues/7011>`_ - Fixed an issue where all rows and filter rows buttons of object explorer toolbar were disabled for views and other supported nodes.
4449
| `Issue #7017 <https://github.com/pgadmin-org/pgadmin4/issues/7017>`_ - Fixed an issue where schema diff tool is not loading preferences on start.

runtime/src/js/pgadmin.js

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -264,7 +264,10 @@ function launchPgAdminWindow() {
264264
// Create Mac Builtin Menu
265265
if (platform() === 'darwin') {
266266
nativeMenu.createMacBuiltin('pgAdmin 4');
267-
nativeMenu?.items[0].submenu.removeAt(0)
267+
// Remove 'About pgAdmin 4' submenu
268+
nativeMenu?.items[0].submenu.removeAt(0);
269+
// Remove 'Close Window' submenu
270+
nativeMenu?.items[2].submenu.removeAt(1);
268271
pgAdminMainScreen.menu = nativeMenu;
269272
}
270273

web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/utils.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
from pgadmin.utils.exception import ObjectGone, ExecuteError
1616
from functools import wraps
1717

18-
AUTO_CREATE_INDEX_MSG = "-- This primary key index is automatically " \
18+
AUTO_CREATE_INDEX_MSG = "-- This constraint index is automatically " \
1919
"generated from a constraint with an identical name.\n-- " \
2020
"For more details, refer to the Constraints node. Note that this type " \
2121
"of index is only visible \n-- when the 'Show system objects?' is set " \

0 commit comments

Comments
 (0)