inventree/InvenTree
2
0
Fork 0
mirror of https://github.com/inventree/InvenTree.git synced 2026-09-02 19:08:47 +00:00
Code Activity

feat(frontend): add user setting to control navigation behaviour (#12669)

Browse Source 
follow up to https://github.com/inventree/InvenTree/pull/12585
This commit is contained in:
Matthias Mair
2026-08-20 11:23:12 +10:00
committed by GitHub
parent e7da98069a
commit 36d21fe640
4 changed files with 20 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/frontend/src/components/tables/InvenTreeTable.tsx
+9 -7
View File
@@ -821,10 +821,11 @@ export function InvenTreeTableInternal<T extends Record<string, any>>({
if (pk) {
cancelEvent(event);
// If a model type is provided, navigate to the detail view for that model
const detailUrl =
getDetailNavigationUrl(record, index) ??
getDetailUrl(tableProps.modelType, pk);
// If a model type is provided and USE_TABLE_NAVIGATION is enabled, navigate to the detail view for that model
const detailUrl = userSettings.isSet('USE_TABLE_NAVIGATION')
? (getDetailNavigationUrl(record, index) ??
getDetailUrl(tableProps.modelType, pk))
: getDetailUrl(tableProps.modelType, pk);
if (!showPreviewPanel || eventModified(event as any)) {
navigateToLink(detailUrl, navigate, event);
@@ -888,9 +889,10 @@ export function InvenTreeTableInternal<T extends Record<string, any>>({
const recordIndex = tableState.records.findIndex(
(item) => String(resolveItem(item, accessor)) === String(pk)
);
const detailUrl =
getDetailNavigationUrl(record, recordIndex) ??
getDetailUrl(props.modelType, pk);
const detailUrl = userSettings.isSet('USE_TABLE_NAVIGATION')
? (getDetailNavigationUrl(record, recordIndex) ??
getDetailUrl(props.modelType, pk))
: getDetailUrl(props.modelType, pk);
const model: string | undefined =
ModelInformationDict[props.modelType]?.label?.();
src/frontend/src/pages/Index/Settings/UserSettings.tsx
+2 -1
View File
@@ -66,7 +66,8 @@ export default function UserSettings() {
'SHOW_FULL_LOCATION_IN_TABLES',
'SHOW_FULL_CATEGORY_IN_TABLES',
'SHOW_BOM_SUBASSEMBLY_LEVELS',
'DISPLAY_ITEMS_FINAL_LEVEL'
'DISPLAY_ITEMS_FINAL_LEVEL',
'USE_TABLE_NAVIGATION'
]}
/>
)