danwatford commented on a change in pull request #252:
URL: https://github.com/apache/ofbiz-framework/pull/252#discussion_r563315812
##########
File path: applications/order/groovyScripts/order/CompanyHeader.groovy
##########
@@ -135,17 +136,25 @@ if (!partyId) {
}
// the logo
-partyGroup = from("PartyGroup").where("partyId", partyId).queryOne()
+GenericValue partyGroup = from("PartyGroup").where("partyId",
partyId).queryOne()
if (partyGroup) {
- partyContentWrapper = new PartyContentWrapper(dispatcher, partyGroup,
locale, EntityUtilProperties.getPropertyValue("content", "defaultMimeType",
"text/html; charset=utf-8", delegator))
- partyContent =
partyContentWrapper.getFirstPartyContentByType(partyGroup.partyId , partyGroup,
"LGOIMGURL", delegator)
- if (partyContent) {
- logoImageUrl = "/content/control/stream?contentId=" +
partyContent.contentId
- } else {
- if (partyGroup?.logoImageUrl) {
- logoImageUrl = partyGroup.logoImageUrl
+ GenericValue dataResource =
+ PartyContentWrapper.getFirstPartyContentByType(partyId,
partyGroup, "LGOIMGURL", delegator)
+ ?.getRelatedOne("Content", true)
+ ?.getRelatedOne("DataResource", true)
+
+ if (dataResource) {
+ File logoFile =
DataResourceWorker.getContentFile(dataResource.getString("dataResourceTypeId"),
Review comment:
I've added the resource type id check and the fall-back to the
previously used content/control/stream url.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
