svn commit: r556181 - in /ofbiz/trunk/applications: ecommerce/webapp/ecommerce/customer/ ecommerce/webapp/ecommerce/order/ party/webapp/partymgr/party/ product/webapp/catalog/store/

Author: jleroux
Date: Fri Jul 13 16:23:54 2007
New Revision: 556181

URL: http://svn.apache.org/viewvc?view=rev&rev=556181
Log:
A couple of fix where default("Y") was used where if_exists)?default("Y") was needed (related to https://issues.apache.org/jira/browse/OFBIZ-1041)

Modified:
    ofbiz/trunk/applications/ecommerce/webapp/ecommerce/customer/editcontactmech.ftl
    ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/genericaddress.ftl
    ofbiz/trunk/applications/party/webapp/partymgr/party/editcontactmech.ftl
    ofbiz/trunk/applications/product/webapp/catalog/store/EditProductStorePaySetup.ftl

Modified: ofbiz/trunk/applications/ecommerce/webapp/ecommerce/customer/editcontactmech.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/customer/editcontactmech.ftl?view=diff&rev=556181&r1=556180&r2=556181
==============================================================================
--- ofbiz/trunk/applications/ecommerce/webapp/ecommerce/customer/editcontactmech.ftl (original)
+++ ofbiz/trunk/applications/ecommerce/webapp/ecommerce/customer/editcontactmech.ftl Fri Jul 13 16:23:54 2007
@@ -212,7 +212,7 @@
       <td width="5">&nbsp;</td>
       <td width="74%">
         <select name="allowSolicitation" class='selectBox'>
-          <option>${partyContactMechData.allowSolicitation?default("Y")}</option>
+          <option>${(partyContactMechData.allowSolicitation?if_exists)?default("Y")}</option>
           <option></option>
           <option value="Y">${uiLabelMap.CommonY}</option>
           <option value="N">${uiLabelMap.CommonN}</option>

Modified: ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/genericaddress.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/genericaddress.ftl?view=diff&rev=556181&r1=556180&r2=556181
==============================================================================
--- ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/genericaddress.ftl (original)
+++ ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/genericaddress.ftl Fri Jul 13 16:23:54 2007
@@ -103,7 +103,7 @@
   <td width="5">&nbsp;</td>
   <td width="74%">
     <select name="allowSolicitation" class='selectBox' <#if requestParameters.useShipAddr?exists>disabled</#if>>
-      <option>${parameters.allowSolicitatio?default("Y")}</option>
+      <option>${(parameters.allowSolicitatio?if_exists)?default("Y")}</option>
       <option></option>
       <option value="Y">${uiLabelMap.CommonY}</option>
       <option value="N">${uiLabelMap.CommonN}</option>

Modified: ofbiz/trunk/applications/party/webapp/partymgr/party/editcontactmech.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/party/editcontactmech.ftl?view=diff&rev=556181&r1=556180&r2=556181
==============================================================================
--- ofbiz/trunk/applications/party/webapp/partymgr/party/editcontactmech.ftl (original)
+++ ofbiz/trunk/applications/party/webapp/partymgr/party/editcontactmech.ftl Fri Jul 13 16:23:54 2007
@@ -222,7 +222,7 @@
     <td class="label">${uiLabelMap.PartyContactAllowSolicitation}?</td>
     <td>
       <select name="allowSolicitation">
-          <option>${mechMap.partyContactMech.allowSolicitation?default("Y")}</option>
+          <option>${(mechMap.partyContactMech.allowSolicitation?if_exists)?default("Y")}</option>
           <option></option>
           <option value="Y">${uiLabelMap.CommonY}</option>
           <option value="N">${uiLabelMap.CommonN}</option>

Modified: ofbiz/trunk/applications/product/webapp/catalog/store/EditProductStorePaySetup.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/store/EditProductStorePaySetup.ftl?view=diff&rev=556181&r1=556180&r2=556181
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/store/EditProductStorePaySetup.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/store/EditProductStorePaySetup.ftl Fri Jul 13 16:23:54 2007
@@ -96,7 +96,7 @@
           <td><span class="tableheadtext">${uiLabelMap.ApplyToAll} ${uiLabelMap.ProductProducts}</span></td>
           <td>
               <select name="applyToAllProducts" class="smallSelect">
-                  <option>${editSetting.applyToAllProducts?default("Y")}</option>
+                  <option>${(editSetting.applyToAllProducts?if_exists)?default("Y")}</option>
                   <option></option>
                   <option value="Y">${uiLabelMap.CommonY}</option>
   <option value="N">${uiLabelMap.CommonN}</option>