You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by ha...@apache.org on 2011/11/14 09:25:45 UTC
svn commit: r1201631 -
/ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/order/CompanyHeader.groovy
Author: hansbak
Date: Mon Nov 14 08:25:44 2011
New Revision: 1201631
URL: http://svn.apache.org/viewvc?rev=1201631&view=rev
Log:
Correction on r1199682 for a problem in the sendReturnCompleteNotification service as reported by J.Eckard
Modified:
ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/order/CompanyHeader.groovy
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/order/CompanyHeader.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/order/CompanyHeader.groovy?rev=1201631&r1=1201630&r2=1201631&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/order/CompanyHeader.groovy (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/order/CompanyHeader.groovy Mon Nov 14 08:25:44 2011
@@ -120,15 +120,14 @@ if (!partyId) {
// the logo
partyGroup = delegator.findByPrimaryKey("PartyGroup", [partyId : partyId]);
if (partyGroup) {
- partyContentWrapper = new PartyContentWrapper(partyGroup, request);
+ partyContentWrapper = new PartyContentWrapper(dispatcher, partyGroup, locale, "text/html");
partyContent = partyContentWrapper.getFirstPartyContentByType(partyGroup.partyId , partyGroup, "LGOIMGURL", delegator);
if (partyContent) {
logoImageUrl = "/content/control/stream?contentId="+partyContent.contentId;
- }
-}
-if(logoImageUrl == null){
- if (partyGroup?.logoImageUrl) {
- logoImageUrl = partyGroup.logoImageUrl;
+ } else {
+ if (partyGroup?.logoImageUrl) {
+ logoImageUrl = partyGroup.logoImageUrl;
+ }
}
}
context.logoImageUrl = logoImageUrl;