svn commit: r1343502 - in /ofbiz/trunk/specialpurpose/webpos/webapp/webpos: WEB-INF/actions/customer/EditAddress.groovy WEB-INF/actions/search/CustomerAddress.groovy catalog/CategoryDetail.ftl search/CustomerAddress.ftl

[doogie-3]

Author: doogie
Date: Tue May 29 04:16:10 2012
New Revision: 1343502

URL: http://svn.apache.org/viewvc?rev=1343502&view=rev
Log:
DEPRECATION: specialpurpose/webpos: getRelatedOne variants replaced with a getRelatedOne variant that takes a boolean useCache parameter.

Modified:
    ofbiz/trunk/specialpurpose/webpos/webapp/webpos/WEB-INF/actions/customer/EditAddress.groovy
    ofbiz/trunk/specialpurpose/webpos/webapp/webpos/WEB-INF/actions/search/CustomerAddress.groovy
    ofbiz/trunk/specialpurpose/webpos/webapp/webpos/catalog/CategoryDetail.ftl
    ofbiz/trunk/specialpurpose/webpos/webapp/webpos/search/CustomerAddress.ftl

Modified: ofbiz/trunk/specialpurpose/webpos/webapp/webpos/WEB-INF/actions/customer/EditAddress.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/webpos/webapp/webpos/WEB-INF/actions/customer/EditAddress.groovy?rev=1343502&r1=1343501&r2=1343502&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/webpos/webapp/webpos/WEB-INF/actions/customer/EditAddress.groovy (original)
+++ ofbiz/trunk/specialpurpose/webpos/webapp/webpos/WEB-INF/actions/customer/EditAddress.groovy Tue May 29 04:16:10 2012
@@ -26,7 +26,7 @@ if (person) {
 
 contactMech = delegator.findOne("ContactMech", [contactMechId : parameters.contactMechId], false);
 if (contactMech) {
-    postalAddress = contactMech.getRelatedOne("PostalAddress");
+    postalAddress = contactMech.getRelatedOne("PostalAddress", false);
     if (postalAddress) {
         request.setAttribute("contactMechId", postalAddress.contactMechId);
         request.setAttribute("toName", postalAddress.toName);

Modified: ofbiz/trunk/specialpurpose/webpos/webapp/webpos/WEB-INF/actions/search/CustomerAddress.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/webpos/webapp/webpos/WEB-INF/actions/search/CustomerAddress.groovy?rev=1343502&r1=1343501&r2=1343502&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/webpos/webapp/webpos/WEB-INF/actions/search/CustomerAddress.groovy (original)
+++ ofbiz/trunk/specialpurpose/webpos/webapp/webpos/WEB-INF/actions/search/CustomerAddress.groovy Tue May 29 04:16:10 2012
@@ -30,7 +30,7 @@ if (webPosSession) {
     if (UtilValidate.isNotEmpty(shippingContactMechId)) {
         contactMech = delegator.findOne("ContactMech", [contactMechId : shippingContactMechId], false);
         if (UtilValidate.isNotEmpty(contactMech) && "POSTAL_ADDRESS".equals(contactMech.contactMechTypeId)) {
-            context.shippingPostalAddress = contactMech.getRelatedOne("PostalAddress");
+            context.shippingPostalAddress = contactMech.getRelatedOne("PostalAddress", false);
         }
     }
     billToCustomerPartyId = shoppingCart.getBillToCustomerPartyId();
@@ -41,7 +41,7 @@ if (webPosSession) {
     if (UtilValidate.isNotEmpty(billingContactMechId)) {
         contactMech = delegator.findOne("ContactMech", [contactMechId : billingContactMechId], false);
         if (UtilValidate.isNotEmpty(contactMech) && "POSTAL_ADDRESS".equals(contactMech.contactMechTypeId)) {
-            context.billingPostalAddress = contactMech.getRelatedOne("PostalAddress");
+            context.billingPostalAddress = contactMech.getRelatedOne("PostalAddress", false);
         }
     }
 }

Modified: ofbiz/trunk/specialpurpose/webpos/webapp/webpos/catalog/CategoryDetail.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/webpos/webapp/webpos/catalog/CategoryDetail.ftl?rev=1343502&r1=1343501&r2=1343502&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/webpos/webapp/webpos/catalog/CategoryDetail.ftl (original)
+++ ofbiz/trunk/specialpurpose/webpos/webapp/webpos/catalog/CategoryDetail.ftl Tue May 29 04:16:10 2012
@@ -22,7 +22,7 @@ under the License.
   <#assign cell = 0/>
   <tr>    
   <#list productCategoryMembers as productCategoryMember>
-  <#assign product = productCategoryMember.getRelatedOne("Product")?if_exists>
+  <#assign product = productCategoryMember.getRelatedOne("Product", false)?if_exists>
   <#if product?exists && product?has_content>
     <#assign smallImageUrl = Static["org.ofbiz.product.product.ProductContentWrapper"].getProductContentAsText(product, "SMALL_IMAGE_URL", locale, dispatcher)?if_exists />
     <#if !smallImageUrl?string?has_content>

Modified: ofbiz/trunk/specialpurpose/webpos/webapp/webpos/search/CustomerAddress.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/webpos/webapp/webpos/search/CustomerAddress.ftl?rev=1343502&r1=1343501&r2=1343502&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/webpos/webapp/webpos/search/CustomerAddress.ftl (original)
+++ ofbiz/trunk/specialpurpose/webpos/webapp/webpos/search/CustomerAddress.ftl Tue May 29 04:16:10 2012
@@ -40,8 +40,8 @@ under the License.
               <td><b><#if personBillTo.lastName?has_content>${personBillTo.lastName}</#if> <#if personBillTo.firstName?has_content>${personBillTo.firstName}</#if></b></td>
             </tr>
             </#if>
-            <#assign state = billingPostalAddress.getRelatedOne("StateProvinceGeo")?if_exists/>
-            <#assign country = billingPostalAddress.getRelatedOne("CountryGeo")?if_exists/>
+            <#assign state = billingPostalAddress.getRelatedOne("StateProvinceGeo", false)?if_exists/>
+            <#assign country = billingPostalAddress.getRelatedOne("CountryGeo", false)?if_exists/>
             <tr>
               <td><#if billingPostalAddress.address1?has_content>${billingPostalAddress.address1}</#if></td>
             </tr>
@@ -71,8 +71,8 @@ under the License.
               <td><b><#if personShipTo.lastName?has_content>${personShipTo.lastName}</#if> <#if personShipTo.firstName?has_content>${personShipTo.firstName}</#if></b></td>
             </tr>
             </#if>
-            <#assign state = shippingPostalAddress.getRelatedOne("StateProvinceGeo")?if_exists/>
-            <#assign country = shippingPostalAddress.getRelatedOne("CountryGeo")?if_exists/>
+            <#assign state = shippingPostalAddress.getRelatedOne("StateProvinceGeo", false)?if_exists/>
+            <#assign country = shippingPostalAddress.getRelatedOne("CountryGeo", false)?if_exists/>
             <tr>
               <td><#if shippingPostalAddress.address1?has_content>${shippingPostalAddress.address1}</#if></td>
             </tr>