svn commit: r556379 - in /ofbiz/trunk/applications: ecommerce/webapp/ecommerce/customer/ ecommerce/webapp/ecommerce/order/ ecommerce/webapp/ecommerce/shoppinglist/ order/webapp/ordermgr/entry/ party/webapp/partymgr/party/ product/webapp/catalog/reviews...

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

svn commit: r556379 - in /ofbiz/trunk/applications: ecommerce/webapp/ecommerce/customer/ ecommerce/webapp/ecommerce/order/ ecommerce/webapp/ecommerce/shoppinglist/ order/webapp/ordermgr/entry/ party/webapp/partymgr/party/ product/webapp/catalog/reviews...

jleroux@apache.org
Author: jleroux
Date: Sun Jul 15 02:33:19 2007
New Revision: 556379

URL: http://svn.apache.org/viewvc?view=rev&rev=556379
Log:
Oops, some parenthesis were missing in rev. 556376
of course should not be
        <#if (()!"" == "Y")><option value="test">${uiLabelMap.CommonY}</option></#if>
        <#if (()!"" == "N")><option value="N">${uiLabelMap.CommonN}</option></#if>
but
        <#if ((()!"") == "Y")><option value="test">${uiLabelMap.CommonY}</option></#if>
        <#if ((()!"") == "N")><option value="N">${uiLabelMap.CommonN}</option></#if>
Not yet well familiarised with ! operator :(

Modified:
    ofbiz/trunk/applications/ecommerce/webapp/ecommerce/customer/editcontactmech.ftl
    ofbiz/trunk/applications/ecommerce/webapp/ecommerce/customer/newcustomer.ftl
    ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/custsettings.ftl
    ofbiz/trunk/applications/ecommerce/webapp/ecommerce/shoppinglist/editShoppingList.ftl
    ofbiz/trunk/applications/order/webapp/ordermgr/entry/custsettings.ftl
    ofbiz/trunk/applications/party/webapp/partymgr/party/editcontactmech.ftl
    ofbiz/trunk/applications/product/webapp/catalog/reviews/pendingReviews.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=556379&r1=556378&r2=556379
==============================================================================
--- ofbiz/trunk/applications/ecommerce/webapp/ecommerce/customer/editcontactmech.ftl (original)
+++ ofbiz/trunk/applications/ecommerce/webapp/ecommerce/customer/editcontactmech.ftl Sun Jul 15 02:33:19 2007
@@ -212,8 +212,8 @@
       <td width="5">&nbsp;</td>
       <td width="74%">
         <select name="allowSolicitation" class='selectBox'>
-          <#if ((partyContactMechData.allowSolicitation)!"" == "Y")><option value="test">${uiLabelMap.CommonY}</option></#if>
-          <#if ((partyContactMechData.allowSolicitation)!"" == "N")><option value="N">${uiLabelMap.CommonN}</option></#if>
+          <#if (((partyContactMechData.allowSolicitation)!"") == "Y")><option value="test">${uiLabelMap.CommonY}</option></#if>
+          <#if (((partyContactMechData.allowSolicitation)!"") == "N")><option value="N">${uiLabelMap.CommonN}</option></#if>
           <option></option>
           <option value="Y">${uiLabelMap.CommonY}</option>
           <option value="N">${uiLabelMap.CommonN}</option>

Modified: ofbiz/trunk/applications/ecommerce/webapp/ecommerce/customer/newcustomer.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/customer/newcustomer.ftl?view=diff&rev=556379&r1=556378&r2=556379
==============================================================================
--- ofbiz/trunk/applications/ecommerce/webapp/ecommerce/customer/newcustomer.ftl (original)
+++ ofbiz/trunk/applications/ecommerce/webapp/ecommerce/customer/newcustomer.ftl Sun Jul 15 02:33:19 2007
@@ -191,8 +191,8 @@
             <div class="form-label">${uiLabelMap.PartyAllowAddressSolicitation}</div>
             <div class="form-field">
                 <select name="CUSTOMER_ADDRESS_ALLOW_SOL" class='selectBox'>
-                    <#if ((requestParameters.CUSTOMER_ADDRESS_ALLOW_SOL)!"" == "Y")><option value="test">${uiLabelMap.CommonY}</option></#if>
-                    <#if ((requestParameters.CUSTOMER_ADDRESS_ALLOW_SOL)!"" == "N")><option value="N">${uiLabelMap.CommonN}</option></#if>
+                    <#if (((requestParameters.CUSTOMER_ADDRESS_ALLOW_SOL)!"") == "Y")><option value="test">${uiLabelMap.CommonY}</option></#if>
+                    <#if (((requestParameters.CUSTOMER_ADDRESS_ALLOW_SOL)!"") == "N")><option value="N">${uiLabelMap.CommonN}</option></#if>
                     <option></option>
                     <option value="Y">${uiLabelMap.CommonY}</option>
                     <option value="N">${uiLabelMap.CommonN}</option>
@@ -224,8 +224,8 @@
                 &nbsp;${uiLabelMap.PartyExtension}&nbsp;<input type="text" class='inputBox' name="CUSTOMER_HOME_EXT" value="${requestParameters.CUSTOMER_HOME_EXT?if_exists}" size="6" maxlength="10">
                 <br/>
                 <select name="CUSTOMER_HOME_ALLOW_SOL" class='selectBox'>
-                    <#if ((requestParameters.CUSTOMER_HOME_ALLOW_SOL)!"" == "Y")><option value="test">${uiLabelMap.CommonY}</option></#if>
-                    <#if ((requestParameters.CUSTOMER_HOME_ALLOW_SOL)!"" == "N")><option value="N">${uiLabelMap.CommonN}</option></#if>
+                    <#if (((requestParameters.CUSTOMER_HOME_ALLOW_SOL))!"" == "Y")><option value="test">${uiLabelMap.CommonY}</option></#if>
+                    <#if (((requestParameters.CUSTOMER_HOME_ALLOW_SOL))!"" == "N")><option value="N">${uiLabelMap.CommonN}</option></#if>
                     <option></option>
                     <option value="Y">${uiLabelMap.CommonY}</option>
                     <option value="N">${uiLabelMap.CommonN}</option>
@@ -242,8 +242,8 @@
                 &nbsp;${uiLabelMap.PartyExtension}&nbsp;<input type="text" class='inputBox' name="CUSTOMER_WORK_EXT" value="${requestParameters.CUSTOMER_WORK_EXT?if_exists}" size="6" maxlength="10">
                 <br/>
                 <select name="CUSTOMER_WORK_ALLOW_SOL" class='selectBox'>
-                    <#if ((requestParameters.CUSTOMER_WORK_ALLOW_SOL)!"" == "Y")><option value="test">${uiLabelMap.CommonY}</option></#if>
-                    <#if ((requestParameters.CUSTOMER_WORK_ALLOW_SOL)!"" == "N")><option value="N">${uiLabelMap.CommonN}</option></#if>
+                    <#if (((requestParameters.CUSTOMER_WORK_ALLOW_SOL)!"" == "Y")><option value="test">${uiLabelMap.CommonY}</option></#if>
+                    <#if (((requestParameters.CUSTOMER_WORK_ALLOW_SOL)!"" == "N")><option value="N">${uiLabelMap.CommonN}</option></#if>
                     <option></option>
                     <option value="Y">${uiLabelMap.CommonY}</option>
                     <option value="N">${uiLabelMap.CommonN}</option>
@@ -259,8 +259,8 @@
                 -&nbsp;<input type="text" class='inputBox' name="CUSTOMER_FAX_CONTACT" value="${requestParameters.CUSTOMER_FAX_CONTACT?if_exists}" size="15" maxlength="15">
                 <br/>
                 <select name="CUSTOMER_FAX_ALLOW_SOL" class='selectBox'>
-                    <#if ((requestParameters.CUSTOMER_FAX_ALLOW_SOL)!"" == "Y")><option value="test">${uiLabelMap.CommonY}</option></#if>
-                    <#if ((requestParameters.CUSTOMER_FAX_ALLOW_SOL)!"" == "N")><option value="N">${uiLabelMap.CommonN}</option></#if>
+                    <#if (((requestParameters.CUSTOMER_FAX_ALLOW_SOL)!"" == "Y")><option value="test">${uiLabelMap.CommonY}</option></#if>
+                    <#if (((requestParameters.CUSTOMER_FAX_ALLOW_SOL)!"" == "N")><option value="N">${uiLabelMap.CommonN}</option></#if>
                     <option></option>
                     <option value="Y">${uiLabelMap.CommonY}</option>
                     <option value="N">${uiLabelMap.CommonN}</option>
@@ -276,8 +276,8 @@
                 -&nbsp;<input type="text" class='inputBox' name="CUSTOMER_MOBILE_CONTACT" value="${requestParameters.CUSTOMER_MOBILE_CONTACT?if_exists}" size="15" maxlength="15">
                 <br/>
                 <select name="CUSTOMER_MOBILE_ALLOW_SOL" class='selectBox'>
-                    <#if ((requestParameters.CUSTOMER_MOBILE_ALLOW_SOL)!"" == "Y")><option value="test">${uiLabelMap.CommonY}</option></#if>
-                    <#if ((requestParameters.CUSTOMER_MOBILE_ALLOW_SOL)!"" == "N")><option value="N">${uiLabelMap.CommonN}</option></#if>
+                    <#if (((requestParameters.CUSTOMER_MOBILE_ALLOW_SOL)!"" == "Y")><option value="test">${uiLabelMap.CommonY}</option></#if>
+                    <#if (((requestParameters.CUSTOMER_MOBILE_ALLOW_SOL)!"" == "N")><option value="N">${uiLabelMap.CommonN}</option></#if>
                     <option></option>
                     <option value="Y">${uiLabelMap.CommonY}</option>
                     <option value="N">${uiLabelMap.CommonN}</option>

Modified: ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/custsettings.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/custsettings.ftl?view=diff&rev=556379&r1=556378&r2=556379
==============================================================================
--- ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/custsettings.ftl (original)
+++ ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/custsettings.ftl Sun Jul 15 02:33:19 2007
@@ -84,8 +84,8 @@
                 <td width="5">&nbsp;</td>
                 <td width="74%">
                 <select name="homeSol" class="selectBox">
-                    <#if ((parameters.homeSol?)!"" == "Y")><option value="test">${uiLabelMap.CommonY}</option></#if>
-                    <#if ((parameters.homeSol?)!"" == "N")><option value="N">${uiLabelMap.CommonN}</option></#if>
+                    <#if (((parameters.homeSol?)!"") == "Y")><option value="test">${uiLabelMap.CommonY}</option></#if>
+                    <#if (((parameters.homeSol?)!"") == "N")><option value="N">${uiLabelMap.CommonN}</option></#if>
                     <option></option>
                     <option value="Y">${uiLabelMap.CommonY}</option>
                     <option value="N">${uiLabelMap.CommonN}</option>
@@ -124,8 +124,8 @@
                 <td width="5">&nbsp;</td>
                 <td width="74%">
                   <select name="emailSol" class="selectBox">
-                    <#if ((parameters.emailSol)!"" == "Y")><option value="test">${uiLabelMap.CommonY}</option></#if>
-                    <#if ((parameters.emailSol)!"" == "N")><option value="N">${uiLabelMap.CommonN}</option></#if>
+                    <#if (((parameters.emailSol)!"") == "Y")><option value="test">${uiLabelMap.CommonY}</option></#if>
+                    <#if (((parameters.emailSol)!"") == "N")><option value="N">${uiLabelMap.CommonN}</option></#if>
                     <option></option>
                     <option value="Y">${uiLabelMap.CommonY}</option>
                     <option value="N">${uiLabelMap.CommonN}</option>

Modified: ofbiz/trunk/applications/ecommerce/webapp/ecommerce/shoppinglist/editShoppingList.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/shoppinglist/editShoppingList.ftl?view=diff&rev=556379&r1=556378&r2=556379
==============================================================================
--- ofbiz/trunk/applications/ecommerce/webapp/ecommerce/shoppinglist/editShoppingList.ftl (original)
+++ ofbiz/trunk/applications/ecommerce/webapp/ecommerce/shoppinglist/editShoppingList.ftl Sun Jul 15 02:33:19 2007
@@ -101,8 +101,8 @@
                 <td><div class="tableheadtext">${uiLabelMap.EcommercePublic}?</div></td>
                 <td>
                   <select name="isPublic" class="selectBox">
-                    <#if ((shoppingList.isPublic)!"" == "Y")><option value="test">${uiLabelMap.CommonY}</option></#if>
-                    <#if ((shoppingList.isPublic)!"" == "N")><option value="N">${uiLabelMap.CommonN}</option></#if>
+                    <#if (((shoppingList.isPublic)!"") == "Y")><option value="test">${uiLabelMap.CommonY}</option></#if>
+                    <#if (((shoppingList.isPublic)!"") == "N")><option value="N">${uiLabelMap.CommonN}</option></#if>
                     <option></option>
                     <option value="Y">${uiLabelMap.CommonY}</option>
                     <option value="N">${uiLabelMap.CommonN}</option>
@@ -113,8 +113,8 @@
                 <td><div class="tableheadtext">${uiLabelMap.EcommerceActive}?</div></td>
                 <td>
                   <select name="isActive" class="selectBox">
-                    <#if ((shoppingList.isActive)!"" == "Y")><option value="test">${uiLabelMap.CommonY}</option></#if>
-                    <#if ((shoppingList.isActive)!"" == "N")><option value="N">${uiLabelMap.CommonN}</option></#if>
+                    <#if (((shoppingList.isActive)!"") == "Y")><option value="test">${uiLabelMap.CommonY}</option></#if>
+                    <#if (((shoppingList.isActive)!"") == "N")><option value="N">${uiLabelMap.CommonN}</option></#if>
                     <option></option>
                     <option value="Y">${uiLabelMap.CommonY}</option>
                     <option value="N">${uiLabelMap.CommonN}</option>

Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/custsettings.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/custsettings.ftl?view=diff&rev=556379&r1=556378&r2=556379
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/entry/custsettings.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/custsettings.ftl Sun Jul 15 02:33:19 2007
@@ -74,8 +74,8 @@
                   &nbsp;ext&nbsp;<input type="text" class="inputBox" name="homeExt" value="${requestParameters.homeExt?if_exists}" size="6" maxlength="10"/>
                   <BR>
                   <select name="homeSol" class="selectBox">
-                    <#if ((requestParameters.homeSol)!"" == "Y")><option value="test">${uiLabelMap.CommonY}</option></#if>
-                    <#if ((requestParameters.homeSol)!"" == "N")><option value="N">${uiLabelMap.CommonN}</option></#if>
+                    <#if (((requestParameters.homeSol)!"") == "Y")><option value="test">${uiLabelMap.CommonY}</option></#if>
+                    <#if (((requestParameters.homeSol)!"") == "N")><option value="N">${uiLabelMap.CommonN}</option></#if>
                     <option></option>
                     <option value="Y">${uiLabelMap.CommonY}</option>
                     <option value="N">${uiLabelMap.CommonN}</option>
@@ -92,8 +92,8 @@
                   &nbsp;ext&nbsp;<input type="text" class="inputBox" name="workExt" value="${requestParameters.CUSTOMER_WORK_EXT?if_exists}" size="6" maxlength="10"/>
                   <BR>
                   <select name="workSol" class="selectBox">
-                    <#if ((requestParameters.workSol)!"" == "Y")><option value="test">${uiLabelMap.CommonY}</option></#if>
-                    <#if ((requestParameters.workSol)!"" == "N")><option value="N">${uiLabelMap.CommonN}</option></#if>
+                    <#if (((requestParameters.workSol)!"") == "Y")><option value="test">${uiLabelMap.CommonY}</option></#if>
+                    <#if (((requestParameters.workSol)!"") == "N")><option value="N">${uiLabelMap.CommonN}</option></#if>
                     <option></option>
                     <option value="Y">${uiLabelMap.CommonY}</option>
                     <option value="N">${uiLabelMap.CommonN}</option>
@@ -110,8 +110,8 @@
                   <input type="text" class="inputBox" name="emailAddress" value="" size="60" maxlength="255">
                   <BR>
                   <select name="emailSol" class="selectBox">
-                    <#if ((requestParameters.emailSol)!"" == "Y")><option value="test">${uiLabelMap.CommonY}</option></#if>
-                    <#if ((requestParameters.emailSol)!"" == "N")><option value="N">${uiLabelMap.CommonN}</option></#if>
+                    <#if (((requestParameters.emailSol)!"") == "Y")><option value="test">${uiLabelMap.CommonY}</option></#if>
+                    <#if (((requestParameters.emailSol)!"") == "N")><option value="N">${uiLabelMap.CommonN}</option></#if>
                     <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=556379&r1=556378&r2=556379
==============================================================================
--- ofbiz/trunk/applications/party/webapp/partymgr/party/editcontactmech.ftl (original)
+++ ofbiz/trunk/applications/party/webapp/partymgr/party/editcontactmech.ftl Sun Jul 15 02:33:19 2007
@@ -222,8 +222,8 @@
     <td class="label">${uiLabelMap.PartyContactAllowSolicitation}?</td>
     <td>
       <select name="allowSolicitation">
-        <#if ((mechMap.partyContactMech.allowSolicitation)!"" == "Y")><option value="test">${uiLabelMap.CommonY}</option></#if>
-        <#if ((mechMap.partyContactMech.allowSolicitation)!"" == "N")><option value="N">${uiLabelMap.CommonN}</option></#if>
+        <#if (((mechMap.partyContactMech.allowSolicitation)!"") == "Y")><option value="test">${uiLabelMap.CommonY}</option></#if>
+        <#if (((mechMap.partyContactMech.allowSolicitation)!"") == "N")><option value="N">${uiLabelMap.CommonN}</option></#if>
         <option></option>
         <option value="Y">${uiLabelMap.CommonY}</option>
         <option value="N">${uiLabelMap.CommonN}</option>

Modified: ofbiz/trunk/applications/product/webapp/catalog/reviews/pendingReviews.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/reviews/pendingReviews.ftl?view=diff&rev=556379&r1=556378&r2=556379
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/reviews/pendingReviews.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/reviews/pendingReviews.ftl Sun Jul 15 02:33:19 2007
@@ -52,8 +52,8 @@
         <td>
           <div class="tabletext">
             <select name="postedAnonymous" class="selectBox">
-              <#if ((review.postedAnonymous)!"" == "Y")><option value="test">${uiLabelMap.CommonY}</option></#if>
-              <#if ((review.postedAnonymous)!"" == "N")><option value="N">${uiLabelMap.CommonN}</option></#if>
+              <#if (((review.postedAnonymous)!"") == "Y")><option value="test">${uiLabelMap.CommonY}</option></#if>
+              <#if (((review.postedAnonymous)!"") == "N")><option value="N">${uiLabelMap.CommonN}</option></#if>
               <option></option>
               <option value="N">${uiLabelMap.CommonN}</option>
   <option value="Y">${uiLabelMap.CommonY}</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=556379&r1=556378&r2=556379
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/store/EditProductStorePaySetup.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/store/EditProductStorePaySetup.ftl Sun Jul 15 02:33:19 2007
@@ -96,8 +96,8 @@
           <td><span class="tableheadtext">${uiLabelMap.ApplyToAll} ${uiLabelMap.ProductProducts}</span></td>
           <td>
               <select name="applyToAllProducts" class="smallSelect">
-                  <#if ((editSetting.applyToAllProducts)!"" == "Y")><option value="test">${uiLabelMap.CommonY}</option></#if>
-                  <#if ((editSetting.applyToAllProducts)!"" == "N")><option value="N">${uiLabelMap.CommonN}</option></#if>
+                  <#if (((editSetting.applyToAllProducts)!"") == "Y")><option value="test">${uiLabelMap.CommonY}</option></#if>
+                  <#if (((editSetting.applyToAllProducts)!"") == "N")><option value="N">${uiLabelMap.CommonN}</option></#if>
                   <option></option>
                   <option value="Y">${uiLabelMap.CommonY}</option>
   <option value="N">${uiLabelMap.CommonN}</option>