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

Disable NW.js dev tools shortcut on Mac as it may crash the app. #6183

Browse Source
This commit is contained in:
Aditya Toshniwal 2023-04-28 19:01:03 +05:30
parent 1ccdbf27e2
commit edb74a0839
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docs/en_US/release_notes_7_1.rst
View File

@ -48,4 +48,5 @@ Bug fixes
| `Issue #6158 <https://github.com/pgadmin-org/pgadmin4/issues/6158>`_ - Fixed an issue with the properties tab not getting updated if the user updates the selected node. | `Issue #6158 <https://github.com/pgadmin-org/pgadmin4/issues/6158>`_ - Fixed an issue with the properties tab not getting updated if the user updates the selected node.
| `Issue #6159 <https://github.com/pgadmin-org/pgadmin4/issues/6159>`_ - Ensure that the ERD tool should work with the external database after moving to psycopg3. | `Issue #6159 <https://github.com/pgadmin-org/pgadmin4/issues/6159>`_ - Ensure that the ERD tool should work with the external database after moving to psycopg3.
| `Issue #6180 <https://github.com/pgadmin-org/pgadmin4/issues/6180>`_ - Fixed an issue where PSQL is not working if the PGUSER env variable is set and service file is used for server connection details. | `Issue #6180 <https://github.com/pgadmin-org/pgadmin4/issues/6180>`_ - Fixed an issue where PSQL is not working if the PGUSER env variable is set and service file is used for server connection details.
| `Issue #6183 <https://github.com/pgadmin-org/pgadmin4/issues/6183>`_ - Mac crash when you press Command-Shift-C.
| `Issue #6191 <https://github.com/pgadmin-org/pgadmin4/issues/6191>`_ - Fixed an issue where Reset Password is not working after upgrading to latest flask-security-too. | `Issue #6191 <https://github.com/pgadmin-org/pgadmin4/issues/6191>`_ - Fixed an issue where Reset Password is not working after upgrading to latest flask-security-too.

5
runtime/src/js/pgadmin.js
View File

@ -43,6 +43,11 @@ if (fs.existsSync('dev_config.json')) {
// This functions is used to start the pgAdmin4 server by spawning a // This functions is used to start the pgAdmin4 server by spawning a
// separate process. // separate process.
function startDesktopMode() { function startDesktopMode() {
// Disable dev tools shortcut
if (platform() == 'darwin') {
nw.App.registerGlobalHotKey(new nw.Shortcut({key: 'Command+Shift+C'}), ()=>{});
}
// Return if pgAdmin server process is already spawned // Return if pgAdmin server process is already spawned
// Added check for debugging purpose. // Added check for debugging purpose.
if (pgadminServerProcess != null) if (pgadminServerProcess != null)