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

Fixed value error in the restore dialog. Fixes #7151

Browse Source
This commit is contained in:
Nikhil Mohite 2022-02-03 17:44:54 +05:30 committed by Akshay Joshi
parent ad64491a98
commit 4a195e7ef6
4 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docs/en_US/release_notes_6_5.rst
View File

@ -35,3 +35,4 @@ Bug fixes
| `Issue #7142 <https://redmine.postgresql.org/issues/7142>`_ - Fixed an issue where a warning message was shown after database creation/modification.
| `Issue #7145 <https://redmine.postgresql.org/issues/7145>`_ - Ensure that owner should be ignored while comparing extensions.
| `Issue #7146 <https://redmine.postgresql.org/issues/7146>`_ - Fixed event trigger comparing issue in Schema Diff tool.
| `Issue #7151 <https://redmine.postgresql.org/issues/7151>`_ - Fixed value error in the restore dialog.

3
web/pgadmin/browser/server_groups/servers/databases/event_triggers/__init__.py
View File

@ -174,7 +174,8 @@ class EventTriggerView(PGChildNodeView, SchemaDiffObjectCompare):
'fopts': [{'get': 'get_event_funcs'}, {'get': 'get_event_funcs'}]
})
keys_to_ignore = ['oid', 'xmin', 'oid-2', 'eventfuncoid', 'schemaoid']
keys_to_ignore = ['oid', 'xmin', 'oid-2', 'eventfuncoid', 'schemaoid',
'source']
def check_precondition(f):
"""

4
web/pgadmin/static/js/tree/tree.js
View File

@ -77,7 +77,7 @@ export class Tree {
}
async before(item, data) {
await this.tree.create(item.parent, data);
return Promise.resolve(await this.tree.create(item.parent, data));
}
async update(item, data) {
@ -89,7 +89,7 @@ export class Tree {
}
async append(item, data) {
await this.tree.create(item, data);
return Promise.resolve(await this.tree.create(item, data));
}
async destroy() {

6
web/pgadmin/tools/restore/__init__.py
View File

@ -211,10 +211,10 @@ def _connect_server(sid):
server = get_server(sid)
if server is None:
return make_json_response(
return True, make_json_response(
success=0,
errormsg=_("Could not find the specified server.")
)
), None, None, None, None, None
# To fetch MetaData for the server
from pgadmin.utils.driver import get_driver
@ -228,7 +228,7 @@ def _connect_server(sid):
return True, make_json_response(
success=0,
errormsg=_("Please connect to the server first.")
), driver, manager, conn, connected
), driver, manager, conn, connected, server
return False, '', driver, manager, conn, connected, server