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

1) Fixed an issue where selecting all rows and copying using shortcut only, the first attempt fails to copy. 

2) Fixed an issue where a single row is copied first and then clicked on "Select All", the previously copied row's highlight color changes.
3) Fixed an issue where non-shared servers are visible in the Existing Servers list on the Welcome page and New Connection dialog.
pull/8414/head
Akshay Joshi 2025-02-05 10:26:51 +05:30
parent b90a390d5c
commit efd0dd2ac0
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
web/pgadmin/tools/sqleditor/__init__.py
View File

@ -18,6 +18,9 @@ import threading
import math import math
import json import json
from sqlalchemy import or_
from config import PG_DEFAULT_DRIVER, ALLOW_SAVE_PASSWORD, SHARED_STORAGE from config import PG_DEFAULT_DRIVER, ALLOW_SAVE_PASSWORD, SHARED_STORAGE
from werkzeug.user_agent import UserAgent from werkzeug.user_agent import UserAgent
from flask import Response, url_for, render_template, session, current_app from flask import Response, url_for, render_template, session, current_app
@ -2353,7 +2356,9 @@ def get_new_connection_data(sgid=None, sid=None):
server_groups = ServerGroup.query.all() server_groups = ServerGroup.query.all()
server_group_data = {server_group.name: [] for server_group in server_group_data = {server_group.name: [] for server_group in
server_groups} server_groups}
servers = Server.query.filter(Server.is_adhoc == 0) servers = Server.query.filter(
or_(Server.user_id == current_user.id, Server.shared),
Server.is_adhoc == 0)
for server in servers: for server in servers:
manager = driver.connection_manager(server.id) manager = driver.connection_manager(server.id)

6
web/pgadmin/tools/sqleditor/static/js/components/QueryToolDataGrid/index.jsx
View File

@ -76,10 +76,10 @@ const StyledPgReactDataGrid = styled(PgReactDataGrid)(({stripedRows, theme})=>({
}}, }},
'& .rdg-row': { '& .rdg-row': {
'& .rdg-cell:nth-of-type(1)': { '& .rdg-cell:nth-of-type(1)': {
backgroundColor: theme.palette.grey[600], backgroundColor: theme.palette.grey[600] + '!important',
}, },
'&[aria-selected="true"] .rdg-cell:nth-of-type(1)': { '&[aria-selected="true"] .rdg-cell:nth-of-type(1)': {
backgroundColor: theme.palette.primary.main, backgroundColor: theme.palette.primary.main + '!important',
color: theme.palette.primary.contrastText, color: theme.palette.primary.contrastText,
} }
}, },
@ -160,7 +160,7 @@ function SelectAllHeaderRenderer({isCellSelected}) {
}, [isRowSelected]); }, [isRowSelected]);
return <div ref={cellRef} style={{width: '100%', height: '100%'}} onClick={onClick} return <div ref={cellRef} style={{width: '100%', height: '100%'}} onClick={onClick}
tabIndex="-1" onKeyDown={(e)=>dataGridExtras.handleShortcuts(e, true)}></div>; tabIndex="0" onKeyDown={(e)=>dataGridExtras.handleShortcuts(e, true)}></div>;
} }
SelectAllHeaderRenderer.propTypes = { SelectAllHeaderRenderer.propTypes = {
isCellSelected: PropTypes.bool, isCellSelected: PropTypes.bool,