Skip to content
This repository has been archived by the owner on Nov 25, 2024. It is now read-only.

Fix: Remember Registration #2988

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions src/components/ADempiere/TabManager/index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -453,6 +453,9 @@ export default defineComponent({
})
// Current Record ID
const currentRecordId = computed(() => {
if (!isEmptyValue(currentRoute) && !isEmptyValue(currentRoute.query)) {
return currentRoute.query.recordId
}
if (currentTabMetadata.value) {
return store.getters.getIdOfContainer({
containerUuid: currentTabMetadata.value.containerUuid,
Expand Down
2 changes: 1 addition & 1 deletion src/components/ADempiere/TabManager/tabChild.vue
Original file line number Diff line number Diff line change
Expand Up @@ -373,7 +373,7 @@ export default defineComponent({
})
}
const contextAttributes = store.getters.getTabData({
containerUuid
containerUuid: currentTabMetadata.value.uuid
}).contextAttributes
store.dispatch('getEntities', {
parentUuid: props.parentUuid,
Expand Down
13 changes: 12 additions & 1 deletion src/store/modules/ADempiere/dictionary/browser/actions.js
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,18 @@ export default {
const tabViewsVisited = rootGetters.visitedViews
dispatch('tagsView/delView', currentRoute)
// go to back page
const oldRouter = tabViewsVisited[tabViewsVisited.length - 1]
let oldRouterProcess
tabViewsVisited.filter(data => {
if (!isEmptyValue(data.query)) {
if (data.meta.action_uuid === currentRoute.query.parentUuid) {
oldRouterProcess = data
}
}
})
let oldRouter = tabViewsVisited[tabViewsVisited.length - 1]
if (!isEmptyValue(oldRouterProcess)) {
oldRouter = oldRouterProcess
}
router.push({
name: oldRouter.name,
query: {
Expand Down
Loading