Skip to content

Commit 39b6f40

Browse files
Fix following issues:
1. Debian builds are failing after commiting changes for #9240. 2. Object explorer context menu shows "No objects selected" on preferences change.
1 parent e6f6a90 commit 39b6f40

File tree

3 files changed

+7
-3
lines changed

3 files changed

+7
-3
lines changed

pkg/linux/build-functions.sh

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,10 @@ _build_docs() {
209209
cd "${SERVERROOT}" && mkdir -p "usr/${APP_NAME}/share/docs/en_US/html"
210210
cd "${SOURCEDIR}/docs/en_US" || exit
211211
python3 build_code_snippet.py
212-
"${SYSTEM_PYTHON_PATH}" -msphinx . "${SERVERROOT}/usr/${APP_NAME}/share/docs/en_US/html"
212+
213+
SYS_PYTHON_PACKS=$("${SYSTEM_PYTHON_PATH}" -c "import sys; print(':'.join([p for p in sys.path if p]))")
214+
# shellcheck disable=SC2153
215+
PYTHONPATH=$PYTHONPATH:${SYS_PYTHON_PACKS} python3 -msphinx . "${SERVERROOT}/usr/${APP_NAME}/share/docs/en_US/html"
213216
}
214217

215218
_copy_code() {

web/pgadmin/browser/static/js/MainMenuFactory.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,8 @@ export default class MainMenuFactory {
129129
}
130130

131131
static enableDisableMenus(item) {
132-
let itemData = item ? pgAdmin.Browser.tree.itemData(item) : pgAdmin.Browser.tree?.selected();
132+
item = item || pgAdmin.Browser.tree?.selected();
133+
let itemData = pgAdmin.Browser.tree?.itemData(item);
133134

134135
const checkForItems = (items)=>{
135136
items.forEach((mitem) => {

web/pgadmin/static/js/SchemaView/DataGridView/row.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ export function DataGridRow({row, isResizing}) {
5555
return useMemo(() => (
5656
!row ? <></> :
5757
<DataGridRowContext.Provider value={{ rowAccessPath, row }}>
58-
<Draggable nodeRef={rowRef}>
58+
<Draggable nodeRef={rowRef} disabled>
5959
<PgReactTableRowContent ref={rowRef}
6060
className={classList.join[' ']}
6161
data-test='data-table-row' style={{position: 'initial'}}

0 commit comments

Comments
 (0)