Fix: Support Default Value WIndows and Update Record (adempiere#1525)

EdwinBetanc0urt · Oct 13, 2023 · 5d70195 · 5d70195
1 parent febb77a
commit 5d70195
Show file tree

Hide file tree

Showing 8 changed files with 25 additions and 26 deletions.
diff --git a/src/api/ADempiere/field/binary.js b/src/api/ADempiere/field/binary.js
@@ -42,7 +42,7 @@ export function updateResource({
   tableName,
   binaryFile
 }) {
-  const { updateEntity } = require('@/api/ADempiere/common/persistence.js')
+  const { updateEntity } = require('@/api/ADempiere/userInterface/entities.ts')
 
   return updateEntity({
     recordUuid: uuid,

diff --git a/src/api/ADempiere/field/location.js b/src/api/ADempiere/field/location.js
@@ -60,7 +60,7 @@ export function updateLocationAddress({
   uuid,
   attributesList
 }) {
-  const { updateEntity } = require('@/api/ADempiere/common/persistence.js')
+  const { updateEntity } = require('@/api/ADempiere/userInterface/entities.ts')
 
   return updateEntity({
     tableName,

diff --git a/src/components/ADempiere/ContainerOptions/LockRecord/index.vue b/src/components/ADempiere/ContainerOptions/LockRecord/index.vue
@@ -133,16 +133,16 @@ export default defineComponent({
       isGettingRecordAccess.value = true
 
       // get from server
-      store.dispatch('getPrivateAccessFromServer', {
-        tableName,
-        recordUuid: recordUuid.value
-      })
-        .then(privateAccessResponse => {
-          isLocked.value = privateAccessResponse
-        })
-        .finally(() => {
-          isGettingRecordAccess.value = false
-        })
+      // store.dispatch('getPrivateAccessFromServer', {
+      //   tableName,
+      //   recordUuid: recordUuid.value
+      // })
+      //   .then(privateAccessResponse => {
+      //     isLocked.value = privateAccessResponse
+      //   })
+      //   .finally(() => {
+      //     isGettingRecordAccess.value = false
+      //   })
     }
 
     // timer to execute the request between times

diff --git a/src/store/modules/ADempiere/defaultValueManager.js b/src/store/modules/ADempiere/defaultValueManager.js
@@ -120,16 +120,16 @@ const defaultValueManager = {
 
         let key = clientId
         // TODO: generate with your fieldUuid, processParameterUuid, browseFieldUuid
-        if (!isEmptyValue(uuid)) {
-          key += `|${uuid}`
-        }
-        // if (!isEmptyValue(fieldUuid)) {
-        //   key += `|${fieldUuid}`
-        // } else if (!isEmptyValue(processParameterUuid)) {
-        //   key += `|${processParameterUuid}`
-        // } else if (!isEmptyValue(browseFieldUuid)) {
-        //   key += `|${browseFieldUuid}`
+        // if (!isEmptyValue(uuid)) {
+        //   key += `|${uuid}`
         // }
+        if (!isEmptyValue(fieldUuid)) {
+          key += `|${fieldUuid}`
+        } else if (!isEmptyValue(processParameterUuid)) {
+          key += `|${processParameterUuid}`
+        } else if (!isEmptyValue(browseFieldUuid)) {
+          key += `|${browseFieldUuid}`
+        }
 
         const contextKey = generateContextKey(contextAttributesList)
         key += contextKey

diff --git a/src/store/modules/ADempiere/languageManager.js b/src/store/modules/ADempiere/languageManager.js
@@ -16,7 +16,7 @@
 
 import Vue from 'vue'
 
-import { updateEntity } from '@/api/ADempiere/common/persistence.js'
+import { updateEntity } from '@/api/ADempiere/userInterface/entities.ts'
 import { requestTranslations } from '@/api/ADempiere/actions/translation.js'
 
 import { isEmptyValue } from '@/utils/ADempiere/valueUtils'

diff --git a/src/store/modules/ADempiere/windowManager.js b/src/store/modules/ADempiere/windowManager.js
@@ -22,10 +22,7 @@ import router from '@/router'
 
 // API Request Methods
 import {
-  // requestGetEntities,
-  updateEntity
-} from '@/api/ADempiere/user-interface/persistence.js'
-import {
+  updateEntity,
   deleteEntity,
   requestGetEntities
 } from '@/api/ADempiere/userInterface/entities.ts'

diff --git a/src/utils/ADempiere/dictionary/browser.js b/src/utils/ADempiere/dictionary/browser.js
@@ -480,6 +480,7 @@ export const containerManager = {
       containerUuid,
       contextColumnNames,
       browseFieldId: id,
+      browseFieldUuid: uuid,
       uuid,
       // id,
       //

diff --git a/src/utils/ADempiere/dictionary/process.js b/src/utils/ADempiere/dictionary/process.js
@@ -247,6 +247,7 @@ export const containerManager = {
       containerUuid,
       contextColumnNames,
       processParameterId: id,
+      processParameterUuid: uuid,
       //
       columnName,
       value