pgadmin-org
/
pgadmin4
mirror of https://github.com/pgadmin-org/pgadmin4.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

1) Disable PSQL Workspace in Server mode. 

2) Fixed an issue where empty binary path throwing an error instead of proper error message.
pull/8407/head
Akshay Joshi 2025-01-30 17:59:18 +05:30
parent e7888c5265
commit d5101b7568
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
web/pgadmin/browser/server_groups/servers/types.py
View File

@ -203,7 +203,7 @@ class ServerType():
bin_path['binaryPath'].strip() != '':
return bin_path['binaryPath']
if bin_path['isDefault']:
if bin_path['isDefault'] and bin_path['binaryPath'] != '':
default_path = bin_path['binaryPath']
return default_path

2
web/pgadmin/misc/workspaces/static/js/AdHocConnection.jsx
View File

@ -465,7 +465,7 @@ export default function AdHocConnection({mode}) {
});
if (mode == WORKSPACES.QUERY_TOOL) {
openQueryTool(respData, formData);
} else if (mode == WORKSPACES.PSQL_TOOL) {
} else if (mode == WORKSPACES.PSQL_TOOL && pgAdmin['enable_psql']) {
openPSQLTool(respData, formData);
}
} catch (error) {

2
web/pgadmin/misc/workspaces/static/js/WorkspaceToolbar.jsx
View File

@ -125,7 +125,7 @@ export default function WorkspaceToolbar() {
<Root>
<WorkspaceButton icon={<AccountTreeRoundedIcon />} value={WORKSPACES.DEFAULT} title={gettext('Default Workspace')} tooltipPlacement="right" />
<WorkspaceButton icon={<QueryToolIcon />} value={WORKSPACES.QUERY_TOOL} title={gettext('Query Tool Workspace')} tooltipPlacement="right" />
<WorkspaceButton icon={<TerminalRoundedIcon style={{height: '1.4rem'}}/>} value={WORKSPACES.PSQL_TOOL} title={gettext('PSQL Tool Workspace')} tooltipPlacement="right" />
{pgAdmin['enable_psql'] && <WorkspaceButton icon={<TerminalRoundedIcon style={{height: '1.4rem'}}/>} value={WORKSPACES.PSQL_TOOL} title={gettext('PSQL Tool Workspace')} tooltipPlacement="right" />}
<WorkspaceButton icon={<SchemaDiffIcon />} value={WORKSPACES.SCHEMA_DIFF_TOOL} title={gettext('Schema Diff Workspace')} tooltipPlacement="right" />
<Box marginTop="auto">
<WorkspaceButton icon={<SettingsIcon />} menuItem={menus['settings']} title={gettext('Preferences')} tooltipPlacement="right" />