You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by as...@apache.org on 2014/08/16 13:35:02 UTC

svn commit: r1618336 [13/21] - in /ofbiz/trunk/applications: accounting/webapp/accounting/agreement/ accounting/webapp/accounting/common/ accounting/webapp/accounting/finaccounttrans/ accounting/webapp/accounting/invoice/ accounting/webapp/accounting/p...

Modified: ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/ProductStores.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/ProductStores.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/ProductStores.ftl (original)
+++ ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/ProductStores.ftl Sat Aug 16 11:34:57 2014
@@ -38,7 +38,7 @@ under the License.
             <td class="button-col">
               <a href="/catalog/control/FindProductStoreRoles?partyId=${productStoreRole.partyId}&amp;productStoreId=${productStore.productStoreId}">${productStore.storeName?default("${uiLabelMap.ProductNoDescription}")} (${productStore.productStoreId})</a>
             </td>
-            <td>${roleType.description?if_exists}</td>
+            <td>${roleType.description!}</td>
           </tr>
         </#list>
       </table>

Modified: ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/SerializedInventory.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/SerializedInventory.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/SerializedInventory.ftl (original)
+++ ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/SerializedInventory.ftl Sat Aug 16 11:34:57 2014
@@ -38,30 +38,30 @@ under the License.
             </thead>
             <tbody>
                 <#list inventoryItemList as inventoryItem>
-                    <#assign product = inventoryItem.getRelatedOne('Product', false)?if_exists>
+                    <#assign product = inventoryItem.getRelatedOne('Product', false)!>
                     <tr>
-                        <td><a href="/facility/control/EditInventoryItem?inventoryItemId=${inventoryItem.inventoryItemId}&amp;externalLoginKey=${requestAttributes.externalLoginKey?if_exists}" class="linktext">${inventoryItem.inventoryItemId}</a></td>
+                        <td><a href="/facility/control/EditInventoryItem?inventoryItemId=${inventoryItem.inventoryItemId}&amp;externalLoginKey=${requestAttributes.externalLoginKey!}" class="linktext">${inventoryItem.inventoryItemId}</a></td>
                         <td>
                             <#if product?has_content>
                                 <#if product.isVariant?default('N') == 'Y'>
-                                    <#assign product = Static['org.ofbiz.product.product.ProductWorker'].getParentProduct(product.productId, delegator)?if_exists>
+                                    <#assign product = Static['org.ofbiz.product.product.ProductWorker'].getParentProduct(product.productId, delegator)!>
                                 </#if>
                                 <#if product?has_content>
-                                    <#assign productName = Static['org.ofbiz.product.product.ProductContentWrapper'].getProductContentAsText(product, 'PRODUCT_NAME', request)?if_exists>
-                                    <a href="/catalog/control/EditProduct?productId=${product.productId}&amp;externalLoginKey=${requestAttributes.externalLoginKey?if_exists}">${productName?default(product.productId)}</a>
+                                    <#assign productName = Static['org.ofbiz.product.product.ProductContentWrapper'].getProductContentAsText(product, 'PRODUCT_NAME', request)!>
+                                    <a href="/catalog/control/EditProduct?productId=${product.productId}&amp;externalLoginKey=${requestAttributes.externalLoginKey!}">${productName?default(product.productId)}</a>
                                 </#if>
                             </#if>
                         </td>
-                        <td>${inventoryItem.serialNumber?if_exists}</td>
+                        <td>${inventoryItem.serialNumber!}</td>
                         <td>
-                          ${inventoryItem.softIdentifier?if_exists}
+                          ${inventoryItem.softIdentifier!}
                           <#if (inventoryItem.softIdentifier?has_content && inventoryItem.softIdentifier?matches("\\d+"))>
                             <#assign sid = Static["java.lang.Long"].decode(inventoryItem.softIdentifier)/>
                             (0x${Static["java.lang.Long"].toHexString(sid)})
                           </#if>
                         </td>
-                        <td>${inventoryItem.activationNumber?if_exists}</td>
-                        <td>${inventoryItem.activationValidThru?if_exists}</td>
+                        <td>${inventoryItem.activationNumber!}</td>
+                        <td>${inventoryItem.activationValidThru!}</td>
                     </tr>
                 </#list>
             </tbody>

Modified: ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/UserLogin.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/UserLogin.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/UserLogin.ftl (original)
+++ ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/UserLogin.ftl Sat Aug 16 11:34:57 2014
@@ -37,7 +37,7 @@ under the License.
               <td>
                 <#assign enabled = uiLabelMap.PartyEnabled>
                 <#if (userUserLogin.enabled)?default("Y") == "N">
-                  <#if userUserLogin.disabledDateTime?exists>
+                  <#if userUserLogin.disabledDateTime??>
                     <#assign disabledTime = userUserLogin.disabledDateTime.toString()>
                   <#else>
                     <#assign disabledTime = "??">

Modified: ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/Visits.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/Visits.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/Visits.ftl (original)
+++ ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/Visits.ftl Sat Aug 16 11:34:57 2014
@@ -41,14 +41,14 @@ under the License.
             <#if (visitObj_index > 4)><#break></#if>
               <tr>
                 <td class="button-col">
-                  <a href="<@o...@ofbizUrl>">${visitObj.visitId?if_exists}</a>
+                  <a href="<@o...@ofbizUrl>">${visitObj.visitId!}</a>
                 </td>
-                <td>${visitObj.userLoginId?if_exists}</td>
-                <td>${visitObj.userCreated?if_exists}</td>
-                <td>${visitObj.webappName?if_exists}</td>
-                <td>${visitObj.clientIpAddress?if_exists}</td>
-                <td>${(visitObj.fromDate.toString())?if_exists}</td>
-                <td>${(visitObj.thruDate.toString())?if_exists}</td>
+                <td>${visitObj.userLoginId!}</td>
+                <td>${visitObj.userCreated!}</td>
+                <td>${visitObj.webappName!}</td>
+                <td>${visitObj.clientIpAddress!}</td>
+                <td>${(visitObj.fromDate.toString())!}</td>
+                <td>${(visitObj.thruDate.toString())!}</td>
               </tr>
           </#list>
         </table>

Modified: ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/mytasks.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/mytasks.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/mytasks.ftl (original)
+++ ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/mytasks.ftl Sat Aug 16 11:34:57 2014
@@ -39,9 +39,9 @@ under the License.
     <#assign alt_row = false>
     <#list tasks as workEffort>
       <tr<#if alt_row> class="alternate-row"</#if>>
-        <td>${(workEffort.estimatedStartDate.toString())?if_exists}</td>
-        <td>${workEffort.priority?if_exists}</td>
-        <td>${(delegator.findOne("StatusItem", Static["org.ofbiz.base.util.UtilMisc"].toMap("statusId", workEffort.getString("currentStatusId")), true).get("description",locale))?if_exists}</td>
+        <td>${(workEffort.estimatedStartDate.toString())!}</td>
+        <td>${workEffort.priority!}</td>
+        <td>${(delegator.findOne("StatusItem", Static["org.ofbiz.base.util.UtilMisc"].toMap("statusId", workEffort.getString("currentStatusId")), true).get("description",locale))!}</td>
         <td><a href="<@o...@ofbizContentUrl>">${workEffort.workEffortName}</a></td>
         <td class="button-col"><a href="<@o...@ofbizContentUrl>">${workEffort.workEffortId}</a></td>
       </tr>
@@ -64,10 +64,10 @@ under the License.
       <#assign alt_row = false>
       <#list activities as workEffort>
         <tr<#if alt_row> class="alternate-row"</#if>>
-          <td>${(workEffort.estimatedStartDate.toString())?if_exists}</td>
-          <td>${workEffort.priority?if_exists}</td>
-          <td>${(delegator.findOne("StatusItem", Static["org.ofbiz.base.util.UtilMisc"].toMap("statusId", workEffort.getString("currentStatusId")), true).get("description",locale))?if_exists}</td>
-          <td>${(delegator.findOne("StatusItem", Static["org.ofbiz.base.util.UtilMisc"].toMap("statusId", workEffort.getString("statusId")), true).get("description",locale))?if_exists}</td>
+          <td>${(workEffort.estimatedStartDate.toString())!}</td>
+          <td>${workEffort.priority!}</td>
+          <td>${(delegator.findOne("StatusItem", Static["org.ofbiz.base.util.UtilMisc"].toMap("statusId", workEffort.getString("currentStatusId")), true).get("description",locale))!}</td>
+          <td>${(delegator.findOne("StatusItem", Static["org.ofbiz.base.util.UtilMisc"].toMap("statusId", workEffort.getString("statusId")), true).get("description",locale))!}</td>
           <#-- <td>${workEffort.partyId}</td> -->
           <td>${workEffort.roleTypeId}</td>
           <td><a href="<@o...@ofbizContentUrl>">${workEffort.workEffortName}</a></td>
@@ -93,10 +93,10 @@ under the License.
       <#assign alt_row = false>
       <#list roleActivities as workEffort>
         <tr<#if alt_row> class="alternate-row"</#if>>
-          <td>${(workEffort.estimatedStartDate.toString())?if_exists}</td>
-          <td>${workEffort.priority?if_exists}</td>
-          <td>${(delegator.findOne("StatusItem", Static["org.ofbiz.base.util.UtilMisc"].toMap("statusId", workEffort.getString("currentStatusId")), true).get("description",locale))?if_exists}</td>
-          <td>${(delegator.findOne("StatusItem", Static["org.ofbiz.base.util.UtilMisc"].toMap("statusId", workEffort.getString("statusId")), true).get("description",locale))?if_exists}</td>
+          <td>${(workEffort.estimatedStartDate.toString())!}</td>
+          <td>${workEffort.priority!}</td>
+          <td>${(delegator.findOne("StatusItem", Static["org.ofbiz.base.util.UtilMisc"].toMap("statusId", workEffort.getString("currentStatusId")), true).get("description",locale))!}</td>
+          <td>${(delegator.findOne("StatusItem", Static["org.ofbiz.base.util.UtilMisc"].toMap("statusId", workEffort.getString("statusId")), true).get("description",locale))!}</td>
           <#-- <td>${workEffort.partyId}</td> -->
           <td>${workEffort.roleTypeId}</td>
           <td><a href="<@o...@ofbizContentUrl>">${workEffort.workEffortName}</a></td>
@@ -122,10 +122,10 @@ under the License.
       <#assign alt_row = false>
       <#list groupActivities as workEffort>
         <tr<#if alt_row> class="alternate-row"</#if>>
-          <td>${(workEffort.estimatedStartDate.toString())?if_exists}</td>
-          <td>${workEffort.priority?if_exists}</td>
-          <td>${(delegator.findOne("StatusItem", Static["org.ofbiz.base.util.UtilMisc"].toMap("statusId", workEffort.getString("currentStatusId")), true).get("description",locale))?if_exists}</td>
-          <td>${(delegator.findOne("StatusItem", Static["org.ofbiz.base.util.UtilMisc"].toMap("statusId", workEffort.getString("statusId")), true).get("description",locale))?if_exists}</td>
+          <td>${(workEffort.estimatedStartDate.toString())!}</td>
+          <td>${workEffort.priority!}</td>
+          <td>${(delegator.findOne("StatusItem", Static["org.ofbiz.base.util.UtilMisc"].toMap("statusId", workEffort.getString("currentStatusId")), true).get("description",locale))!}</td>
+          <td>${(delegator.findOne("StatusItem", Static["org.ofbiz.base.util.UtilMisc"].toMap("statusId", workEffort.getString("statusId")), true).get("description",locale))!}</td>
           <td>${workEffort.groupPartyId}</td>
           <#-- <td>${workEffort.roleTypeId}</td> -->
           <td><a href="<@o...@ofbizContentUrl>">${workEffort.workEffortName}</a></td>

Modified: ofbiz/trunk/applications/party/webapp/partymgr/security/ViewCertificate.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/security/ViewCertificate.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/webapp/partymgr/security/ViewCertificate.ftl (original)
+++ ofbiz/trunk/applications/party/webapp/partymgr/security/ViewCertificate.ftl Sat Aug 16 11:34:57 2014
@@ -17,7 +17,7 @@ specific language governing permissions 
 under the License.
 -->
 
-<#assign components = Static["org.ofbiz.base.component.ComponentConfig"].getAllComponents()?if_exists/>
+<#assign components = Static["org.ofbiz.base.component.ComponentConfig"].getAllComponents()!/>
 <#if (requestParameters.certString?has_content)>
     <#assign cert = Static["org.ofbiz.base.util.KeyStoreUtil"].pemToCert(requestParameters.certString)/>
 </#if>
@@ -55,7 +55,7 @@ under the License.
         <td>&nbsp;</td>
       </tr>
       <#list components as component>
-        <#assign keystores = component.getKeystoreInfos()?if_exists/>
+        <#assign keystores = component.getKeystoreInfos()!/>
           <#list keystores as store>
             <#if (store.isTrustStore())>
               <tr>

Modified: ofbiz/trunk/applications/party/webapp/partymgr/visit/showvisits.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/visit/showvisits.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/webapp/partymgr/visit/showvisits.ftl (original)
+++ ofbiz/trunk/applications/party/webapp/partymgr/visit/showvisits.ftl Sat Aug 16 11:34:57 2014
@@ -17,7 +17,7 @@ specific language governing permissions 
 under the License.
 -->
 <div class="screenlet">
-  <#if partyId?exists>
+  <#if partyId??>
     <#assign title = uiLabelMap.PartyParty>
   <#else>
     <#assign title = uiLabelMap.PartyActive>
@@ -25,9 +25,9 @@ under the License.
   <div class="screenlet-title-bar">
     <ul>
       <li class="h3">${title}&nbsp;${uiLabelMap.PartyVisitListing}</li>
-      <#if !partyId?exists && showAll?lower_case == "true">
+      <#if !partyId?? && showAll?lower_case == "true">
         <li><a href="<@o...@ofbizUrl>">${uiLabelMap.PartyShowActive}</a></li>
-      <#elseif !partyId?exists>
+      <#elseif !partyId??>
         <li><a href="<@o...@ofbizUrl>">${uiLabelMap.PartyShowAll}</a></li>
       </#if>
     </ul>
@@ -66,14 +66,14 @@ under the License.
         <#list visitList as visitObj>
           <tr<#if alt_row> class="alternate-row"</#if>>
             <td class="button-col"><a href="<@o...@ofbizUrl>">${visitObj.visitId}</a></td>
-            <td>${visitObj.visitorId?if_exists}</td>
-            <td class="button-col"><a href="<@o...@ofbizUrl>">${visitObj.partyId?if_exists}</a></td>
-            <td>${visitObj.userLoginId?if_exists}</td>
-            <td>${visitObj.userCreated?if_exists}</td>
-            <td>${visitObj.webappName?if_exists}</td>
-            <td>${visitObj.clientIpAddress?if_exists}</td>
-            <td>${(visitObj.fromDate?string)?if_exists}</td>
-            <td>${(visitObj.thruDate?string)?if_exists}</td>
+            <td>${visitObj.visitorId!}</td>
+            <td class="button-col"><a href="<@o...@ofbizUrl>">${visitObj.partyId!}</a></td>
+            <td>${visitObj.userLoginId!}</td>
+            <td>${visitObj.userCreated!}</td>
+            <td>${visitObj.webappName!}</td>
+            <td>${visitObj.clientIpAddress!}</td>
+            <td>${(visitObj.fromDate?string)!}</td>
+            <td>${(visitObj.thruDate?string)!}</td>
           </tr>
           <#assign alt_row = !alt_row>
         </#list>

Modified: ofbiz/trunk/applications/party/webapp/partymgr/visit/visitdetail.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/visit/visitdetail.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/webapp/partymgr/visit/visitdetail.ftl (original)
+++ ofbiz/trunk/applications/party/webapp/partymgr/visit/visitdetail.ftl Sat Aug 16 11:34:57 2014
@@ -29,7 +29,7 @@ under the License.
       <table class="basic-table" cellspacing="0">
         <tr>
           <td class="label">${uiLabelMap.PartyVisitIDSessionID}</td>
-          <td>${visit.visitId?if_exists} / ${visit.sessionId?if_exists}</td>
+          <td>${visit.visitId!} / ${visit.sessionId!}</td>
         </tr>
         <tr>
           <td class="label">${uiLabelMap.PartyVisitorId}</td>
@@ -37,51 +37,51 @@ under the License.
         </tr>
         <tr>
           <td class="label">${uiLabelMap.PartyPartyIDUserLoginID}</td>
-          <td><a href="<@o...@ofbizUrl>">${visit.partyId?if_exists}</a> / <a href="<@o...@ofbizUrl>">${visit.userLoginId?if_exists}</a></td>
+          <td><a href="<@o...@ofbizUrl>">${visit.partyId!}</a> / <a href="<@o...@ofbizUrl>">${visit.userLoginId!}</a></td>
         </tr>
         <tr>
           <td class="label">${uiLabelMap.PartyUserCreated}</td>
-          <td>${visit.userCreated?if_exists}</td>
+          <td>${visit.userCreated!}</td>
         </tr>
         <tr>
           <td class="label">${uiLabelMap.PartyWebApp}</td>
-          <td>${visit.webappName?if_exists}</td>
+          <td>${visit.webappName!}</td>
         </tr>
         <tr>
           <td class="label">${uiLabelMap.PartyServer}</td>
-          <td><a href="http://uptime.netcraft.com/up/graph/?site=${visit.serverIpAddress?if_exists}" target="_blank">${visit.serverIpAddress?if_exists}</a> / <a href="http://uptime.netcraft.com/up/graph/?site=${visit.serverIpAddress?if_exists}" target="_blank">${visit.serverHostName?if_exists}</a></td>
+          <td><a href="http://uptime.netcraft.com/up/graph/?site=${visit.serverIpAddress!}" target="_blank">${visit.serverIpAddress!}</a> / <a href="http://uptime.netcraft.com/up/graph/?site=${visit.serverIpAddress!}" target="_blank">${visit.serverHostName!}</a></td>
         </tr>
         <tr>
           <td class="label">${uiLabelMap.PartyClient}</td>
-          <td><a href="http://ws.arin.net/cgi-bin/whois.pl?queryinput=${visit.clientIpAddress?if_exists}" target="_blank">${visit.clientIpAddress?if_exists}</a> / <a href="http://www.networksolutions.com/cgi-bin/whois/whois?STRING=${visit.clientHostName?if_exists}&amp;SearchType=do" target="_blank">${visit.clientHostName?if_exists}</a></td>
+          <td><a href="http://ws.arin.net/cgi-bin/whois.pl?queryinput=${visit.clientIpAddress!}" target="_blank">${visit.clientIpAddress!}</a> / <a href="http://www.networksolutions.com/cgi-bin/whois/whois?STRING=${visit.clientHostName!}&amp;SearchType=do" target="_blank">${visit.clientHostName!}</a></td>
         </tr>
         <tr>
           <td class="label">${uiLabelMap.PartyClientUser}</td>
-          <td>${visit.clientUser?if_exists}</td>
+          <td>${visit.clientUser!}</td>
         </tr>
         <tr>
           <td class="label">${uiLabelMap.PartyInitialLocale}</td>
-          <td>${visit.initialLocale?if_exists}</td>
+          <td>${visit.initialLocale!}</td>
         </tr>
         <tr>
           <td class="label">${uiLabelMap.PartyInitialRequest}</td>
-          <td><a href="${visit.initialRequest?if_exists}" >${visit.initialRequest?if_exists}</a></td>
+          <td><a href="${visit.initialRequest!}" >${visit.initialRequest!}</a></td>
         </tr>
         <tr>
           <td class="label">${uiLabelMap.PartyInitialReferer}</td>
-          <td><a href="${visit.initialReferrer?if_exists}" >${visit.initialReferrer?if_exists}</a></td>
+          <td><a href="${visit.initialReferrer!}" >${visit.initialReferrer!}</a></td>
         </tr>
         <tr>
           <td class="label">${uiLabelMap.PartyInitialUserAgent}</td>
-          <td>${visit.initialUserAgent?if_exists}</td>
+          <td>${visit.initialUserAgent!}</td>
         </tr>
         <tr>
           <td class="label">${uiLabelMap.PartyCookie}</td>
-          <td>${visit.cookie?if_exists}</td>
+          <td>${visit.cookie!}</td>
         </tr>
         <tr>
           <td class="label">${uiLabelMap.CommonFromDateThruDate}</td>
-          <td>${(visit.fromDate?string)?if_exists} / ${(visit.thruDate?string)?default(uiLabelMap.PartyStillActive)}</td>
+          <td>${(visit.fromDate?string)!} / ${(visit.thruDate?string)?default(uiLabelMap.PartyStillActive)}</td>
         </tr>
       </table>
   </div>
@@ -123,22 +123,22 @@ under the License.
         <#assign alt_row = false>
         <#if serverHits?has_content>
         <#list serverHits[lowIndex..highIndex-1] as hit>
-          <#assign serverHitType = hit.getRelatedOne("ServerHitType", false)?if_exists>
+          <#assign serverHitType = hit.getRelatedOne("ServerHitType", false)!>
           <tr<#if alt_row> class="alternate-row"</#if>>
-            <td>${hit.contentId?if_exists}</td>
-            <td>${serverHitType.get("description",locale)?if_exists}</td>
+            <td>${hit.contentId!}</td>
+            <td>${serverHitType.get("description",locale)!}</td>
             <td>&nbsp;&nbsp;${hit.numOfBytes?default("?")}</td>
-            <td>${hit.hitStartDateTime?string?if_exists}</td>
-            <td>${hit.runningTimeMillis?if_exists}</td>
+            <td>${hit.hitStartDateTime?string!}</td>
+            <td>${hit.runningTimeMillis!}</td>
             <td>
-              <#assign url = (hit.requestUrl)?if_exists>
-              <#if url?exists>
+              <#assign url = (hit.requestUrl)!>
+              <#if url??>
                 <#assign len = url?length>
                 <#if 45 < len>
                   <#assign url = url[0..45] + "...">
                 </#if>
               </#if>
-              <a href="${hit.requestUrl?if_exists}" target="_blank">${url}</a>
+              <a href="${hit.requestUrl!}" target="_blank">${url}</a>
             </td>
           </tr>
           <#-- toggle the row color -->

Modified: ofbiz/trunk/applications/product/templates/shipment/FedexShipRequestTemplate.xml.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/templates/shipment/FedexShipRequestTemplate.xml.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/templates/shipment/FedexShipRequestTemplate.xml.ftl (original)
+++ ofbiz/trunk/applications/product/templates/shipment/FedexShipRequestTemplate.xml.ftl Sat Aug 16 11:34:57 2014
@@ -38,20 +38,20 @@
         <CurrencyCode>${CurrencyCode?xml}</CurrencyCode>
         <Origin>
             <Contact>
-                <#if OriginContactPersonName?exists>
+                <#if OriginContactPersonName??>
                     <PersonName>${OriginContactPersonName?xml}</PersonName>
-                <#elseif OriginContactCompanyName?exists>
+                <#elseif OriginContactCompanyName??>
                     <CompanyName>${OriginContactCompanyName?xml}</CompanyName>
                 </#if>
                 <PhoneNumber>${OriginContactPhoneNumber?xml}</PhoneNumber>
             </Contact>
             <Address>
                 <Line1>${OriginAddressLine1?xml}</Line1>
-                <#if OriginAddressLine2?exists>
+                <#if OriginAddressLine2??>
                     <Line2>${OriginAddressLine2?xml}</Line2>
                 </#if>
                 <City>${OriginAddressCity?xml}</City>
-                <#if OriginAddressStateOrProvinceCode?exists>
+                <#if OriginAddressStateOrProvinceCode??>
                     <StateOrProvinceCode>${OriginAddressStateOrProvinceCode?xml}</StateOrProvinceCode>
                 </#if>
                 <PostalCode>${OriginAddressPostalCode?xml}</PostalCode>
@@ -60,20 +60,20 @@
         </Origin>
         <Destination>
             <Contact>
-                <#if DestinationContactPersonName?exists>
+                <#if DestinationContactPersonName??>
                     <PersonName>${DestinationContactPersonName?xml}</PersonName>
-                <#elseif DestinationContactCompanyName?exists>
+                <#elseif DestinationContactCompanyName??>
                     <CompanyName>${DestinationContactCompanyName?xml}</CompanyName>
                 </#if>
                 <PhoneNumber>${DestinationContactPhoneNumber?xml}</PhoneNumber>
             </Contact>
             <Address>
                 <Line1>${DestinationAddressLine1?xml}</Line1>
-                <#if DestinationAddressLine2?exists>
+                <#if DestinationAddressLine2??>
                     <Line2>${DestinationAddressLine2?xml}</Line2>
                 </#if>
                 <City>${DestinationAddressCity?xml}</City>
-                <#if DestinationAddressStateOrProvinceCode?exists>
+                <#if DestinationAddressStateOrProvinceCode??>
                     <StateOrProvinceCode>${DestinationAddressStateOrProvinceCode?xml}</StateOrProvinceCode>
                 </#if>
                 <PostalCode>${DestinationAddressPostalCode?xml}</PostalCode>
@@ -86,24 +86,24 @@
         <ReferenceInfo>
             <CustomerReference>${CustomerReference?xml}</CustomerReference>
         </ReferenceInfo>
-        <#if DimensionsUnits?exists>
+        <#if DimensionsUnits??>
             <Dimensions>
-                <#if DimensionsLength?exists>
+                <#if DimensionsLength??>
                     <Length>${DimensionsLength?xml}</Length>
                 </#if>
-                <#if DimensionsWidth?exists>
+                <#if DimensionsWidth??>
                     <Width>${DimensionsWidth?xml}</Width>
                 </#if>
-                <#if DimensionsHeight?exists>
+                <#if DimensionsHeight??>
                     <Height>${DimensionsHeight?xml}</Height>
                 </#if>
                 <Units>${DimensionsUnits?xml}</Units>
             </Dimensions>
         </#if>
-        <#if HomeDeliveryType?exists>
+        <#if HomeDeliveryType??>
             <HomeDelivery>
                 <Type>${HomeDeliveryType?xml}</Type>
-                <#if HomeDeliveryDate?exists>
+                <#if HomeDeliveryDate??>
                     <Date>${HomeDeliveryDate?string("yyyy-MM-dd")}</Date>
                 </#if>
                 <PhoneNumber>${DestinationContactPhoneNumber?xml}</PhoneNumber>
@@ -113,7 +113,7 @@
             <Type>${LabelType?xml}</Type>
             <ImageType>${LabelImageType?xml}</ImageType>
         </Label>
-        <#if HomeDeliveryType?exists>
+        <#if HomeDeliveryType??>
             <SpecialServices>
                 <ResidentialDelivery>true</ResidentialDelivery>
             </SpecialServices>

Modified: ofbiz/trunk/applications/product/templates/shipment/FedexSubscriptionRequestTemplate.xml.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/templates/shipment/FedexSubscriptionRequestTemplate.xml.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/templates/shipment/FedexSubscriptionRequestTemplate.xml.ftl (original)
+++ ofbiz/trunk/applications/product/templates/shipment/FedexSubscriptionRequestTemplate.xml.ftl Sat Aug 16 11:34:57 2014
@@ -30,21 +30,21 @@
             <PersonName>${PersonName?xml}</PersonName>
             <CompanyName>${CompanyName?xml}</CompanyName>
             <PhoneNumber>${PhoneNumber?xml}</PhoneNumber>
-            <#if FaxNumber?exists>
+            <#if FaxNumber??>
                 <FaxNumber>${FaxNumber?xml}</FaxNumber>
             </#if>
-            <#if EMailAddress?exists>
+            <#if EMailAddress??>
                 <#-- Freemarker has a problem with the E-MailAddress tag name, so the opening and closing tags need to be wrapped in the noparse directive. -->
                 <#noparse><E-MailAddress></#noparse>${EMailAddress?xml}<#noparse></E-MailAddress></#noparse>
             </#if>
         </Contact>
         <Address>
             <Line1>${Line1?xml}</Line1>
-            <#if Line2?exists>
+            <#if Line2??>
                 <Line2>${Line2?xml}</Line2>
             </#if>
             <City>${City?xml}</City>
-            <#if StateOrProvinceCode?exists>
+            <#if StateOrProvinceCode??>
                 <StateOrProvinceCode>${StateOrProvinceCode?xml}</StateOrProvinceCode>
             </#if>
             <PostalCode>${PostalCode?xml}</PostalCode>

Modified: ofbiz/trunk/applications/product/webapp/catalog/category/CategoryTree.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/category/CategoryTree.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/category/CategoryTree.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/category/CategoryTree.ftl Sat Aug 16 11:34:57 2014
@@ -35,9 +35,9 @@ var rawdata = [
             <#if (rootCat?has_content)>
                 <#list rootCat as root>
                     {
-                    "data": {"title" : unescapeHtmlText("<#if root.categoryName?exists>${root.categoryName?js_string} [${root.productCategoryId}]<#else>${root.productCategoryId?js_string}</#if>"), "attr": {"href" : "<@o...@ofbizUrl>","onClick" : "callDocument('${root.productCategoryId}', 'catalog');"}},
+                    "data": {"title" : unescapeHtmlText("<#if root.categoryName??>${root.categoryName?js_string} [${root.productCategoryId}]<#else>${root.productCategoryId?js_string}</#if>"), "attr": {"href" : "<@o...@ofbizUrl>","onClick" : "callDocument('${root.productCategoryId}', 'catalog');"}},
                     "attr": {"id" : "${root.productCategoryId}", "rel" : "root", "isCatalog" : "${root.isCatalog?string}" ,"isCategoryType" : "${root.isCategoryType?string}"}
-                    <#if root.child?exists>
+                    <#if root.child??>
                     ,"state" : "closed"
                     </#if>
                     <#if root_has_next>
@@ -59,7 +59,7 @@ var rawdata = [
             $.cookie('jstree_open', null);
         <#else>
         <#-- Coloring the category when type the product categoryId manualy at the url bar -->
-            $.cookie('jstree_select', "<#if productCategoryId?exists>${productCategoryId}<#elseif prodCatalogId?exists>${prodCatalogId}<#elseif showProductCategoryId?exists>${showProductCategoryId}</#if>");
+            $.cookie('jstree_select', "<#if productCategoryId??>${productCategoryId}<#elseif prodCatalogId??>${prodCatalogId}<#elseif showProductCategoryId??>${showProductCategoryId}</#if>");
         </#if>
         jQuery("#tree").jstree({
         "plugins" : [ "themes", "json_data","ui" ,"cookies", "types"],

Modified: ofbiz/trunk/applications/product/webapp/catalog/category/EditCategory.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/category/EditCategory.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/category/EditCategory.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/category/EditCategory.ftl Sat Aug 16 11:34:57 2014
@@ -30,10 +30,10 @@ function insertImageName(type,nameValue)
             <#if !(clientFileName?has_content)>
                 <div>${uiLabelMap.ProductNoFileSpecifiedForUpload}.</div>
             <#else>
-                <div>${uiLabelMap.ProductTheFileOnYourComputer}: <b>${clientFileName?if_exists}</b></div>
-                <div>${uiLabelMap.ProductServerFileName}: <b>${fileNameToUse?if_exists}</b></div>
-                <div>${uiLabelMap.ProductServerDirectory}: <b>${imageServerPath?if_exists}</b></div>
-                <div>${uiLabelMap.ProductTheUrlOfYourUploadedFile}: <b><a href="<@o...@ofbizContentUrl>">${imageUrl?if_exists}</a></b></div>
+                <div>${uiLabelMap.ProductTheFileOnYourComputer}: <b>${clientFileName!}</b></div>
+                <div>${uiLabelMap.ProductServerFileName}: <b>${fileNameToUse!}</b></div>
+                <div>${uiLabelMap.ProductServerDirectory}: <b>${imageServerPath!}</b></div>
+                <div>${uiLabelMap.ProductTheUrlOfYourUploadedFile}: <b><a href="<@o...@ofbizContentUrl>">${imageUrl!}</a></b></div>
             </#if>
         </div>
     </div>
@@ -100,10 +100,10 @@ function insertImageName(type,nameValue)
                             <#list productCategoryTypes as productCategoryTypeData>
                                 <#if requestParameters.productCategoryTypeId?has_content>
                                     <#assign selectedKey = requestParameters.productCategoryTypeId>
-                                <#elseif (productCategory?has_content && productCategory.productCategoryTypeId?if_exists == productCategoryTypeData.productCategoryTypeId)>
+                                <#elseif (productCategory?has_content && productCategory.productCategoryTypeId! == productCategoryTypeData.productCategoryTypeId)>
                                     <#assign selectedKey = productCategory.productCategoryTypeId>
                                 </#if>
-                                <option <#if selectedKey == productCategoryTypeData.productCategoryTypeId?if_exists>selected="selected"</#if> value="${productCategoryTypeData.productCategoryTypeId}">${productCategoryTypeData.get("description",locale)}</option>
+                                <option <#if selectedKey == productCategoryTypeData.productCategoryTypeId!>selected="selected"</#if> value="${productCategoryTypeData.productCategoryTypeId}">${productCategoryTypeData.get("description",locale)}</option>
                             </#list>
                         </select>
                     </td>
@@ -111,18 +111,18 @@ function insertImageName(type,nameValue)
                 <tr>
                     <td width="26%" align="right" class="label">${uiLabelMap.ProductProductCategoryName}</td>
                     <td>&nbsp;</td>
-                    <td width="74%"><input type="text" value="${(productCategory.categoryName)?if_exists}" name="categoryName" size="60" maxlength="60"/></td>
+                    <td width="74%"><input type="text" value="${(productCategory.categoryName)!}" name="categoryName" size="60" maxlength="60"/></td>
                 </tr>
                 <tr>
                     <td width="26%" align="right" class="label">${uiLabelMap.ProductProductCategoryDescription}</td>
                     <td>&nbsp;</td>
-                    <td width="74%"><textarea name="description" cols="60" rows="2"><#if productCategory?has_content>${(productCategory.description)?if_exists}</#if></textarea></td>
+                    <td width="74%"><textarea name="description" cols="60" rows="2"><#if productCategory?has_content>${(productCategory.description)!}</#if></textarea></td>
                 </tr>
                 <tr>
                     <td width="20%" align="right" valign="top" class="label">
                         ${uiLabelMap.ProductCategoryImageUrl}
-                        <#if (productCategory.categoryImageUrl)?exists>
-                            <a href="<@o...@ofbizContentUrl>" target="_blank"><img alt="Category Image" src="<@o...@ofbizContentUrl>" class="cssImgSmall" /></a>
+                        <#if (productCategory.categoryImageUrl)??>
+                            <a href="<@o...@ofbizContentUrl>" target="_blank"><img alt="Category Image" src="<@o...@ofbizContentUrl>" class="cssImgSmall" /></a>
                         </#if>
                     </td>
                     <td>&nbsp;</td>
@@ -141,8 +141,8 @@ function insertImageName(type,nameValue)
                 <tr>
                     <td width="20%" align="right" valign="top" class="label">
                         ${uiLabelMap.ProductLinkOneImageUrl}
-                        <#if (productCategory.linkOneImageUrl)?exists>
-                            <a href="<@o...@ofbizContentUrl>" target="_blank"><img alt="Link One Image" src="<@o...@ofbizContentUrl>" class="cssImgSmall" /></a>
+                        <#if (productCategory.linkOneImageUrl)??>
+                            <a href="<@o...@ofbizContentUrl>" target="_blank"><img alt="Link One Image" src="<@o...@ofbizContentUrl>" class="cssImgSmall" /></a>
                         </#if>
                     </td>
                     <td>&nbsp;</td>
@@ -161,8 +161,8 @@ function insertImageName(type,nameValue)
                 <tr>
                     <td width="20%" align="right" valign="top" class="label">
                         ${uiLabelMap.ProductLinkTwoImageUrl}
-                        <#if (productCategory.linkTwoImageUrl)?exists>
-                            <a href="<@o...@ofbizContentUrl>" target="_blank"><img alt="Link One Image" src="<@o...@ofbizContentUrl>" class="cssImgSmall" /></a>
+                        <#if (productCategory.linkTwoImageUrl)??>
+                            <a href="<@o...@ofbizContentUrl>" target="_blank"><img alt="Link One Image" src="<@o...@ofbizContentUrl>" class="cssImgSmall" /></a>
                         </#if>
                     </td>
                     <td>&nbsp;</td>
@@ -182,7 +182,7 @@ function insertImageName(type,nameValue)
                     <td width="26%" align="right" class="label">${uiLabelMap.ProductDetailScreen}</td>
                     <td>&nbsp;</td>
                     <td width="74%">
-                        <input type="text" <#if productCategory?has_content>value="${productCategory.detailScreen?if_exists}"</#if> name="detailScreen" size="60" maxlength="250"/>
+                        <input type="text" <#if productCategory?has_content>value="${productCategory.detailScreen!}"</#if> name="detailScreen" size="60" maxlength="250"/>
                         <br /><span class="tooltip">${uiLabelMap.ProductDefaultsTo} &quot;categorydetail&quot;, ${uiLabelMap.ProductDetailScreenMessage}: &quot;component://ecommerce/widget/CatalogScreens.xml#categorydetail&quot;</span>
                     </td>
                 </tr>
@@ -213,7 +213,7 @@ function insertImageName(type,nameValue)
             <h3>${uiLabelMap.ProductCategoryUploadImage}</h3>
         </div>
         <div class="screenlet-body">
-            <form method="post" enctype="multipart/form-data" action="<@o...@ofbizUrl>" name="imageUploadForm">
+            <form method="post" enctype="multipart/form-data" action="<@o...@ofbizUrl>" name="imageUploadForm">
                 <table cellspacing="0" class="basic-table">
                     <tr><td>
                         <input type="file" size="50" name="fname"/>

Modified: ofbiz/trunk/applications/product/webapp/catalog/category/EditCategoryContent.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/category/EditCategoryContent.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/category/EditCategoryContent.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/category/EditCategoryContent.ftl Sat Aug 16 11:34:57 2014
@@ -24,7 +24,7 @@ under the License.
         <form action="<@o...@ofbizUrl>" method="post" style="margin: 0;" name="categoryForm">
             <table cellspacing="0" class="basic-table">
                 <tr>
-                    <td width="26%" align="right" class="label"><input type="hidden" name="productCategoryId" value="${productCategoryId?if_exists}" />${uiLabelMap.ProductProductCategoryType}</td>
+                    <td width="26%" align="right" class="label"><input type="hidden" name="productCategoryId" value="${productCategoryId!}" />${uiLabelMap.ProductProductCategoryType}</td>
                     <td>&nbsp;</td>
                     <td width="74%">
                         <select name="productCategoryTypeId" size="1">
@@ -38,27 +38,27 @@ under the License.
                 <tr>
                     <td width="26%" align="right" class="label">${uiLabelMap.ProductName}</td>
                     <td>&nbsp;</td>
-                    <td width="74%"><input type="text" value="${(productCategory.categoryName)?if_exists}" name="categoryName" size="60" maxlength="60"/></td>
+                    <td width="74%"><input type="text" value="${(productCategory.categoryName)!}" name="categoryName" size="60" maxlength="60"/></td>
                 </tr>
                 <tr>
                     <td width="26%" align="right" class="label">${uiLabelMap.ProductCategoryDescription}</td>
                     <td>&nbsp;</td>
                     <td width="74%" colspan="4" valign="top">
-                        <textarea name="description" cols="60" rows="2">${(productCategory.description)?if_exists}</textarea>
+                        <textarea name="description" cols="60" rows="2">${(productCategory.description)!}</textarea>
                     </td>
                 </tr>
                 <tr>
                     <td width="26%" align="right" valign="top" class="label">${uiLabelMap.ProductLongDescription}</td>
                     <td>&nbsp;</td>
                     <td width="74%" colspan="4" valign="top">
-                        <textarea name="longDescription" cols="60" rows="7">${(productCategory.longDescription)?if_exists}</textarea>
+                        <textarea name="longDescription" cols="60" rows="7">${(productCategory.longDescription)!}</textarea>
                     </td>
                 </tr>
                 <tr>
                     <td width="26%" align="right" class="label">${uiLabelMap.ProductDetailScreen}</td>
                     <td>&nbsp;</td>
                     <td width="74%">
-                        <input type="text" <#if productCategory?has_content>value="${productCategory.detailScreen?if_exists}"</#if> name="detailScreen" size="60" maxlength="250" />
+                        <input type="text" <#if productCategory?has_content>value="${productCategory.detailScreen!}"</#if> name="detailScreen" size="60" maxlength="250" />
                         <br />
                         <span class="tooltip">${uiLabelMap.ProductDefaultsTo} &quot;categorydetail&quot;, ${uiLabelMap.ProductDetailScreenMessage}: &quot;component://ecommerce/widget/CatalogScreens.xml#categorydetail&quot;</span>
                     </td>

Modified: ofbiz/trunk/applications/product/webapp/catalog/category/EditCategoryFeatureCats.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/category/EditCategoryFeatureCats.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/category/EditCategoryFeatureCats.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/category/EditCategoryFeatureCats.ftl Sat Aug 16 11:34:57 2014
@@ -17,11 +17,11 @@ specific language governing permissions 
 under the License.
 -->
 <form method="post" action="<@o...@ofbizUrl>" name="attachProductFeaturesToCategory">
-    <input type="hidden" name="productCategoryId" value="${productCategoryId?if_exists}" />
+    <input type="hidden" name="productCategoryId" value="${productCategoryId!}" />
 </form>
 <a href="javascript:document.attachProductFeaturesToCategory.submit()" class="buttontext">${uiLabelMap.ProductFeatureCategoryAttach}</a>
 
-<#if productCategoryId?exists && productCategory?exists>
+<#if productCategoryId?? && productCategory??>
   <div class="screenlet">
     <div class="screenlet-title-bar">
       <h3>${uiLabelMap.PageTitleEditCategoryFeatureCategories}</h3>
@@ -41,28 +41,28 @@ under the License.
                 <#assign line = line + 1>
                 <#assign productFeatureGroup = (productFeatureCatGrpAppl.getRelatedOne("ProductFeatureGroup", false))?default(null)>
                 <tr valign="middle"<#if rowClass == "1"> class="alternate-row"</#if>>
-                    <td><a href="<@o...@ofbizUrl>" class="buttontext"><#if productFeatureGroup?exists>${(productFeatureGroup.description)?if_exists}</#if> [${(productFeatureCatGrpAppl.productFeatureGroupId)?if_exists}]</a></td>
+                    <td><a href="<@o...@ofbizUrl>" class="buttontext"><#if productFeatureGroup??>${(productFeatureGroup.description)!}</#if> [${(productFeatureCatGrpAppl.productFeatureGroupId)!}]</a></td>
                     <#assign hasntStarted = false>
-                    <#if (productFeatureCatGrpAppl.getTimestamp("fromDate"))?exists && nowTimestamp.before(productFeatureCatGrpAppl.getTimestamp("fromDate"))> <#assign hasntStarted = true></#if>
-                    <td><div<#if hasntStarted> style="color: red;</#if>>${(productFeatureCatGrpAppl.fromDate)?if_exists}</div></td>
+                    <#if (productFeatureCatGrpAppl.getTimestamp("fromDate"))?? && nowTimestamp.before(productFeatureCatGrpAppl.getTimestamp("fromDate"))> <#assign hasntStarted = true></#if>
+                    <td><div<#if hasntStarted> style="color: red;</#if>>${(productFeatureCatGrpAppl.fromDate)!}</div></td>
                     <td align="center">
                         <form method="post" action="<@o...@ofbizUrl>" name="lineFormGrp${line}">
                             <#assign hasExpired = false>
-                            <#if (productFeatureCatGrpAppl.getTimestamp("thruDate"))?exists && nowTimestamp.after(productFeatureCatGrpAppl.getTimestamp("thruDate"))> <#assign hasExpired = true></#if>
-                            <input type="hidden" name="productCategoryId" value="${(productFeatureCatGrpAppl.productCategoryId)?if_exists}" />
-                            <input type="hidden" name="productFeatureGroupId" value="${(productFeatureCatGrpAppl.productFeatureGroupId)?if_exists}" />
-                            <input type="hidden" name="fromDate" value="${(productFeatureCatGrpAppl.fromDate)?if_exists}" />
+                            <#if (productFeatureCatGrpAppl.getTimestamp("thruDate"))?? && nowTimestamp.after(productFeatureCatGrpAppl.getTimestamp("thruDate"))> <#assign hasExpired = true></#if>
+                            <input type="hidden" name="productCategoryId" value="${(productFeatureCatGrpAppl.productCategoryId)!}" />
+                            <input type="hidden" name="productFeatureGroupId" value="${(productFeatureCatGrpAppl.productFeatureGroupId)!}" />
+                            <input type="hidden" name="fromDate" value="${(productFeatureCatGrpAppl.fromDate)!}" />
                             <#if hasExpired><#assign class="alert"></#if>
-                            <@htmlTemplate.renderDateTimeField name="thruDate" event="" action="" value="${(productFeatureCatGrpAppl.thruDate)?if_exists}" className="${class!''}" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" size="22" maxlength="25" id="fromDate1" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/>
+                            <@htmlTemplate.renderDateTimeField name="thruDate" event="" action="" value="${(productFeatureCatGrpAppl.thruDate)!}" className="${class!''}" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" size="22" maxlength="25" id="fromDate1" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/>
                             <input type="submit" value="${uiLabelMap.CommonUpdate}" style="font-size: x-small;" />
                         </form>
                     </td>
                     <td align="center">
                         <a href="javascript:document.removeProductFeatureCatGrpApplForm_${productFeatureCatGrpAppl_index}.submit()" class="buttontext">${uiLabelMap.CommonDelete}</a>
                         <form method="post" action="<@o...@ofbizUrl>" name="removeProductFeatureCatGrpApplForm_${productFeatureCatGrpAppl_index}">
-                            <input type="hidden" name="productFeatureGroupId" value="${(productFeatureCatGrpAppl.productFeatureGroupId)?if_exists}" />
-                            <input type="hidden" name="productCategoryId" value="${(productFeatureCatGrpAppl.productCategoryId)?if_exists}" />
-                            <input type="hidden" name="fromDate" value="${(productFeatureCatGrpAppl.fromDate)?if_exists}" />
+                            <input type="hidden" name="productFeatureGroupId" value="${(productFeatureCatGrpAppl.productFeatureGroupId)!}" />
+                            <input type="hidden" name="productCategoryId" value="${(productFeatureCatGrpAppl.productCategoryId)!}" />
+                            <input type="hidden" name="fromDate" value="${(productFeatureCatGrpAppl.fromDate)!}" />
                         </form>
                     </td>
                 </tr>
@@ -85,10 +85,10 @@ under the License.
             <table cellspacing="0" class="basic-table">
                 <tr><td>
                     <form method="post" action="<@o...@ofbizUrl>" style="margin: 0;" name="addNewGroupForm">
-                    <input type="hidden" name="productCategoryId" value="${productCategoryId?if_exists}" />
+                    <input type="hidden" name="productCategoryId" value="${productCategoryId!}" />
                     <select name="productFeatureGroupId">
                     <#list productFeatureGroups as productFeatureGroup>
-                        <option value="${(productFeatureGroup.productFeatureGroupId)?if_exists}">${(productFeatureGroup.description)?if_exists} [${(productFeatureGroup.productFeatureGroupId)?if_exists}]</option>
+                        <option value="${(productFeatureGroup.productFeatureGroupId)!}">${(productFeatureGroup.description)!} [${(productFeatureGroup.productFeatureGroupId)!}]</option>
                     </#list>
                     </select>
                     <@htmlTemplate.renderDateTimeField name="fromDate" event="" action="" value="" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" size="25" maxlength="30" id="fromDate2" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/>
@@ -120,28 +120,28 @@ under the License.
                 <#assign line = line + 1>
                 <#assign productFeatureCategory = (productFeatureCategoryAppl.getRelatedOne("ProductFeatureCategory", false))?default(null)>
                 <tr valign="middle"<#if rowClass == "1"> class="alternate-row"</#if>>
-                    <td><a href="<@o...@ofbizUrl>" class="buttontext"><#if productFeatureCategory?exists>${(productFeatureCategory.description)?if_exists}</#if> [${(productFeatureCategoryAppl.productFeatureCategoryId)?if_exists}]</a></td>
+                    <td><a href="<@o...@ofbizUrl>" class="buttontext"><#if productFeatureCategory??>${(productFeatureCategory.description)!}</#if> [${(productFeatureCategoryAppl.productFeatureCategoryId)!}]</a></td>
                     <#assign hasntStarted = false>
-                    <#if (productFeatureCategoryAppl.getTimestamp("fromDate"))?exists && nowTimestamp.before(productFeatureCategoryAppl.getTimestamp("fromDate"))> <#assign hasntStarted = true></#if>
-                    <td <#if hasntStarted> style="color: red;"</#if>>${(productFeatureCategoryAppl.fromDate)?if_exists}</td>
+                    <#if (productFeatureCategoryAppl.getTimestamp("fromDate"))?? && nowTimestamp.before(productFeatureCategoryAppl.getTimestamp("fromDate"))> <#assign hasntStarted = true></#if>
+                    <td <#if hasntStarted> style="color: red;"</#if>>${(productFeatureCategoryAppl.fromDate)!}</td>
                     <td align="center">
                         <form method="post" action="<@o...@ofbizUrl>" name="lineForm${line}">
                             <#assign hasExpired = false>
-                            <#if (productFeatureCategoryAppl.getTimestamp("thruDate"))?exists && nowTimestamp.after(productFeatureCategoryAppl.getTimestamp("thruDate"))> <#assign hasExpired = true></#if>
-                            <input type="hidden" name="productCategoryId" value="${(productFeatureCategoryAppl.productCategoryId)?if_exists}" />
-                            <input type="hidden" name="productFeatureCategoryId" value="${(productFeatureCategoryAppl.productFeatureCategoryId)?if_exists}" />
-                            <input type="hidden" name="fromDate" value="${(productFeatureCategoryAppl.fromDate)?if_exists}" />
+                            <#if (productFeatureCategoryAppl.getTimestamp("thruDate"))?? && nowTimestamp.after(productFeatureCategoryAppl.getTimestamp("thruDate"))> <#assign hasExpired = true></#if>
+                            <input type="hidden" name="productCategoryId" value="${(productFeatureCategoryAppl.productCategoryId)!}" />
+                            <input type="hidden" name="productFeatureCategoryId" value="${(productFeatureCategoryAppl.productFeatureCategoryId)!}" />
+                            <input type="hidden" name="fromDate" value="${(productFeatureCategoryAppl.fromDate)!}" />
                             <#if hasExpired><#assign class="alert"></#if>
-                            <@htmlTemplate.renderDateTimeField name="thruDate" event="" action="" value="${(productFeatureCategoryAppl.thruDate)?if_exists}" className="${class!''}" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" size="25" maxlength="30" id="thruDate2" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/>
+                            <@htmlTemplate.renderDateTimeField name="thruDate" event="" action="" value="${(productFeatureCategoryAppl.thruDate)!}" className="${class!''}" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" size="25" maxlength="30" id="thruDate2" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/>
                             <input type="submit" value="${uiLabelMap.CommonUpdate}" style="font-size: x-small;" />
                         </form>
                     </td>
                     <td align="center">
                     <a href="javascript:document.removeProductFeatureCategoryApplForm_${productFeatureCategoryAppl_index}.submit()" class="buttontext">${uiLabelMap.CommonDelete}</a>
                     <form method="post" action="<@o...@ofbizUrl>" name="removeProductFeatureCategoryApplForm_${productFeatureCategoryAppl_index}">
-                        <input type="hidden" name="productFeatureCategoryId" value="${(productFeatureCategoryAppl.productFeatureCategoryId)?if_exists}" />
-                        <input type="hidden" name="productCategoryId" value="${(productFeatureCategoryAppl.productCategoryId)?if_exists}" />
-                        <input type="hidden" name="fromDate" value="${(productFeatureCategoryAppl.fromDate)?if_exists}" />
+                        <input type="hidden" name="productFeatureCategoryId" value="${(productFeatureCategoryAppl.productFeatureCategoryId)!}" />
+                        <input type="hidden" name="productCategoryId" value="${(productFeatureCategoryAppl.productCategoryId)!}" />
+                        <input type="hidden" name="fromDate" value="${(productFeatureCategoryAppl.fromDate)!}" />
                     </form>
                     </td>
                 </tr>
@@ -163,10 +163,10 @@ under the License.
             <table cellspacing="0" class="basic-table">
                 <tr><td>
                     <form method="post" action="<@o...@ofbizUrl>" style="margin: 0;" name="addNewCategoryForm">
-                        <input type="hidden" name="productCategoryId" value="${productCategoryId?if_exists}" />
+                        <input type="hidden" name="productCategoryId" value="${productCategoryId!}" />
                         <select name="productFeatureCategoryId">
                         <#list productFeatureCategories as productFeatureCategory>
-                            <option value="${(productFeatureCategory.productFeatureCategoryId)?if_exists}">${(productFeatureCategory.description)?if_exists} [${(productFeatureCategory.productFeatureCategoryId)?if_exists}]</option>
+                            <option value="${(productFeatureCategory.productFeatureCategoryId)!}">${(productFeatureCategory.description)!} [${(productFeatureCategory.productFeatureCategoryId)!}]</option>
                         </#list>
                         </select>
                         <@htmlTemplate.renderDateTimeField name="fromDate" event="" action="" value="" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" size="25" maxlength="30" id="fromDate2" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/>

Modified: ofbiz/trunk/applications/product/webapp/catalog/category/EditCategoryParties.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/category/EditCategoryParties.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/category/EditCategoryParties.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/category/EditCategoryParties.ftl Sat Aug 16 11:34:57 2014
@@ -17,7 +17,7 @@ specific language governing permissions 
 under the License.
 -->
 
-<#if productCategoryId?exists && productCategory?exists>
+<#if productCategoryId?? && productCategory??>
     <div class="screenlet">
         <div class="screenlet-title-bar">
             <h3>${uiLabelMap.PageTitleEditCategoryParties}</h3>
@@ -37,31 +37,31 @@ under the License.
             <#assign line = line + 1>
             <#assign curRoleType = productCategoryRole.getRelatedOne("RoleType", true)>
             <tr valign="middle"<#if rowClass == "1"> class="alternate-row"</#if>>
-            <td><a href="/partymgr/control/viewprofile?party_id=${(productCategoryRole.partyId)?if_exists}" target="_blank" class="buttontext">${(productCategoryRole.partyId)?if_exists}</a></td>
-            <td>${(curRoleType.get("description",locale))?if_exists}</td>
+            <td><a href="/partymgr/control/viewprofile?party_id=${(productCategoryRole.partyId)!}" target="_blank" class="buttontext">${(productCategoryRole.partyId)!}</a></td>
+            <td>${(curRoleType.get("description",locale))!}</td>
             <#assign hasntStarted = false>
-            <#if (productCategoryRole.getTimestamp("fromDate"))?exists && Static["org.ofbiz.base.util.UtilDateTime"].nowTimestamp().before(productCategoryRole.getTimestamp("fromDate"))> <#assign hasntStarted = true></#if>
-            <td <#if hasntStarted> style="color: red;"</#if>>${(productCategoryRole.fromDate)?if_exists}</td>
+            <#if (productCategoryRole.getTimestamp("fromDate"))?? && Static["org.ofbiz.base.util.UtilDateTime"].nowTimestamp().before(productCategoryRole.getTimestamp("fromDate"))> <#assign hasntStarted = true></#if>
+            <td <#if hasntStarted> style="color: red;"</#if>>${(productCategoryRole.fromDate)!}</td>
             <td align="center">
                 <form method="post" action="<@o...@ofbizUrl>" name="lineForm_update${line}">
                     <#assign hasExpired = false>
-                    <#if (productCategoryRole.getTimestamp("thruDate"))?exists && (Static["org.ofbiz.base.util.UtilDateTime"].nowTimestamp().after(productCategoryRole.getTimestamp("thruDate")))> <#assign hasExpired = true></#if>
-                    <input type="hidden" name="productCategoryId" value="${(productCategoryRole.productCategoryId)?if_exists}" />
-                    <input type="hidden" name="partyId" value="${(productCategoryRole.partyId)?if_exists}" />
-                    <input type="hidden" name="roleTypeId" value="${(productCategoryRole.roleTypeId)?if_exists}" />
-                    <input type="hidden" name="fromDate" value="${(productCategoryRole.getTimestamp("fromDate"))?if_exists}" />
+                    <#if (productCategoryRole.getTimestamp("thruDate"))?? && (Static["org.ofbiz.base.util.UtilDateTime"].nowTimestamp().after(productCategoryRole.getTimestamp("thruDate")))> <#assign hasExpired = true></#if>
+                    <input type="hidden" name="productCategoryId" value="${(productCategoryRole.productCategoryId)!}" />
+                    <input type="hidden" name="partyId" value="${(productCategoryRole.partyId)!}" />
+                    <input type="hidden" name="roleTypeId" value="${(productCategoryRole.roleTypeId)!}" />
+                    <input type="hidden" name="fromDate" value="${(productCategoryRole.getTimestamp("fromDate"))!}" />
                     <#if hasExpired><#assign class="alert"></#if>
-                    <@htmlTemplate.renderDateTimeField name="thruDate" event="" action="" className="${class!''}" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" value="${(productCategoryRole. getTimestamp('thruDate'))?if_exists}" size="25" maxlength="30" id="thruDate_1" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/>
+                    <@htmlTemplate.renderDateTimeField name="thruDate" event="" action="" className="${class!''}" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" value="${(productCategoryRole. getTimestamp('thruDate'))!}" size="25" maxlength="30" id="thruDate_1" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/>
                     <input type="submit" value="${uiLabelMap.CommonUpdate}" style="font-size: x-small;" />
                 </form>
             </td>
             <td align="center">
                 <form method="post" action="<@o...@ofbizUrl>" name="lineForm_delete${line}">
                     <#assign hasExpired = false>
-                    <input type="hidden" name="productCategoryId" value="${(productCategoryRole.productCategoryId)?if_exists}" />
-                    <input type="hidden" name="partyId" value="${(productCategoryRole.partyId)?if_exists}" />
-                    <input type="hidden" name="roleTypeId" value="${(productCategoryRole.roleTypeId)?if_exists}" />
-                    <input type="hidden" name="fromDate" value="${(productCategoryRole.getTimestamp("fromDate"))?if_exists}" />
+                    <input type="hidden" name="productCategoryId" value="${(productCategoryRole.productCategoryId)!}" />
+                    <input type="hidden" name="partyId" value="${(productCategoryRole.partyId)!}" />
+                    <input type="hidden" name="roleTypeId" value="${(productCategoryRole.roleTypeId)!}" />
+                    <input type="hidden" name="fromDate" value="${(productCategoryRole.getTimestamp("fromDate"))!}" />
                     <a href="javascript:document.lineForm_delete${line}.submit()" class="buttontext">${uiLabelMap.CommonDelete}</a>
                 </form>
             </td>
@@ -89,7 +89,7 @@ under the License.
                             <input type="text" size="20" maxlength="20" name="partyId" value="" />
                             <select name="roleTypeId" size="1">
                             <#list roleTypes as roleType>
-                                <option value="${(roleType.roleTypeId)?if_exists}" <#if roleType.roleTypeId.equals("_NA_")> selected="selected"</#if>>${(roleType.get("description",locale))?if_exists}</option>
+                                <option value="${(roleType.roleTypeId)!}" <#if roleType.roleTypeId.equals("_NA_")> selected="selected"</#if>>${(roleType.get("description",locale))!}</option>
                             </#list>
                             </select>
 

Modified: ofbiz/trunk/applications/product/webapp/catalog/category/EditCategoryProdCatalogs.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/category/EditCategoryProdCatalogs.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/category/EditCategoryProdCatalogs.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/category/EditCategoryProdCatalogs.ftl Sat Aug 16 11:34:57 2014
@@ -17,7 +17,7 @@ specific language governing permissions 
 under the License.
 -->
 
-<#if productCategoryId?exists && productCategory?exists>
+<#if productCategoryId?? && productCategory??>
   <div class="screenlet">
     <div class="screenlet-title-bar">
       <h3>${uiLabelMap.PageTitleEditCategoryProductCatalogs}</h3>
@@ -38,34 +38,34 @@ under the License.
             <#assign prodCatalog = prodCatalogCategory.getRelatedOne("ProdCatalog", false)>
             <#assign curProdCatalogCategoryType = prodCatalogCategory.getRelatedOne("ProdCatalogCategoryType", true)>
             <tr valign="middle"<#if rowClass == "1"> class="alternate-row"</#if>>
-                <td><a href="<@o...@ofbizUrl>" class="buttontext"><#if prodCatalog?exists>${(prodCatalog.catalogName)?if_exists}</#if> [${(prodCatalogCategory.prodCatalogId)?if_exists}]</a></td>
+                <td><a href="<@o...@ofbizUrl>" class="buttontext"><#if prodCatalog??>${(prodCatalog.catalogName)!}</#if> [${(prodCatalogCategory.prodCatalogId)!}]</a></td>
                 <td>
                     ${(curProdCatalogCategoryType.get("description",locale))?default(prodCatalogCategory.prodCatalogCategoryTypeId)}
                 </td>
                 <#assign hasntStarted = false>
-                <#if (prodCatalogCategory.getTimestamp("fromDate"))?exists && nowTimestamp.before(prodCatalogCategory.getTimestamp("fromDate"))> <#assign hasntStarted = true></#if>
-                <td <#if hasntStarted> style="color: red;"</#if>>${(prodCatalogCategory.fromDate)?if_exists}</td>
+                <#if (prodCatalogCategory.getTimestamp("fromDate"))?? && nowTimestamp.before(prodCatalogCategory.getTimestamp("fromDate"))> <#assign hasntStarted = true></#if>
+                <td <#if hasntStarted> style="color: red;"</#if>>${(prodCatalogCategory.fromDate)!}</td>
                 <td align="center">
                     <form method="post" action="<@o...@ofbizUrl>" name="lineForm_update${line}">
                         <#assign hasExpired = false>
-                        <#if (prodCatalogCategory.getTimestamp("thruDate"))?exists && nowTimestamp.after(prodCatalogCategory.getTimestamp("thruDate"))> <#assign hasExpired = true></#if>
-                        <input type="hidden" name="prodCatalogId" value="${(prodCatalogCategory.prodCatalogId)?if_exists}"/>
-                        <input type="hidden" name="productCategoryId" value="${(prodCatalogCategory.productCategoryId)?if_exists}"/>
+                        <#if (prodCatalogCategory.getTimestamp("thruDate"))?? && nowTimestamp.after(prodCatalogCategory.getTimestamp("thruDate"))> <#assign hasExpired = true></#if>
+                        <input type="hidden" name="prodCatalogId" value="${(prodCatalogCategory.prodCatalogId)!}"/>
+                        <input type="hidden" name="productCategoryId" value="${(prodCatalogCategory.productCategoryId)!}"/>
                         <input type="hidden" name="prodCatalogCategoryTypeId" value="${prodCatalogCategory.prodCatalogCategoryTypeId}"/>
-                        <input type="hidden" name="fromDate" value="${(prodCatalogCategory.fromDate)?if_exists}"/>
+                        <input type="hidden" name="fromDate" value="${(prodCatalogCategory.fromDate)!}"/>
                         <#if hasExpired><#assign class="alert"></#if>
-                        <@htmlTemplate.renderDateTimeField name="thruDate" event="" action="" className="${class!''}" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" value="${(prodCatalogCategory.thruDate)?if_exists}" size="25" maxlength="30" id="thruDate_1" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/>
-                        <input type="text" size="5" name="sequenceNum" value="${(prodCatalogCategory.sequenceNum)?if_exists}"/>
+                        <@htmlTemplate.renderDateTimeField name="thruDate" event="" action="" className="${class!''}" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" value="${(prodCatalogCategory.thruDate)!}" size="25" maxlength="30" id="thruDate_1" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/>
+                        <input type="text" size="5" name="sequenceNum" value="${(prodCatalogCategory.sequenceNum)!}"/>
                         <#-- the prodCatalogCategoryTypeId field is now part of the PK, so it can't be changed, must be re-created
                         <select name="prodCatalogCategoryTypeId" size="1">
-                            <#if (prodCatalogCategory.prodCatalogCategoryTypeId)?exists>
-                                <option value="${prodCatalogCategory.prodCatalogCategoryTypeId}"><#if curProdCatalogCategoryType?exists>${(curProdCatalogCategoryType.description)?if_exists}<#else> [${(prodCatalogCategory.prodCatalogCategoryTypeId)}]</#if></option>
+                            <#if (prodCatalogCategory.prodCatalogCategoryTypeId)??>
+                                <option value="${prodCatalogCategory.prodCatalogCategoryTypeId}"><#if curProdCatalogCategoryType??>${(curProdCatalogCategoryType.description)!}<#else> [${(prodCatalogCategory.prodCatalogCategoryTypeId)}]</#if></option>
                                 <option value="${prodCatalogCategory.prodCatalogCategoryTypeId}"></option>
                             <#else>
                                 <option value="">&nbsp;</option>
                             </#if>
                             <#list prodCatalogCategoryTypes as prodCatalogCategoryType>
-                            <option value="${(prodCatalogCategoryType.prodCatalogCategoryTypeId)?if_exists}">${(prodCatalogCategoryType.get("description",locale))?if_exists}</option>
+                            <option value="${(prodCatalogCategoryType.prodCatalogCategoryTypeId)!}">${(prodCatalogCategoryType.get("description",locale))!}</option>
                             </#list>
                         </select> -->
                         <input type="submit" value="${uiLabelMap.CommonUpdate}"/>
@@ -73,10 +73,10 @@ under the License.
                 </td>
                 <td align="center">
                   <form method="post" action="<@o...@ofbizUrl>" name="lineForm_delete${line}">
-                    <input type="hidden" name="prodCatalogId" value="${(prodCatalogCategory.prodCatalogId)?if_exists}"/>
-                    <input type="hidden" name="productCategoryId" value="${(prodCatalogCategory.productCategoryId)?if_exists}"/>
+                    <input type="hidden" name="prodCatalogId" value="${(prodCatalogCategory.prodCatalogId)!}"/>
+                    <input type="hidden" name="productCategoryId" value="${(prodCatalogCategory.productCategoryId)!}"/>
                     <input type="hidden" name="prodCatalogCategoryTypeId" value="${prodCatalogCategory.prodCatalogCategoryTypeId}"/>
-                    <input type="hidden" name="fromDate" value="${(prodCatalogCategory.fromDate)?if_exists}"/>
+                    <input type="hidden" name="fromDate" value="${(prodCatalogCategory.fromDate)!}"/>
                     <a href="javascript:document.lineForm_delete${line}.submit()" class="buttontext">${uiLabelMap.CommonDelete}</a>
                   </form>
                 </td>
@@ -100,15 +100,15 @@ under the License.
             <table cellspacing="0" class="basic-table">
                 <tr><td>
                     <form method="post" action="<@o...@ofbizUrl>" style="margin: 0;" name="addNewForm">
-                        <input type="hidden" name="productCategoryId" value="${productCategoryId?if_exists}"/>
+                        <input type="hidden" name="productCategoryId" value="${productCategoryId!}"/>
                         <select name="prodCatalogId">
                         <#list prodCatalogs as prodCatalog>
-                            <option value="${(prodCatalog.prodCatalogId)?if_exists}">${(prodCatalog.catalogName)?if_exists} [${(prodCatalog.prodCatalogId)?if_exists}]</option>
+                            <option value="${(prodCatalog.prodCatalogId)!}">${(prodCatalog.catalogName)!} [${(prodCatalog.prodCatalogId)!}]</option>
                         </#list>
                         </select>
                         <select name="prodCatalogCategoryTypeId" size="1">
                         <#list prodCatalogCategoryTypes as prodCatalogCategoryType>
-                            <option value="${(prodCatalogCategoryType.prodCatalogCategoryTypeId)?if_exists}">${(prodCatalogCategoryType.get("description",locale))?if_exists}</option>
+                            <option value="${(prodCatalogCategoryType.prodCatalogCategoryTypeId)!}">${(prodCatalogCategoryType.get("description",locale))!}</option>
                         </#list>
                         </select>
                         <@htmlTemplate.renderDateTimeField name="fromDate" event="" action="" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" value="" size="25" maxlength="30" id="fromDate_1" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/>