(ofbiz-framework) branch trunk updated: Fixed: DataServices content-upload and data-resource regressions (OFBIZ-13562)

[mridulpathak]

This is an automated email from the ASF dual-hosted git repository.

mridulpathak pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git


The following commit(s) were added to refs/heads/trunk by this push:
     new e0c6ff5fad Fixed: DataServices content-upload and data-resource 
regressions (OFBIZ-13562)
e0c6ff5fad is described below

commit e0c6ff5fad9701719a31fe1a796019ae96a7da1e
Author: Mridul Pathak <mridul...@gmail.com>
AuthorDate: Tue Sep 8 16:09:16 2026 +0530

    Fixed: DataServices content-upload and data-resource regressions 
(OFBIZ-13562)
    
    - createDataResourceAndAssocToContent fixes a dataRessourceId typo that 
silently dropped the Content-DataResource link, since updateContent never 
recognized the misspelled field.
    - saveExtFileDataResource now checks whether prepareServiceContext returned 
an error before using its result as service call parameters, so an unsupported 
upload type gets a clean error response instead of feeding an error map into 
the next nested service call.
    - prepareServiceContext's fallback for an unrecognized upload type replaces 
a broken bare error reference (which threw MissingPropertyException) with a 
proper error return, matching minilang's original 
ContentDataTypeNotYetSupported message.
    - saveLocalFileDataResource now sets mimeTypeId from the uploaded file's 
content type for OFBIZ_FILE/CONTEXT_FILE uploads (and their _BIN variants), 
matching the two merged minilang methods that set it; LOCAL_FILE correctly 
continues to leave it unset, matching its own original minilang method.
    - The AUDIO_OBJECT case in prepareServiceContext now actually assigns 
serviceContext.audioData = parameters.uploadedFile instead of a no-op property 
read, so uploaded audio binary data is no longer silently discarded.
---
 .../org/apache/ofbiz/content/data/DataServicesScript.groovy  | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git 
a/applications/content/src/main/groovy/org/apache/ofbiz/content/data/DataServicesScript.groovy
 
b/applications/content/src/main/groovy/org/apache/ofbiz/content/data/DataServicesScript.groovy
index a01527db53..20a258bfa5 100644
--- 
a/applications/content/src/main/groovy/org/apache/ofbiz/content/data/DataServicesScript.groovy
+++ 
b/applications/content/src/main/groovy/org/apache/ofbiz/content/data/DataServicesScript.groovy
@@ -88,7 +88,7 @@ Map createDataResourceAndAssocToContent() {
     if (parameters.templateDataResource && parameters.templateDataResource == 
'Y') {
         contentCtx.put('templateDataResourceId', parameters.dataResourceId)
     } else {
-        contentCtx.put('dataRessourceId', parameters.dataResourceId)
+        contentCtx.put('dataResourceId', parameters.dataResourceId)
     }
     contentCtx.put('contentId', parameters.contentId)
 
@@ -260,6 +260,9 @@ Map saveLocalFileDataResource(String mode) {
         .where('mimeTypeId', parameters._uploadedFile_contentType)
         .queryFirst()
     dataResource.dataResourceName = parameters._uploadedFile_fileName
+    if (mode in ['OFBIZ_FILE', 'OFBIZ_FILE_BIN', 'CONTEXT_FILE', 
'CONTEXT_FILE_BIN']) {
+        dataResource.mimeTypeId = parameters._uploadedFile_contentType
+    }
     dataResource.objectInfo = extension ?
         
"${uploadPath}/${dataResource.dataResourceId}.${extension.fileExtensionId}" :
         "${uploadPath}/${dataResource.dataResourceId}"
@@ -302,6 +305,9 @@ Map saveExtFileDataResource(boolean isUpdate, String mode) {
     dataResource.store()
 
     Map serviceContext = prepareServiceContext(dataResource, mode)
+    if (ServiceUtil.isError(serviceContext)) {
+        return serviceContext
+    }
 
     if (isUpdate) {
         switch (mode) {
@@ -357,7 +363,7 @@ Map prepareServiceContext(GenericValue dataResource, String 
mode) {
         case 'AUDIO_OBJECT':
             ModelService service = 
dispatcher.getDispatchContext().getModelService('createAudioDataResource')
             Map serviceContext = service.makeValid(dataResource, 'IN')
-            serviceContext.audioData
+            serviceContext.audioData = parameters.uploadedFile
             return serviceContext
         case 'OTHER_OBJECT':
             ModelService service = 
dispatcher.getDispatchContext().getModelService('createOtherDataResource')
@@ -365,5 +371,5 @@ Map prepareServiceContext(GenericValue dataResource, String 
mode) {
             serviceContext.dataResourceContent = parameters.uploadedFile
             return serviceContext
     }
-    return error
+    return error(UtilProperties.getMessage('ContentUiLabels', 
'ContentDataTypeNotYetSupported', parameters.locale))
 }