diff --git a/src/api/ADempiere/user-interface/persistence.js b/src/api/ADempiere/user-interface/persistence.js index 35f3b7a854f..9b0370753d1 100644 --- a/src/api/ADempiere/user-interface/persistence.js +++ b/src/api/ADempiere/user-interface/persistence.js @@ -16,6 +16,7 @@ // Get Instance for connection import { request } from '@/utils/ADempiere/request' +import { isEmptyValue } from '@/utils/ADempiere/valueUtils' /** * Object List from window @@ -47,18 +48,19 @@ export function getEntities({ } }) - let attributesValues - if (attributes) { - attributesValues = attributes.map(attributeValue => { - return { + // context attributes + if (!isEmptyValue(attributes)) { + attributes.forEach(attributeValue => { + filters.push({ column_name: attributeValue.columnName, + operator: attributeValue.operator, value: attributeValue.value - } + }) }) } let sortingDefinition - if (sorting) { + if (!isEmptyValue(sorting)) { sortingDefinition = sorting.map(sortValue => { return { column_name: sortValue.columnName, @@ -77,7 +79,6 @@ export function getEntities({ filters, columns, // replace sql values - context_attributes: attributesValues, sorting: sortingDefinition, // Page Data page_token: pageToken, diff --git a/src/store/modules/ADempiere/windowManager.js b/src/store/modules/ADempiere/windowManager.js index 4e44e5ca2e8..b0026a4e8f0 100644 --- a/src/store/modules/ADempiere/windowManager.js +++ b/src/store/modules/ADempiere/windowManager.js @@ -27,6 +27,7 @@ import { // constants import { ROW_ATTRIBUTES } from '@/utils/ADempiere/constants/table' +import { OPERATOR_EQUAL } from '@/utils/ADempiere/dataUtils.js' // utils and helper methods import { getContext } from '@/utils/ADempiere/contextUtils.js' @@ -113,6 +114,7 @@ const windowManager = { }) contextAttriburesList.push({ value, + operator: OPERATOR_EQUAL.operator, columnName }) }) diff --git a/src/views/ADempiere/Test/MultiTabWindow/index.vue b/src/views/ADempiere/Test/MultiTabWindow/index.vue index 112380c9ea5..9af70d0426d 100644 --- a/src/views/ADempiere/Test/MultiTabWindow/index.vue +++ b/src/views/ADempiere/Test/MultiTabWindow/index.vue @@ -105,8 +105,7 @@ export default defineComponent({ callBack: () => { root.$store.dispatch('getEntities', { parentUuid: props.parentUuid, - containerUuid: uuid, - tableName + containerUuid: uuid }) } },