From 1b550dea89b40bc69a72491e8c015a235c31c10e Mon Sep 17 00:00:00 2001 From: Leonel Matos Date: Tue, 28 Jan 2020 12:26:47 -0400 Subject: [PATCH] fix error with share link action (#269) --- src/components/ADempiere/ContextMenu/contextMenuMixin.js | 2 +- src/components/ADempiere/Panel/index.vue | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/components/ADempiere/ContextMenu/contextMenuMixin.js b/src/components/ADempiere/ContextMenu/contextMenuMixin.js index 77addd2a..1d019ead 100644 --- a/src/components/ADempiere/ContextMenu/contextMenuMixin.js +++ b/src/components/ADempiere/ContextMenu/contextMenuMixin.js @@ -567,7 +567,7 @@ export const contextMixin = { if (String(this.valuesPanelToShare).length) { shareLink += this.valuesPanelToShare } - if (this.$route.query.action && this.$route.query.action !== 'create-new' && this.$route.query.action !== 'reference' && this.$route.query.action !== 'advancedQuery') { + if (this.$route.query.action && this.$route.query.action !== 'create-new' && this.$route.query.action !== 'reference' && this.$route.query.action !== 'advancedQuery' && this.$route.query.action !== 'criteria') { shareLink = window.location.href } } diff --git a/src/components/ADempiere/Panel/index.vue b/src/components/ADempiere/Panel/index.vue index a96351af..86a782f1 100644 --- a/src/components/ADempiere/Panel/index.vue +++ b/src/components/ADempiere/Panel/index.vue @@ -376,17 +376,20 @@ export default { fieldItem.isShowedFromUser = true fieldItem.value = parsedValueComponent({ fieldType: fieldItem.componentPath, - value: route.query[fieldItem.columnName] + value: route.query[fieldItem.columnName], + referenceType: fieldItem.referenceType }) if (String(route.query.isAdvancedQuery) === String(fieldItem.isAdvancedQuery)) { fieldItem.value = parsedValueComponent({ fieldType: fieldItem.componentPath, - value: route.query[fieldItem.columnName] + value: route.query[fieldItem.columnName], + referenceType: fieldItem.referenceType }) if (fieldItem.isRange && this.$route.query[`${fieldItem.columnName}_To`]) { fieldItem.valueTo = parsedValueComponent({ fieldType: fieldItem.componentPath, - value: route.query[`${fieldItem.columnName}_To`] + value: route.query[`${fieldItem.columnName}_To`], + referenceType: fieldItem.referenceType }) } }