This is an automated email from the ASF dual-hosted git repository.
mridulpathak pushed a commit to branch release24.09
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git
The following commit(s) were added to refs/heads/release24.09 by this push:
new cc8e9dc665 Fixed: ContentServices status-transition and
content-creation regressions (OFBIZ-13540)
cc8e9dc665 is described below
commit cc8e9dc665866f2bd71390462110a00e767bc682
Author: Mridul Pathak <[email protected]>
AuthorDate: Mon Sep 7 18:21:02 2026 +0530
Fixed: ContentServices status-transition and content-creation regressions
(OFBIZ-13540)
Backported from trunk (apache/ofbiz-framework#1870). The fix was adapted
rather than cherry-picked directly: createContentAlternativeUrl still uses this
branch's older EntityListIterator/while loop instead of trunk's
queryList().each closure, so the same three logical fixes (the collapsed OR
condition, the missing else branch, and setContentStatus/createArticleContent's
fixes) were reapplied onto this branch's actual code shape; behavior is
otherwise identical to the trunk fix.
---
.../content/content/ContentServicesScript.groovy | 30 ++++++++++++----------
1 file changed, 16 insertions(+), 14 deletions(-)
diff --git
a/applications/content/src/main/groovy/org/apache/ofbiz/content/content/ContentServicesScript.groovy
b/applications/content/src/main/groovy/org/apache/ofbiz/content/content/ContentServicesScript.groovy
index 4320c09bc1..5ab0132e9e 100644
---
a/applications/content/src/main/groovy/org/apache/ofbiz/content/content/ContentServicesScript.groovy
+++
b/applications/content/src/main/groovy/org/apache/ofbiz/content/content/ContentServicesScript.groovy
@@ -27,6 +27,7 @@ import
org.apache.ofbiz.entity.condition.EntityConditionBuilder
import org.apache.ofbiz.entity.GenericValue
import org.apache.ofbiz.entity.condition.EntityOperator
import org.apache.ofbiz.entity.util.EntityListIterator
+import org.apache.ofbiz.entity.util.EntityUtilProperties
import org.apache.ofbiz.service.GenericServiceException
import org.apache.ofbiz.service.ModelService
@@ -36,13 +37,13 @@ import org.apache.ofbiz.base.util.UtilDateTime
Map createTextAndUploadedContent() {
Map result = success()
- Map serviceResult = run service: 'createContent', with: parameters
+ Map serviceResult = run service: 'createTextContent', with: parameters
parameters.parentContentId = serviceResult.contentId
if (parameters.uploadedFile) {
logInfo('Uploaded file found; processing sub-content')
Map uploadContext = [*: parameters,
- ownerContentId: parentContentId,
+ ownerContentId: parameters.parentContentId,
contentIdFrom: parameters.parentContentId,
contentAssocTypeId: 'SUB_CONTENT',
contentPurposeTypeId: 'SECTION']
@@ -131,9 +132,9 @@ Map createContentAlternativeUrl() {
EntityListIterator contents
EntityCondition entryExprs
- EntityCondition contentTypeExprs =
EntityCondition.makeCondition(EntityOperator.OR,
- 'contentTypeId', 'DOCUMENT',
- 'contentTypeId', 'WEB_SITE_PUB_PT')
+ EntityCondition contentTypeExprs = EntityCondition.makeCondition([
+ EntityCondition.makeCondition('contentTypeId', 'DOCUMENT'),
+ EntityCondition.makeCondition('contentTypeId',
'WEB_SITE_PUB_PT')], EntityOperator.OR)
if (parameters.contentId) {
entryExprs = new EntityConditionBuilder().AND(contentTypeExprs) {
NOT_EQUAL(contentName: null)
@@ -161,8 +162,7 @@ Map createContentAlternativeUrl() {
.filterByDate('caFromDate', 'caThruDate')
.queryList()
if (contentAssocDataResources) {
- if (contentAssocDataResources
- && contentAssocDataResources[0].drObjectInfo
+ if (!contentAssocDataResources[0].drObjectInfo
&& content.contentName) {
String uri =
UrlServletHelper.invalidCharacter(content.contentName)
if (uri) {
@@ -177,6 +177,8 @@ Map createContentAlternativeUrl() {
}
contentCreated = 'Y'
}
+ } else {
+ contentCreated = 'N'
}
} else {
if (content.contentName) {
@@ -258,11 +260,8 @@ Map createArticleContent() {
if (textData) {
int textDataLen = textData.length()
logInfo('textDataLen: ' + textDataLen)
- int descriptLen = 0
- if (parameters.descriptLen) {
- descriptLen = (int) parameters.descriptLen
- logInfo('descriptLen: ' + descriptLen)
- }
+ int descriptLen = EntityUtilProperties.getPropertyValue('forum',
'descriptLen', '0', delegator) as Integer
+ logInfo('descriptLen: ' + descriptLen)
int subStringLen = Math.min(descriptLen, textDataLen)
logInfo('subStringLen: ' + subStringLen)
subDescript = textData.substring(0, subStringLen)
@@ -374,8 +373,11 @@ Map setContentStatus() {
content.statusId = parameters.statusId
content.store()
} else {
- result.errorMessage = "Cannot change from ${oldStatusId} to
${parameters.statusId}"
- logError(result.errorMessage)
+ String errorMessage = "Cannot change from ${oldStatusId} to
${parameters.statusId}"
+ logError(errorMessage)
+ result.responseMessage = 'error'
+ result.errorMessage = errorMessage
+ return result
}
}
} else {
