diff --git a/docs/en_US/release_notes_6_20.rst b/docs/en_US/release_notes_6_20.rst index 8fdb9db0d..541640420 100644 --- a/docs/en_US/release_notes_6_20.rst +++ b/docs/en_US/release_notes_6_20.rst @@ -37,7 +37,9 @@ Bug fixes | `Issue #5702 `_ - Fix an issue where role is used as username for newly added servers when opening query tool. | `Issue #5705 `_ - Ensure that all parts of the application recommend and enforce the same length of passwords. | `Issue #5732 `_ - Fixed an issue where Kerberos authentication to the server is not imported/exported. - | `Issue #5751 `_ - Fix failing import servers CLI due to vulnerability fix. + | `Issue #5733 `_ - Ensure that the system columns should not visible in the import/export data. | `Issue #5746 `_ - Increase the length of the value column of the setting table. + | `Issue #5748 `_ - Fixed console error while attaching the partition. + | `Issue #5751 `_ - Fix failing import servers CLI due to vulnerability fix. | `Issue #5781 `_ - Fixed an issue where Query history is not getting loaded with external database. | `Issue #5796 `_ - Ensure nested menu items are shown in quick search result. diff --git a/web/pgadmin/browser/static/js/browser.js b/web/pgadmin/browser/static/js/browser.js index 009ab496e..2745566a0 100644 --- a/web/pgadmin/browser/static/js/browser.js +++ b/web/pgadmin/browser/static/js/browser.js @@ -1937,7 +1937,7 @@ define('pgadmin.browser', [ addChildTreeNodes: function(_treeHierarchy, _node, _type, _arrayIds, _callback) { let module = _type in pgBrowser.Nodes && pgBrowser.Nodes[_type], childTreeInfo = _arrayIds.length && _.extend( - {}, _.mapObject(_treeHierarchy, function(_val) { + {}, _.mapValues(_treeHierarchy, function(_val) { _val.priority -= 1; return _val; })), arrayChildNodeData = [], diff --git a/web/pgadmin/tools/import_export/static/js/import_export.js b/web/pgadmin/tools/import_export/static/js/import_export.js index 89111b4c4..4168c6350 100644 --- a/web/pgadmin/tools/import_export/static/js/import_export.js +++ b/web/pgadmin/tools/import_export/static/js/import_export.js @@ -63,10 +63,12 @@ define([ return new ImportExportSchema( { encoding: ()=>getNodeAjaxOptions('get_encodings', pgBrowser.Nodes['database'], treeNodeInfo, itemNodeData, {cacheNode: 'database',cacheLevel: 'server'}), - columns: ()=>getNodeListByName('column', treeNodeInfo, itemNodeData, { cacheLevel: 'column', cacheNode: 'column'}, ()=>true, (res)=>{ + columns: ()=>getNodeListByName('column', treeNodeInfo, itemNodeData, { cacheLevel: 'column', cacheNode: 'column', includeItemKeys: ['_id']}, ()=>true, (res)=>{ let columnsList = []; res.forEach(d => { - columnsList.push({label: d.label, value: d.value, image:'icon-column', selected: true}); + if (d._id > 0) { + columnsList.push({label: d.label, value: d.value, image:'icon-column', selected: true}); + } }); return columnsList; }),