OFBiz › OFBiz - Commits

svn commit: r1661312 - in /ofbiz/branches/release13.07/applications/product: config/ src/org/ofbiz/product/image/ src/org/ofbiz/product/product/ src/org/ofbiz/shipment/shipment/ webapp/catalog/WEB-INF/actions/category/ webapp/catalog/WEB-INF/actions/co...

‹ Previous Topic Next Topic ›
 
classic Classic list List threaded Threaded
♦
♦
 1 message Options
ashish-18
Reply | Threaded
Open this post in threaded view
♦
♦
|

svn commit: r1661312 - in /ofbiz/branches/release13.07/applications/product: config/ src/org/ofbiz/product/image/ src/org/ofbiz/product/product/ src/org/ofbiz/shipment/shipment/ webapp/catalog/WEB-INF/actions/category/ webapp/catalog/WEB-INF/actions/co...

ashish-18
Author: ashish
Date: Sat Feb 21 09:43:55 2015
New Revision: 1661312

URL: http://svn.apache.org/r1661312
Log:
Applied bug fix from trunk r1661307.
=======================================================================
Applied patch from jira issue - OFBIZ-6088 - There should not need to setup SystemProperty data on each tenant for specifying path to store tenant images.
Thanks Arun for creating the issue and thanks for providing the patch for the same.
=======================================================================

Modified:
    ofbiz/branches/release13.07/applications/product/config/catalog.properties
    ofbiz/branches/release13.07/applications/product/src/org/ofbiz/product/image/ScaleImage.java
    ofbiz/branches/release13.07/applications/product/src/org/ofbiz/product/product/ProductServices.java
    ofbiz/branches/release13.07/applications/product/src/org/ofbiz/product/product/ProductUtilServices.java
    ofbiz/branches/release13.07/applications/product/src/org/ofbiz/shipment/shipment/ShipmentServices.java
    ofbiz/branches/release13.07/applications/product/webapp/catalog/WEB-INF/actions/category/EditCategory.groovy
    ofbiz/branches/release13.07/applications/product/webapp/catalog/WEB-INF/actions/config/EditProductConfigItemContent.groovy
    ofbiz/branches/release13.07/applications/product/webapp/catalog/WEB-INF/actions/imagemanagement/ImageUpload.groovy
    ofbiz/branches/release13.07/applications/product/webapp/catalog/WEB-INF/actions/imagemanagement/SetDefaultImage.groovy
    ofbiz/branches/release13.07/applications/product/webapp/catalog/WEB-INF/actions/product/EditProductContent.groovy
    ofbiz/branches/release13.07/applications/product/webapp/facility/shipment/PackOrder.ftl

Modified: ofbiz/branches/release13.07/applications/product/config/catalog.properties
URL: http://svn.apache.org/viewvc/ofbiz/branches/release13.07/applications/product/config/catalog.properties?rev=1661312&r1=1661311&r2=1661312&view=diff
==============================================================================
--- ofbiz/branches/release13.07/applications/product/config/catalog.properties (original)
+++ ofbiz/branches/release13.07/applications/product/config/catalog.properties Sat Feb 21 09:43:55 2015
@@ -21,10 +21,10 @@
 
 
 # -- Image upload path on the server
-image.server.path=${sys:getProperty('ofbiz.home')}/framework/images/webapp/images
+image.server.path=${sys:getProperty('ofbiz.home')}/framework/images/webapp/images/${tenantId}
 
 # -- The prefix to put on auto-generated image urls (can be relative or absolute, whatever you want)
-image.url.prefix=/images
+image.url.prefix=/images/${tenantId}
 image.filename.format=${location}/${id}/${type}
 image.filename.additionalviewsize.format=${location}/${id}/${viewtype}/${sizetype}
 

Modified: ofbiz/branches/release13.07/applications/product/src/org/ofbiz/product/image/ScaleImage.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/release13.07/applications/product/src/org/ofbiz/product/image/ScaleImage.java?rev=1661312&r1=1661311&r2=1661312&view=diff
==============================================================================
--- ofbiz/branches/release13.07/applications/product/src/org/ofbiz/product/image/ScaleImage.java (original)
+++ ofbiz/branches/release13.07/applications/product/src/org/ofbiz/product/image/ScaleImage.java Sat Feb 21 09:43:55 2015
@@ -106,8 +106,13 @@ public class ScaleImage {
         index = filenameToUse.lastIndexOf(".");
         String imgExtension = filenameToUse.substring(index + 1);
         // paths
-        String imageServerPath = FlexibleStringExpander.expandString(EntityUtilProperties.getPropertyValue("catalog", "image.server.path", (Delegator)context.get("delegator")), context);
-        String imageUrlPrefix = EntityUtilProperties.getPropertyValue("catalog", "image.url.prefix", (Delegator)context.get("delegator"));
+        Map<String, Object>imageContext = FastMap.newInstance();
+        imageContext.putAll(context);
+        imageContext.put("tenantId",((Delegator)context.get("delegator")).getDelegatorTenantId());
+        String imageServerPath = FlexibleStringExpander.expandString(EntityUtilProperties.getPropertyValue("catalog", "image.server.path", (Delegator)context.get("delegator")), imageContext);
+        String imageUrlPrefix = FlexibleStringExpander.expandString(EntityUtilProperties.getPropertyValue("catalog", "image.url.prefix", (Delegator)context.get("delegator")), imageContext);
+        imageServerPath = imageServerPath.endsWith("/") ? imageServerPath.substring(0, imageServerPath.length()-1) : imageServerPath;
+        imageUrlPrefix = imageUrlPrefix.endsWith("/") ? imageUrlPrefix.substring(0, imageUrlPrefix.length()-1) : imageUrlPrefix;
         
         FlexibleStringExpander filenameExpander;
         String fileLocation = null;
@@ -282,9 +287,15 @@ public class ScaleImage {
         String imgName = filenameToUse.substring(0, index - 1);
         String imgExtension = filenameToUse.substring(index + 1);
         // paths
-        String mainFilenameFormat = UtilProperties.getPropertyValue("catalog", "image.filename.format");
-        String imageServerPath = FlexibleStringExpander.expandString(EntityUtilProperties.getPropertyValue("catalog", "image.server.path", (Delegator)context.get("delegator")), context);
-        String imageUrlPrefix = EntityUtilProperties.getPropertyValue("catalog", "image.url.prefix",(Delegator)context.get("delegator"));
+        Map<String, Object>imageContext = FastMap.newInstance();
+        imageContext.putAll(context);
+        imageContext.put("tenantId",((Delegator)context.get("delegator")).getDelegatorTenantId());
+        String mainFilenameFormat = EntityUtilProperties.getPropertyValue("catalog", "image.filename.format", (Delegator) context.get("delegator"));
+
+        String imageServerPath = FlexibleStringExpander.expandString(EntityUtilProperties.getPropertyValue("catalog", "image.server.path", (Delegator)context.get("delegator")), imageContext);
+        String imageUrlPrefix = FlexibleStringExpander.expandString(EntityUtilProperties.getPropertyValue("catalog", "image.url.prefix",(Delegator)context.get("delegator")), imageContext);
+        imageServerPath = imageServerPath.endsWith("/") ? imageServerPath.substring(0, imageServerPath.length()-1) : imageServerPath;
+        imageUrlPrefix = imageUrlPrefix.endsWith("/") ? imageUrlPrefix.substring(0, imageUrlPrefix.length()-1) : imageUrlPrefix;
 
         String id = null;
         String type = null;

Modified: ofbiz/branches/release13.07/applications/product/src/org/ofbiz/product/product/ProductServices.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/release13.07/applications/product/src/org/ofbiz/product/product/ProductServices.java?rev=1661312&r1=1661311&r2=1661312&view=diff
==============================================================================
--- ofbiz/branches/release13.07/applications/product/src/org/ofbiz/product/product/ProductServices.java (original)
+++ ofbiz/branches/release13.07/applications/product/src/org/ofbiz/product/product/ProductServices.java Sat Feb 21 09:43:55 2015
@@ -983,9 +983,16 @@ public class ProductServices {
         Locale locale = (Locale) context.get("locale");
 
         if (UtilValidate.isNotEmpty(context.get("_uploadedFile_fileName"))) {
-            String imageFilenameFormat = UtilProperties.getPropertyValue("catalog", "image.filename.additionalviewsize.format");
-            String imageServerPath = FlexibleStringExpander.expandString(EntityUtilProperties.getPropertyValue("catalog", "image.server.path", delegator), context);
-            String imageUrlPrefix = EntityUtilProperties.getPropertyValue("catalog", "image.url.prefix", delegator);
+            Map<String, Object>imageContext = FastMap.newInstance();
+            imageContext.putAll(context);
+            imageContext.put("delegator", delegator);
+            imageContext.put("tenantId",delegator.getDelegatorTenantId());
+            String imageFilenameFormat = EntityUtilProperties.getPropertyValue("catalog", "image.filename.additionalviewsize.format", delegator);
+
+            String imageServerPath = FlexibleStringExpander.expandString(EntityUtilProperties.getPropertyValue("catalog", "image.server.path", delegator), imageContext);
+            String imageUrlPrefix = FlexibleStringExpander.expandString(EntityUtilProperties.getPropertyValue("catalog", "image.url.prefix", delegator), imageContext);
+            imageServerPath = imageServerPath.endsWith("/") ? imageServerPath.substring(0, imageServerPath.length()-1) : imageServerPath;
+            imageUrlPrefix = imageUrlPrefix.endsWith("/") ? imageUrlPrefix.substring(0, imageUrlPrefix.length()-1) : imageUrlPrefix;
 
             FlexibleStringExpander filenameExpander = FlexibleStringExpander.getInstance(imageFilenameFormat);
             String viewNumber = String.valueOf(productContentTypeId.charAt(productContentTypeId.length() - 1));
@@ -1076,9 +1083,6 @@ public class ProductServices {
             /* scale Image in different sizes */
             Map<String, Object> resultResize = FastMap.newInstance();
             try {
-                Map<String, Object>imageContext = FastMap.newInstance();
-                imageContext.putAll(context);
-                imageContext.put("delegator", delegator);
                 resultResize.putAll(ScaleImage.scaleImageInAllSize(imageContext, filenameToUse, "additional", viewNumber));
             } catch (IOException e) {
                 Debug.logError(e, "Scale additional image in all different sizes is impossible : " + e.toString(), module);
@@ -1277,9 +1281,15 @@ public class ProductServices {
         Locale locale = (Locale) context.get("locale");
 
         if (UtilValidate.isNotEmpty(context.get("_uploadedFile_fileName"))) {
-            String imageFilenameFormat = UtilProperties.getPropertyValue("catalog", "image.filename.format");
-            String imageServerPath = FlexibleStringExpander.expandString(EntityUtilProperties.getPropertyValue("catalog", "image.server.path",delegator), context);
-            String imageUrlPrefix = EntityUtilProperties.getPropertyValue("catalog", "image.url.prefix", delegator);
+            Map<String, Object>imageContext = FastMap.newInstance();
+            imageContext.putAll(context);
+            imageContext.put("tenantId",delegator.getDelegatorTenantId());
+            String imageFilenameFormat = EntityUtilProperties.getPropertyValue("catalog", "image.filename.format", delegator);
+
+            String imageServerPath = FlexibleStringExpander.expandString(EntityUtilProperties.getPropertyValue("catalog", "image.server.path",delegator), imageContext);
+            String imageUrlPrefix = FlexibleStringExpander.expandString(EntityUtilProperties.getPropertyValue("catalog", "image.url.prefix", delegator), imageContext);
+            imageServerPath = imageServerPath.endsWith("/") ? imageServerPath.substring(0, imageServerPath.length()-1) : imageServerPath;
+            imageUrlPrefix = imageUrlPrefix.endsWith("/") ? imageUrlPrefix.substring(0, imageUrlPrefix.length()-1) : imageUrlPrefix;
 
             FlexibleStringExpander filenameExpander = FlexibleStringExpander.getInstance(imageFilenameFormat);
             String id = productPromoId + "_Image_" + productPromoContentTypeId.charAt(productPromoContentTypeId.length() - 1);

Modified: ofbiz/branches/release13.07/applications/product/src/org/ofbiz/product/product/ProductUtilServices.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/release13.07/applications/product/src/org/ofbiz/product/product/ProductUtilServices.java?rev=1661312&r1=1661311&r2=1661312&view=diff
==============================================================================
--- ofbiz/branches/release13.07/applications/product/src/org/ofbiz/product/product/ProductUtilServices.java (original)
+++ ofbiz/branches/release13.07/applications/product/src/org/ofbiz/product/product/ProductUtilServices.java Sat Feb 21 09:43:55 2015
@@ -494,8 +494,12 @@ public class ProductUtilServices {
         String errMsg = null;
 
         if (UtilValidate.isEmpty(pattern)) {
-            String imageFilenameFormat = UtilProperties.getPropertyValue("catalog", "image.filename.format");
-            String imageUrlPrefix = EntityUtilProperties.getPropertyValue("catalog", "image.url.prefix",delegator);
+            Map<String, Object>imageContext = FastMap.newInstance();
+            imageContext.putAll(context);
+            imageContext.put("tenantId",delegator.getDelegatorTenantId());
+            String imageFilenameFormat = EntityUtilProperties.getPropertyValue("catalog", "image.filename.format", delegator);
+            String imageUrlPrefix = FlexibleStringExpander.expandString(EntityUtilProperties.getPropertyValue("catalog", "image.url.prefix",delegator), imageContext);
+            imageUrlPrefix = imageUrlPrefix.endsWith("/") ? imageUrlPrefix.substring(0, imageUrlPrefix.length()-1) : imageUrlPrefix;
             pattern = imageUrlPrefix + "/" + imageFilenameFormat;
         }
 

Modified: ofbiz/branches/release13.07/applications/product/src/org/ofbiz/shipment/shipment/ShipmentServices.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/release13.07/applications/product/src/org/ofbiz/shipment/shipment/ShipmentServices.java?rev=1661312&r1=1661311&r2=1661312&view=diff
==============================================================================
--- ofbiz/branches/release13.07/applications/product/src/org/ofbiz/shipment/shipment/ShipmentServices.java (original)
+++ ofbiz/branches/release13.07/applications/product/src/org/ofbiz/shipment/shipment/ShipmentServices.java Sat Feb 21 09:43:55 2015
@@ -427,22 +427,26 @@ public class ShipmentServices {
         if (shippableItemInfo != null) {
             for (Map<String, Object> itemMap: shippableItemInfo) {
                 // add the item sizes
-                BigDecimal itemSize = (BigDecimal) itemMap.get("size");
-                if (itemSize != null) {
-                    shippableItemSizes.add(itemSize);
+                if (itemMap.containsKey("size")) {
+                    BigDecimal itemSize = (BigDecimal) itemMap.get("size");
+                    if (itemSize != null) {
+                        shippableItemSizes.add(itemSize);
+                    }
                 }
 
                 // add the feature quantities
                 BigDecimal quantity = (BigDecimal) itemMap.get("quantity");
-                Set<String> featureSet = UtilGenerics.checkSet(itemMap.get("featureSet"));
-                if (UtilValidate.isNotEmpty(featureSet)) {
-                    for (String featureId: featureSet) {
-                        BigDecimal featureQuantity = shippableFeatureMap.get(featureId);
-                        if (featureQuantity == null) {
-                            featureQuantity = BigDecimal.ZERO;
+                if (itemMap.containsKey("featureSet")) {
+                    Set<String> featureSet = UtilGenerics.checkSet(itemMap.get("featureSet"));
+                    if (UtilValidate.isNotEmpty(featureSet)) {
+                        for (String featureId: featureSet) {
+                            BigDecimal featureQuantity = shippableFeatureMap.get(featureId);
+                            if (featureQuantity == null) {
+                                featureQuantity = BigDecimal.ZERO;
+                            }
+                            featureQuantity = featureQuantity.add(quantity);
+                            shippableFeatureMap.put(featureId, featureQuantity);
                         }
-                        featureQuantity = featureQuantity.add(quantity);
-                        shippableFeatureMap.put(featureId, featureQuantity);
                     }
                 }
 

Modified: ofbiz/branches/release13.07/applications/product/webapp/catalog/WEB-INF/actions/category/EditCategory.groovy
URL: http://svn.apache.org/viewvc/ofbiz/branches/release13.07/applications/product/webapp/catalog/WEB-INF/actions/category/EditCategory.groovy?rev=1661312&r1=1661311&r2=1661312&view=diff
==============================================================================
--- ofbiz/branches/release13.07/applications/product/webapp/catalog/WEB-INF/actions/category/EditCategory.groovy (original)
+++ ofbiz/branches/release13.07/applications/product/webapp/catalog/WEB-INF/actions/category/EditCategory.groovy Sat Feb 21 09:43:55 2015
@@ -36,9 +36,12 @@ context.primaryParentCategory = primaryP
 
 
 // make the image file formats
-imageFilenameFormat = UtilProperties.getPropertyValue("catalog", "image.filename.format");
+context.tenantId = delegator.getDelegatorTenantId();
+imageFilenameFormat = EntityUtilProperties.getPropertyValue("catalog", "image.filename.format", delegator);
 imageServerPath = FlexibleStringExpander.expandString(EntityUtilProperties.getPropertyValue("catalog", "image.server.path", delegator), context);
-imageUrlPrefix = EntityUtilProperties.getPropertyValue("catalog", "image.url.prefix",delegator);
+imageUrlPrefix = FlexibleStringExpander.expandString(EntityUtilProperties.getPropertyValue("catalog", "image.url.prefix",delegator), context);
+imageServerPath = imageServerPath.endsWith("/") ? imageServerPath.substring(0, imageServerPath.length()-1) : imageServerPath;
+imageUrlPrefix = imageUrlPrefix.endsWith("/") ? imageUrlPrefix.substring(0, imageUrlPrefix.length()-1) : imageUrlPrefix;
 context.imageFilenameFormat = imageFilenameFormat;
 context.imageServerPath = imageServerPath;
 context.imageUrlPrefix = imageUrlPrefix;

Modified: ofbiz/branches/release13.07/applications/product/webapp/catalog/WEB-INF/actions/config/EditProductConfigItemContent.groovy
URL: http://svn.apache.org/viewvc/ofbiz/branches/release13.07/applications/product/webapp/catalog/WEB-INF/actions/config/EditProductConfigItemContent.groovy?rev=1661312&r1=1661311&r2=1661312&view=diff
==============================================================================
--- ofbiz/branches/release13.07/applications/product/webapp/catalog/WEB-INF/actions/config/EditProductConfigItemContent.groovy (original)
+++ ofbiz/branches/release13.07/applications/product/webapp/catalog/WEB-INF/actions/config/EditProductConfigItemContent.groovy Sat Feb 21 09:43:55 2015
@@ -24,9 +24,12 @@ import org.ofbiz.entity.util.EntityUtilP
 import org.ofbiz.widget.html.*
 
 // make the image file formats
+context.tenantId = delegator.getDelegatorTenantId();
 imageFilenameFormat = "configitems/${configItemId}";
 imageServerPath = FlexibleStringExpander.expandString(EntityUtilProperties.getPropertyValue("catalog", "image.server.path", delegator), context);
-imageUrlPrefix = EntityUtilProperties.getPropertyValue("catalog", "image.url.prefix",delegator);
+imageUrlPrefix = FlexibleStringExpander.expandString(EntityUtilProperties.getPropertyValue("catalog", "image.url.prefix",delegator), context);
+imageServerPath = imageServerPath.endsWith("/") ? imageServerPath.substring(0, imageServerPath.length()-1) : imageServerPath;
+imageUrlPrefix = imageUrlPrefix.endsWith("/") ? imageUrlPrefix.substring(0, imageUrlPrefix.length()-1) : imageUrlPrefix;
 context.imageFilenameFormat = imageFilenameFormat;
 context.imageServerPath = imageServerPath;
 context.imageUrlPrefix = imageUrlPrefix;

Modified: ofbiz/branches/release13.07/applications/product/webapp/catalog/WEB-INF/actions/imagemanagement/ImageUpload.groovy
URL: http://svn.apache.org/viewvc/ofbiz/branches/release13.07/applications/product/webapp/catalog/WEB-INF/actions/imagemanagement/ImageUpload.groovy?rev=1661312&r1=1661311&r2=1661312&view=diff
==============================================================================
--- ofbiz/branches/release13.07/applications/product/webapp/catalog/WEB-INF/actions/imagemanagement/ImageUpload.groovy (original)
+++ ofbiz/branches/release13.07/applications/product/webapp/catalog/WEB-INF/actions/imagemanagement/ImageUpload.groovy Sat Feb 21 09:43:55 2015
@@ -27,9 +27,12 @@ import org.ofbiz.entity.condition.*
 context.nowTimestampString = UtilDateTime.nowTimestamp().toString();
 
 // make the image file formats
-imageFilenameFormat = UtilProperties.getPropertyValue('catalog', 'image.filename.format');
+context.tenantId = delegator.getDelegatorTenantId();
+imageFilenameFormat = EntityUtilProperties.getPropertyValue('catalog', 'image.filename.format', delegator);
 imageServerPath = FlexibleStringExpander.expandString(EntityUtilProperties.getPropertyValue("catalog", "image.server.path", delegator), context);
-imageUrlPrefix = EntityUtilProperties.getPropertyValue('catalog', 'image.url.prefix',delegator);
+imageUrlPrefix = FlexibleStringExpander.expandString(EntityUtilProperties.getPropertyValue("catalog", "image.url.prefix",delegator), context);
+imageServerPath = imageServerPath.endsWith("/") ? imageServerPath.substring(0, imageServerPath.length()-1) : imageServerPath;
+imageUrlPrefix = imageUrlPrefix.endsWith("/") ? imageUrlPrefix.substring(0, imageUrlPrefix.length()-1) : imageUrlPrefix;
 context.imageFilenameFormat = imageFilenameFormat;
 context.imageServerPath = imageServerPath;
 context.imageUrlPrefix = imageUrlPrefix;

Modified: ofbiz/branches/release13.07/applications/product/webapp/catalog/WEB-INF/actions/imagemanagement/SetDefaultImage.groovy
URL: http://svn.apache.org/viewvc/ofbiz/branches/release13.07/applications/product/webapp/catalog/WEB-INF/actions/imagemanagement/SetDefaultImage.groovy?rev=1661312&r1=1661311&r2=1661312&view=diff
==============================================================================
--- ofbiz/branches/release13.07/applications/product/webapp/catalog/WEB-INF/actions/imagemanagement/SetDefaultImage.groovy (original)
+++ ofbiz/branches/release13.07/applications/product/webapp/catalog/WEB-INF/actions/imagemanagement/SetDefaultImage.groovy Sat Feb 21 09:43:55 2015
@@ -44,9 +44,12 @@ if (productContentList) {
 }
 
 // make the image file formats
-imageFilenameFormat = UtilProperties.getPropertyValue('catalog', 'image.filename.format');
+context.tenantId = delegator.getDelegatorTenantId();
+imageFilenameFormat = EntityUtilProperties.getPropertyValue('catalog', 'image.filename.format', delegator);
 imageServerPath = FlexibleStringExpander.expandString(EntityUtilProperties.getPropertyValue("catalog", "image.server.path", delegator), context);
-imageUrlPrefix = EntityUtilProperties.getPropertyValue('catalog', 'image.url.prefix',delegator);
+imageUrlPrefix = FlexibleStringExpander.expandString(EntityUtilProperties.getPropertyValue("catalog", "image.url.prefix",delegator), context);
+imageServerPath = imageServerPath.endsWith("/") ? imageServerPath.substring(0, imageServerPath.length()-1) : imageServerPath;
+imageUrlPrefix = imageUrlPrefix.endsWith("/") ? imageUrlPrefix.substring(0, imageUrlPrefix.length()-1) : imageUrlPrefix;
 context.imageFilenameFormat = imageFilenameFormat;
 context.imageServerPath = imageServerPath;
 context.imageUrlPrefix = imageUrlPrefix;

Modified: ofbiz/branches/release13.07/applications/product/webapp/catalog/WEB-INF/actions/product/EditProductContent.groovy
URL: http://svn.apache.org/viewvc/ofbiz/branches/release13.07/applications/product/webapp/catalog/WEB-INF/actions/product/EditProductContent.groovy?rev=1661312&r1=1661311&r2=1661312&view=diff
==============================================================================
--- ofbiz/branches/release13.07/applications/product/webapp/catalog/WEB-INF/actions/product/EditProductContent.groovy (original)
+++ ofbiz/branches/release13.07/applications/product/webapp/catalog/WEB-INF/actions/product/EditProductContent.groovy Sat Feb 21 09:43:55 2015
@@ -26,9 +26,12 @@ import org.ofbiz.product.image.ScaleImag
 context.nowTimestampString = UtilDateTime.nowTimestamp().toString();
 
 // make the image file formats
-imageFilenameFormat = UtilProperties.getPropertyValue('catalog', 'image.filename.format');
+context.tenantId = delegator.getDelegatorTenantId();
+imageFilenameFormat = EntityUtilProperties.getPropertyValue('catalog', 'image.filename.format', delegator);
 imageServerPath = FlexibleStringExpander.expandString(EntityUtilProperties.getPropertyValue("catalog", "image.server.path", delegator), context);
-imageUrlPrefix = EntityUtilProperties.getPropertyValue('catalog', 'image.url.prefix',delegator);
+imageUrlPrefix = FlexibleStringExpander.expandString(EntityUtilProperties.getPropertyValue("catalog", "image.url.prefix",delegator), context);
+imageServerPath = imageServerPath.endsWith("/") ? imageServerPath.substring(0, imageServerPath.length()-1) : imageServerPath;
+imageUrlPrefix = imageUrlPrefix.endsWith("/") ? imageUrlPrefix.substring(0, imageUrlPrefix.length()-1) : imageUrlPrefix;
 context.imageFilenameFormat = imageFilenameFormat;
 context.imageServerPath = imageServerPath;
 context.imageUrlPrefix = imageUrlPrefix;

Modified: ofbiz/branches/release13.07/applications/product/webapp/facility/shipment/PackOrder.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/release13.07/applications/product/webapp/facility/shipment/PackOrder.ftl?rev=1661312&r1=1661311&r2=1661312&view=diff
==============================================================================
--- ofbiz/branches/release13.07/applications/product/webapp/facility/shipment/PackOrder.ftl (original)
+++ ofbiz/branches/release13.07/applications/product/webapp/facility/shipment/PackOrder.ftl Sat Feb 21 09:43:55 2015
@@ -150,7 +150,7 @@ under the License.
         </div>
         <div class="screenlet-body">
               <#if orderItemShipGroup?has_content>
-                <#if (orderItemShipGroup.contacMechId)?has_content>
+                <#if (orderItemShipGroup.contactMechId)?has_content>
                   <#assign postalAddress = orderItemShipGroup.getRelatedOne("PostalAddress", false)>
                 </#if>
                 <#assign carrier = orderItemShipGroup.carrierPartyId?default("N/A")>


Free forum by Nabble Edit this page