Skip to content

Commit

Permalink
Fixed some issues in Backup and PSQL tool
Browse files Browse the repository at this point in the history
  • Loading branch information
akshay-joshi committed Jul 19, 2023
1 parent 25e05de commit a3c3d91
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 3 deletions.
1 change: 1 addition & 0 deletions docs/en_US/release_notes_7_5.rst
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ Bug fixes
| `Issue #6317 <https://github.com/pgadmin-org/pgadmin4/issues/6317>`_ - Fix an issue where queries longer than 1 minute get stuck - Container 7.1
| `Issue #6356 <https://github.com/pgadmin-org/pgadmin4/issues/6356>`_ - Fix an issue where queries get stuck with auto-completion enabled.
| `Issue #6364 <https://github.com/pgadmin-org/pgadmin4/issues/6364>`_ - Fixed Query Tool/ PSQL tool tab title not getting updated on database rename.
| `Issue #6489 <https://github.com/pgadmin-org/pgadmin4/issues/6489>`_ - Fix an issue where the edit server fails in desktop mode if the server password is not stored.
| `Issue #6499 <https://github.com/pgadmin-org/pgadmin4/issues/6499>`_ - Ensure that Backup, Restore, and Maintenance should work properly when pgpass file is used.
| `Issue #6501 <https://github.com/pgadmin-org/pgadmin4/issues/6501>`_ - Fix the query tool auto-complete issue on the server reconnection.
| `Issue #6502 <https://github.com/pgadmin-org/pgadmin4/issues/6502>`_ - Fix the query tool restore connection issue.
Expand Down
5 changes: 3 additions & 2 deletions web/pgadmin/tools/backup/static/js/backup.ui.js
Original file line number Diff line number Diff line change
Expand Up @@ -638,15 +638,16 @@ export default class BackupSchema extends BaseUISchema {
state.enable_row_security = false;
return true;
},
visible: isVisibleForServerBackup(obj.backupType)
visible: isVisibleForServerBackup(obj.backupType),
helpMessage: gettext('This option is enabled only when Use INSERT Commands is enabled.')
}, {
id: 'with_oids',
label: gettext('With OID(s)'),
type: 'switch',
deps: ['use_column_inserts', 'use_insert_commands'],
group: gettext('Table Options'),
disabled: function(state) {
let serverInfo = _.isUndefined(obj.fieldOptions.nodeInfo) ? undefined : obj.fieldOptions.nodeInfo.server;
let serverInfo = _.isUndefined(obj.treeNodeInfo) ? undefined : obj.treeNodeInfo.server;

if (!_.isUndefined(serverInfo) && serverInfo.version >= 120000)
return true;
Expand Down
2 changes: 1 addition & 1 deletion web/pgadmin/tools/psql/static/js/psql_module.js
Original file line number Diff line number Diff line change
Expand Up @@ -235,7 +235,7 @@ export function initialize(gettext, url_for, _, pgAdmin, csrfToken, Browser) {
let closeUrl = url_for('psql.close', {
trans_id: transId,
});
return [openUrl, closeUrl, pData.database._label];
return [openUrl, closeUrl, _.escape(pData.database._label)];
},
psql_terminal: function() {
// theme colors
Expand Down

0 comments on commit a3c3d91

Please sign in to comment.