OFBiz › OFBiz - Commits

svn commit: r1618325 [2/2] - in /ofbiz/trunk/framework: bi/webapp/bi/reportbuilder/ common/webcommon/ common/webcommon/includes/ common/webcommon/includes/fo/ common/webcommon/portal/ webapp/config/ webtools/webapp/webtools/ webtools/webapp/webtools/ar...

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

svn commit: r1618325 [2/2] - in /ofbiz/trunk/framework: bi/webapp/bi/reportbuilder/ common/webcommon/ common/webcommon/includes/ common/webcommon/includes/fo/ common/webcommon/portal/ webapp/config/ webtools/webapp/webtools/ webtools/webapp/webtools/ar...

ashish-18
Modified: ofbiz/trunk/framework/webtools/webapp/webtools/labelmanager/ViewHardcodedLabels.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/labelmanager/ViewHardcodedLabels.ftl?rev=1618325&r1=1618324&r2=1618325&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/webapp/webtools/labelmanager/ViewHardcodedLabels.ftl (original)
+++ ofbiz/trunk/framework/webtools/webapp/webtools/labelmanager/ViewHardcodedLabels.ftl Sat Aug 16 10:58:51 2014
@@ -17,7 +17,7 @@ specific language governing permissions
 under the License.
 -->
 <div class="screenlet-body">
-  <#if parameters.searchLabels?exists>
+  <#if parameters.searchLabels??>
   <table class="basic-table hover-bar" cellspacing="3">
     <tr class="header-row">
       <td>${uiLabelMap.WebtoolsLabelManagerRow}</td>

Modified: ofbiz/trunk/framework/webtools/webapp/webtools/labelmanager/ViewLabels.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/labelmanager/ViewLabels.ftl?rev=1618325&r1=1618324&r2=1618325&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/webapp/webtools/labelmanager/ViewLabels.ftl (original)
+++ ofbiz/trunk/framework/webtools/webapp/webtools/labelmanager/ViewLabels.ftl Sat Aug 16 10:58:51 2014
@@ -25,12 +25,12 @@ under the License.
       <td>${uiLabelMap.WebtoolsLabelManagerReferences}</td>
       <#list localesFound as localeFound>
         <#assign showLocale = true>
-        <#if parameters.labelLocaleName?exists && parameters.labelLocaleName != "" && parameters.labelLocaleName != localeFound>
+        <#if parameters.labelLocaleName?? && parameters.labelLocaleName != "" && parameters.labelLocaleName != localeFound>
           <#assign showLocale = false>
         </#if>
         <#if showLocale == true>
-          <#assign locale = Static["org.ofbiz.base.util.UtilMisc"].parseLocale(localeFound)?if_exists/>
-          <#if locale?exists && locale?has_content>
+          <#assign locale = Static["org.ofbiz.base.util.UtilMisc"].parseLocale(localeFound)!/>
+          <#if locale?? && locale?has_content>
             <#assign langAttr = localeFound.toString()?replace("_", "-")>
             <#assign langDir = "ltr">
             <#if "ar.iw"?contains(langAttr?substring(0, 2))>
@@ -45,7 +45,7 @@ under the License.
         </#if>
       </#list>
     </tr>
-    <#if parameters.searchLabels?exists>
+    <#if parameters.searchLabels??>
       <#assign rowNum = "2">
       <#assign rowNumber = 1>
       <#assign totalLabels = 0>
@@ -56,43 +56,43 @@ under the License.
         <#assign label = labels.get(labelList)>
         <#assign labelKey = label.labelKey>
         <#assign totalLabels = totalLabels + 1>
-        <#if references?exists>
+        <#if references??>
           <#assign referenceNum = 0>
-          <#assign reference = references.get(labelKey)?if_exists>
-          <#if reference?exists && reference?has_content>
+          <#assign reference = references.get(labelKey)!>
+          <#if reference?? && reference?has_content>
             <#assign referenceNum = reference.size()>
           </#if>
         </#if>
         <#assign showLabel = true>
-        <#if parameters.onlyMissingTranslations?exists && parameters.onlyMissingTranslations == "Y"
-            && parameters.labelLocaleName?exists && parameters.labelLocaleName != "">
-          <#assign labelValue = label.getLabelValue(parameters.labelLocaleName)?if_exists>
-          <#if labelValue?exists && labelValue?has_content>
-            <#assign value = labelValue.getLabelValue()?if_exists>
-            <#if value?exists && value?has_content>
+        <#if parameters.onlyMissingTranslations?? && parameters.onlyMissingTranslations == "Y"
+            && parameters.labelLocaleName?? && parameters.labelLocaleName != "">
+          <#assign labelValue = label.getLabelValue(parameters.labelLocaleName)!>
+          <#if labelValue?? && labelValue?has_content>
+            <#assign value = labelValue.getLabelValue()!>
+            <#if value?? && value?has_content>
               <#assign showLabel = false>
             </#if>
           </#if>
         </#if>
-        <#if showLabel && parameters.onlyNotUsedLabels?exists && parameters.onlyNotUsedLabels == "Y" && (referenceNum > 0)>
+        <#if showLabel && parameters.onlyNotUsedLabels?? && parameters.onlyNotUsedLabels == "Y" && (referenceNum > 0)>
             <#assign showLabel = false>
         </#if>
-        <#if showLabel && parameters.labelKey?exists && parameters.labelKey != "" && parameters.labelKey != label.labelKey>
+        <#if showLabel && parameters.labelKey?? && parameters.labelKey != "" && parameters.labelKey != label.labelKey>
           <#assign showLabel = false>
         </#if>
-        <#if showLabel && parameters.labelFileName?exists && parameters.labelFileName != "" && parameters.labelFileName != label.fileName>
+        <#if showLabel && parameters.labelFileName?? && parameters.labelFileName != "" && parameters.labelFileName != label.fileName>
           <#assign showLabel = false>
         </#if>
         <#if showLabel == true>
           <tr <#if rowNum == "1">class="alternate-row"</#if>>
             <td>${rowNumber}</td>
-            <td><a href="<@ofbizUrl>UpdateLabel?sourceKey=${labelKey}&amp;sourceFileName=${label.fileName}&amp;sourceKeyComment=${label.labelKeyComment?if_exists}</@ofbizUrl>" <#if previousKey == labelKey>class="submenutext"</#if>>${label.labelKey}</a></td>
+            <td><a href="<@ofbizUrl>UpdateLabel?sourceKey=${labelKey}&amp;sourceFileName=${label.fileName}&amp;sourceKeyComment=${label.labelKeyComment!}</@ofbizUrl>" <#if previousKey == labelKey>class="submenutext"</#if>>${label.labelKey}</a></td>
             <td>${label.fileName}</td>
             <td><a href="<@ofbizUrl>ViewReferences?sourceKey=${labelKey}&amp;labelFileName=${label.fileName}</@ofbizUrl>">${uiLabelMap.WebtoolsLabelManagerReferences}</a></td>
             <#list localesFound as localeFound>
-              <#assign labelVal = label.getLabelValue(localeFound)?if_exists>
+              <#assign labelVal = label.getLabelValue(localeFound)!>
               <#assign showLocale = true>
-              <#if parameters.labelLocaleName?exists && parameters.labelLocaleName != "" && parameters.labelLocaleName != localeFound>
+              <#if parameters.labelLocaleName?? && parameters.labelLocaleName != "" && parameters.labelLocaleName != localeFound>
                 <#assign showLocale = false>
               </#if>
               <#if showLocale>

Modified: ofbiz/trunk/framework/webtools/webapp/webtools/labelmanager/ViewReferences.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/labelmanager/ViewReferences.ftl?rev=1618325&r1=1618324&r2=1618325&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/webapp/webtools/labelmanager/ViewReferences.ftl (original)
+++ ofbiz/trunk/framework/webtools/webapp/webtools/labelmanager/ViewReferences.ftl Sat Aug 16 10:58:51 2014
@@ -20,7 +20,7 @@ under the License.
         <table class="basic-table" cellspacing="0">
             <tr>
                 <td class="label">${uiLabelMap.WebtoolsLabelManagerKey}</td>
-                <td colspan="2">${parameters.sourceKey?if_exists}</td>
+                <td colspan="2">${parameters.sourceKey!}</td>
             </tr>
             <tr>
                 <td colspan="3">&nbsp;</td>
@@ -30,17 +30,17 @@ under the License.
                 <td>${uiLabelMap.WebtoolsLabelManagerFileName}</td>
                 <td>${uiLabelMap.WebtoolsLabelManagerReferences}</td>
             </tr>
-            <#if parameters.sourceKey?exists && parameters.sourceKey?has_content>
+            <#if parameters.sourceKey?? && parameters.sourceKey?has_content>
               <#assign rowNum = "2">
               <#assign rowNumber = 1>
               <#assign totalRefs = 0/>
-              <#assign reference = references.get(parameters.sourceKey)?if_exists>
-              <#if reference?exists &&  reference?has_content>
+              <#assign reference = references.get(parameters.sourceKey)!>
+              <#if reference?? &&  reference?has_content>
                 <#assign entries = reference.entrySet()>
                 <#list entries as entry>
                   <tr <#if rowNum == "1">class="alternate-row"</#if>>
                     <td>${rowNumber}</td>
-                    <td><a href="<@ofbizUrl>ViewFile?fileName=${entry.getKey()}&amp;sourceKey=${parameters.sourceKey?if_exists}</@ofbizUrl>">${entry.getKey()}</a></td>
+                    <td><a href="<@ofbizUrl>ViewFile?fileName=${entry.getKey()}&amp;sourceKey=${parameters.sourceKey!}</@ofbizUrl>">${entry.getKey()}</a></td>
                     <td>${entry.getValue()}</td>
                   </tr>
                   <#assign totalRefs = totalRefs + entry.getValue()/>

Modified: ofbiz/trunk/framework/webtools/webapp/webtools/ping.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/ping.ftl?rev=1618325&r1=1618324&r2=1618325&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/webapp/webtools/ping.ftl (original)
+++ ofbiz/trunk/framework/webtools/webapp/webtools/ping.ftl Sat Aug 16 10:58:51 2014
@@ -17,5 +17,5 @@ specific language governing permissions
 under the License.
 -->
 
-${requestAttributes._ERROR_MESSAGE_?if_exists}
-${requestAttributes.message?if_exists}
\ No newline at end of file
+${requestAttributes._ERROR_MESSAGE_!}
+${requestAttributes.message!}
\ No newline at end of file

Modified: ofbiz/trunk/framework/webtools/webapp/webtools/service/availableservices.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/service/availableservices.ftl?rev=1618325&r1=1618324&r2=1618325&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/webapp/webtools/service/availableservices.ftl (original)
+++ ofbiz/trunk/framework/webtools/webapp/webtools/service/availableservices.ftl Sat Aug 16 10:58:51 2014
@@ -23,8 +23,8 @@ under the License.
 <#assign popupUrl='serviceEcaDetail'>
 
 <#-- Selected Service is available -->
-<#if selectedServiceMap?exists>
-  <#if showWsdl?exists && showWsdl = true>
+<#if selectedServiceMap??>
+  <#if showWsdl?? && showWsdl = true>
     <div class="screenlet">
       <div class="screenlet-title-bar">
         <h3>${uiLabelMap.WebtoolsServiceWSDL} - ${uiLabelMap.WebtoolsService} ${selectedServiceMap.serviceName}</h3>
@@ -134,7 +134,7 @@ under the License.
     </div>
 
     <#-- If service has ECA's -->
-    <#if ecaMapList?exists && ecaMapList?has_content>
+    <#if ecaMapList?? && ecaMapList?has_content>
       <#-- add the javascript for modalpopup's -->
       <script language='javascript' type='text/javascript'>
           function detailsPopup(viewName){
@@ -152,10 +152,10 @@ under the License.
         <table class="basic-table" cellspacing='0'>
           <tr class="header-row">
             <td>${uiLabelMap.WebtoolsEventName}</td>
-            <#if ecaMapList.runOnError?exists>
+            <#if ecaMapList.runOnError??>
               <td>${uiLabelMap.WebtoolsRunOnError}</td>
             </#if>
-            <#if ecaMapList.runOnFailure?exists>
+            <#if ecaMapList.runOnFailure??>
               <td>${uiLabelMap.WebtoolsRunOnFailure}</td>
             </#if>
             <td>${uiLabelMap.WebtoolsActions}</td>
@@ -164,11 +164,11 @@ under the License.
           </tr>
           <#list ecaMapList as ecaMap>
             <tr>
-              <td>${ecaMap.eventName?if_exists}</td>
-              <#if ecaMap.runOnError?exists>
+              <td>${ecaMap.eventName!}</td>
+              <#if ecaMap.runOnError??>
                 <td>${ecaMap.runOnError}</div></td>
               </#if>
-              <#if ecaMap.runOnFailure?exists>
+              <#if ecaMap.runOnFailure??>
                 <td>${ecaMap.runOnFailure}</div></td>
               </#if>
               <#if ecaMap.actions?has_content>
@@ -271,7 +271,7 @@ under the License.
     </#if>
     <#-- End if service has ECA's -->
 
-    <#list selectedServiceMap.allParamsList?if_exists as paramList>
+    <#list selectedServiceMap.allParamsList! as paramList>
       <style type="text/css">
         .param-table tr td {
           width: 12.5%;
@@ -282,7 +282,7 @@ under the License.
         <div class="screenlet-title-bar">
           <h3>${paramList.title}</h3>
         </div>
-        <#if paramList.paramList?exists && paramList.paramList?has_content>
+        <#if paramList.paramList?? && paramList.paramList?has_content>
           <table class="basic-table param-table" cellspacing='0'>
               <tr class="header-row">
                 <td>${uiLabelMap.WebtoolsParameterName}</td>
@@ -297,19 +297,19 @@ under the License.
               </tr>
               <#list paramList.paramList as modelParam>
                 <tr>
-                  <td>${modelParam.name?if_exists}</td>
-                  <td>${modelParam.description?if_exists}</td>
-                  <td>${modelParam.optional?if_exists}</td>
-                  <td>${modelParam.type?if_exists}</td>
-                  <#-- <td>[${modelParam.defaultValue?if_exists}]</td> -->
-                  <td>${modelParam.mode?if_exists}</td>
-                  <td>${modelParam.internal?if_exists}</td>
+                  <td>${modelParam.name!}</td>
+                  <td>${modelParam.description!}</td>
+                  <td>${modelParam.optional!}</td>
+                  <td>${modelParam.type!}</td>
+                  <#-- <td>[${modelParam.defaultValue!}]</td> -->
+                  <td>${modelParam.mode!}</td>
+                  <td>${modelParam.internal!}</td>
                   <td>
-                    <#if modelParam.entityName?exists>
-                      <a href='<@ofbizUrl>${url}?constraint=default_entity_name@${modelParam.entityName}</@ofbizUrl>'>${modelParam.entityName?if_exists}</a>
+                    <#if modelParam.entityName??>
+                      <a href='<@ofbizUrl>${url}?constraint=default_entity_name@${modelParam.entityName}</@ofbizUrl>'>${modelParam.entityName!}</a>
                     </#if>
                   </td>
-                  <td>${modelParam.fieldName?if_exists}</td>
+                  <td>${modelParam.fieldName!}</td>
                 </tr>
               </#list>
           </table>
@@ -326,16 +326,16 @@ under the License.
       <form name="exportServiceEoModelBundle" method="post" action="<@ofbizUrl>exportServiceEoModelBundle</@ofbizUrl>" class="basic-form">
         <input type="hidden" name="sel_service_name" value="${selectedServiceMap.serviceName}"/>
         <input type="hidden" name="serviceName" value="${selectedServiceMap.serviceName}"/>
-        Save eomodeld to Local Path: <input type="text" name="eomodeldFullPath" value="${parameters.eomodeldFullPath?if_exists}" size="60"/>
+        Save eomodeld to Local Path: <input type="text" name="eomodeldFullPath" value="${parameters.eomodeldFullPath!}" size="60"/>
         <input type="submit" name="submitButton" value="Export"/>
       </form>
     </div>
   </#if>
 <#-- No Service selected , we list all-->
-<#elseif servicesList?exists && servicesList?has_content>
+<#elseif servicesList?? && servicesList?has_content>
 
   <#-- Show alphabetical index -->
-  <#if serviceNamesAlphaList?exists && serviceNamesAlphaList?has_content>
+  <#if serviceNamesAlphaList?? && serviceNamesAlphaList?has_content>
       <div class="button-bar">
         <#assign isfirst=true>
         <#list serviceNamesAlphaList as alpha>

Modified: ofbiz/trunk/framework/webtools/webapp/webtools/service/serviceResult.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/service/serviceResult.ftl?rev=1618325&r1=1618324&r2=1618325&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/webapp/webtools/service/serviceResult.ftl (original)
+++ ofbiz/trunk/framework/webtools/webapp/webtools/service/serviceResult.ftl Sat Aug 16 10:58:51 2014
@@ -32,12 +32,12 @@ under the License.
               <#list serviceResultList as srl>
                 <tr>
                   <#if srl.hasChild=="Y">
-                    <td><a href="<@ofbizUrl>/serviceResult?servicePath=</@ofbizUrl><#if parameters.servicePath?exists>${parameters.servicePath}||</#if>${srl.key?if_exists}">${srl.key?if_exists}</a></td>
+                    <td><a href="<@ofbizUrl>/serviceResult?servicePath=</@ofbizUrl><#if parameters.servicePath??>${parameters.servicePath}||</#if>${srl.key!}">${srl.key!}</a></td>
                   <#else>
-                    <td>${srl.key?if_exists}</td>
+                    <td>${srl.key!}</td>
                   </#if>
-                    <td>${srl.value?if_exists}</td>
-                    <td><input type="checkbox" name="<#if parameters.servicePath?exists>${parameters.servicePath}||</#if>${srl.key?if_exists}" /></td>
+                    <td>${srl.value!}</td>
+                    <td><input type="checkbox" name="<#if parameters.servicePath??>${parameters.servicePath}||</#if>${srl.key!}" /></td>
                   </tr>
                </#list>
             </#if>

Modified: ofbiz/trunk/framework/webtools/webapp/webtools/service/setServiceParameter.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/service/setServiceParameter.ftl?rev=1618325&r1=1618324&r2=1618325&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/webapp/webtools/service/setServiceParameter.ftl (original)
+++ ofbiz/trunk/framework/webtools/webapp/webtools/service/setServiceParameter.ftl Sat Aug 16 10:58:51 2014
@@ -27,7 +27,7 @@ under the License.
       <tr>
         <td class="label">${serviceParameter.name} (${serviceParameter.type})</td>
         <td>
-          <input type="text" size="20" name="${serviceParameter.name}" value="${serviceParameter.value?if_exists}" <#if serviceParameter.optional == "N">class="required"</#if>/>
+          <input type="text" size="20" name="${serviceParameter.name}" value="${serviceParameter.value!}" <#if serviceParameter.optional == "N">class="required"</#if>/>
           <#if serviceParameter.optional == "N"><span class="tooltip">${uiLabelMap.CommonRequired}</span></#if>
           <#if serviceParameter.defaultValue?has_content>${uiLabelMap.WebtoolsServiceDefault} ${serviceParameter.defaultValue}</#if>
         </td>

Modified: ofbiz/trunk/framework/webtools/webapp/webtools/service/setServiceParameterSync.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/service/setServiceParameterSync.ftl?rev=1618325&r1=1618324&r2=1618325&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/webapp/webtools/service/setServiceParameterSync.ftl (original)
+++ ofbiz/trunk/framework/webtools/webapp/webtools/service/setServiceParameterSync.ftl Sat Aug 16 10:58:51 2014
@@ -27,7 +27,7 @@ under the License.
       <tr>
         <td class="label">${serviceParameter.name} (${serviceParameter.type})</td>
         <td>
-          <input type="text" size="20" name="${serviceParameter.name}" value="<#if serviceParameter.value?if_exists>${serviceParameter.value?string}</#if>"<#if serviceParameter.optional == "N"> class="required"</#if>/>
+          <input type="text" size="20" name="${serviceParameter.name}" value="<#if serviceParameter.value!>${serviceParameter.value?string}</#if>"<#if serviceParameter.optional == "N"> class="required"</#if>/>
           <#if serviceParameter.optional == "N"><span class="tooltip">${uiLabelMap.CommonRequired}</span></#if>
           <#if serviceParameter.defaultValue?has_content>${uiLabelMap.WebtoolsServiceDefault} ${serviceParameter.defaultValue?string}</#if>
         </td>

Modified: ofbiz/trunk/framework/webtools/webapp/webtools/service/threads.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/service/threads.ftl?rev=1618325&r1=1618324&r2=1618325&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/webapp/webtools/service/threads.ftl (original)
+++ ofbiz/trunk/framework/webtools/webapp/webtools/service/threads.ftl Sat Aug 16 10:58:51 2014
@@ -31,19 +31,19 @@ under the License.
       </tr>
       <#assign alt_row = false>
       <#list allThreadList as javaThread>
-      <#if javaThread?exists>
+      <#if javaThread??>
         <#assign stackTraceArray = javaThread.getStackTrace()/>
         <tr valign="middle"<#if alt_row> class="alternate-row"</#if>>
-          <td valign="top">${(javaThread.getThreadGroup().getName())?if_exists}</td>
+          <td valign="top">${(javaThread.getThreadGroup().getName())!}</td>
           <td valign="top">${javaThread.getId()?string}</td>
           <td valign="top">
-            <b>${javaThread.getName()?if_exists}</b>
+            <b>${javaThread.getName()!}</b>
             <#list 1..maxElements as stackIdx>
-              <#assign stackElement = stackTraceArray[stackIdx]?if_exists/>
+              <#assign stackElement = stackTraceArray[stackIdx]!/>
               <#if (stackElement.toString())?has_content><div>${stackElement.toString()}</div></#if>
             </#list>
           </td>
-          <td valign="top">${javaThread.getState().name()?if_exists}&nbsp;</td>
+          <td valign="top">${javaThread.getState().name()!}&nbsp;</td>
           <td valign="top">${javaThread.getPriority()}</td>
           <td valign="top">${javaThread.isDaemon()?string}<#-- /${javaThread.isAlive()?string}/${javaThread.isInterrupted()?string} --></td>
         </tr>

Modified: ofbiz/trunk/framework/webtools/webapp/webtools/tempexpr/tempExprMaint.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/tempexpr/tempExprMaint.ftl?rev=1618325&r1=1618324&r2=1618325&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/webapp/webtools/tempexpr/tempExprMaint.ftl (original)
+++ ofbiz/trunk/framework/webtools/webapp/webtools/tempexpr/tempExprMaint.ftl Sat Aug 16 10:58:51 2014
@@ -37,12 +37,12 @@ under the License.
   <#if !"INTERSECTION.UNION.DIFFERENCE.SUBSTITUTION"?contains(temporalExpression.tempExprTypeId)>
     <tr>
       <td class="label">${uiLabelMap.CommonDescription}</td>
-      <td><input type="text" name="description" value="${temporalExpression.description?if_exists}" maxlength="60" size="20"/></td>
+      <td><input type="text" name="description" value="${temporalExpression.description!}" maxlength="60" size="20"/></td>
     </tr>
   <#else>
     <tr>
       <td class="label">${uiLabelMap.CommonDescription}</td>
-      <td>${temporalExpression.get("description",locale)?if_exists}</td>
+      <td>${temporalExpression.get("description",locale)!}</td>
     </tr>
   </#if>
     <#if temporalExpression.tempExprTypeId == "DATE_RANGE">

Modified: ofbiz/trunk/framework/widget/templates/csvFormMacroLibrary.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/templates/csvFormMacroLibrary.ftl?rev=1618325&r1=1618324&r2=1618325&view=diff
==============================================================================
--- ofbiz/trunk/framework/widget/templates/csvFormMacroLibrary.ftl (original)
+++ ofbiz/trunk/framework/widget/templates/csvFormMacroLibrary.ftl Sat Aug 16 10:58:51 2014
@@ -17,7 +17,7 @@ specific language governing permissions
 under the License.
 -->
 
-<#macro renderField text><#if text?exists>"${text?replace("\"", "\"\"")}"</#if></#macro>
+<#macro renderField text><#if text??>"${text?replace("\"", "\"\"")}"</#if></#macro>
 
 <#macro renderDisplayField type imageLocation idName description title class alert inPlaceEditorId="" inPlaceEditorUrl="" inPlaceEditorParams="">
 <@renderField description />,<#rt/>

Modified: ofbiz/trunk/framework/widget/templates/csvScreenMacroLibrary.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/templates/csvScreenMacroLibrary.ftl?rev=1618325&r1=1618324&r2=1618325&view=diff
==============================================================================
--- ofbiz/trunk/framework/widget/templates/csvScreenMacroLibrary.ftl (original)
+++ ofbiz/trunk/framework/widget/templates/csvScreenMacroLibrary.ftl Sat Aug 16 10:58:51 2014
@@ -40,7 +40,7 @@ under the License.
 
 <#macro renderHorizontalSeparator id style></#macro>
 <#macro renderLabel text id style>
-    <#if text?exists>
+    <#if text??>
         ${text}<#lt/>
     </#if>
 </#macro>

Modified: ofbiz/trunk/framework/widget/templates/foFormMacroLibrary.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/templates/foFormMacroLibrary.ftl?rev=1618325&r1=1618324&r2=1618325&view=diff
==============================================================================
--- ofbiz/trunk/framework/widget/templates/foFormMacroLibrary.ftl (original)
+++ ofbiz/trunk/framework/widget/templates/foFormMacroLibrary.ftl Sat Aug 16 10:58:51 2014
@@ -39,9 +39,9 @@ under the License.
 
 <#escape x as x?xml>
 
-<#macro makeBlock style text><fo:block<#if style?has_content> <@getFoStyle style/></#if>><#if text?exists>${text}</#if></fo:block></#macro>
+<#macro makeBlock style text><fo:block<#if style?has_content> <@getFoStyle style/></#if>><#if text??>${text}</#if></fo:block></#macro>
 
-<#macro renderField text><#if text?exists>${text}</#if></#macro>
+<#macro renderField text><#if text??>${text}</#if></#macro>
 
 <#macro renderDisplayField type imageLocation idName description title class alert inPlaceEditorId="" inPlaceEditorUrl="" inPlaceEditorParams="">
 <@makeBlock class description />

Modified: ofbiz/trunk/framework/widget/templates/htmlFormMacroLibrary.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/templates/htmlFormMacroLibrary.ftl?rev=1618325&r1=1618324&r2=1618325&view=diff
==============================================================================
--- ofbiz/trunk/framework/widget/templates/htmlFormMacroLibrary.ftl (original)
+++ ofbiz/trunk/framework/widget/templates/htmlFormMacroLibrary.ftl Sat Aug 16 10:58:51 2014
@@ -18,7 +18,7 @@ under the License.
 -->
 
 <#macro renderField text>
-  <#if text?exists>
+  <#if text??>
     ${text}<#lt/>
   </#if>
 </#macro>
@@ -125,34 +125,34 @@ under the License.
         if (Date.CultureInfo != undefined) {
           var initDate = <#if value?has_content>jQuery("#${id}_i18n").val()<#else>""</#if>;
           if (initDate != "") {
-            var dateFormat = Date.CultureInfo.formatPatterns.shortDate<#if shortDateInput?exists && !shortDateInput> + " " + Date.CultureInfo.formatPatterns.longTime</#if>;
+            var dateFormat = Date.CultureInfo.formatPatterns.shortDate<#if shortDateInput?? && !shortDateInput> + " " + Date.CultureInfo.formatPatterns.longTime</#if>;
             <#-- bad hack because the JS date parser doesn't understand dots in the date / time string -->
             if (initDate.indexOf('.') != -1) {
               initDate = initDate.substring(0, initDate.indexOf('.'));
             }
-            var ofbizTime = "<#if shortDateInput?exists && shortDateInput>yyyy-MM-dd<#else>yyyy-MM-dd HH:mm:ss</#if>";
+            var ofbizTime = "<#if shortDateInput?? && shortDateInput>yyyy-MM-dd<#else>yyyy-MM-dd HH:mm:ss</#if>";
             var dateObj = Date.parseExact(initDate, ofbizTime);
             var formatedObj = dateObj.toString(dateFormat);
             jQuery("#${id}_i18n").val(formatedObj);
           }
 
           jQuery("#${id}").change(function() {
-            var ofbizTime = "<#if shortDateInput?exists && shortDateInput>yyyy-MM-dd<#else>yyyy-MM-dd HH:mm:ss</#if>";
+            var ofbizTime = "<#if shortDateInput?? && shortDateInput>yyyy-MM-dd<#else>yyyy-MM-dd HH:mm:ss</#if>";
             var newValue = ""
             if (this.value != "") {
               var dateObj = Date.parseExact(this.value, ofbizTime);
-              var dateFormat = Date.CultureInfo.formatPatterns.shortDate<#if shortDateInput?exists && !shortDateInput> + " " + Date.CultureInfo.formatPatterns.longTime</#if>;
+              var dateFormat = Date.CultureInfo.formatPatterns.shortDate<#if shortDateInput?? && !shortDateInput> + " " + Date.CultureInfo.formatPatterns.longTime</#if>;
               newValue = dateObj.toString(dateFormat);
             }
             jQuery("#${id}_i18n").val(newValue);
           });
           jQuery("#${id}_i18n").change(function() {
-            var dateFormat = Date.CultureInfo.formatPatterns.shortDate<#if shortDateInput?exists && !shortDateInput> + " " + Date.CultureInfo.formatPatterns.longTime</#if>,
+            var dateFormat = Date.CultureInfo.formatPatterns.shortDate<#if shortDateInput?? && !shortDateInput> + " " + Date.CultureInfo.formatPatterns.longTime</#if>,
             newValue = "",
             dateObj = Date.parseExact(this.value, dateFormat),
             ofbizTime;
             if (this.value != "" && dateObj !== null) {
-              ofbizTime = "<#if shortDateInput?exists && shortDateInput>yyyy-MM-dd<#else>yyyy-MM-dd HH:mm:ss</#if>";
+              ofbizTime = "<#if shortDateInput?? && shortDateInput>yyyy-MM-dd<#else>yyyy-MM-dd HH:mm:ss</#if>";
               newValue = dateObj.toString(ofbizTime);
             }
             else { // invalid input
@@ -170,7 +170,7 @@ under the License.
         });
       }
 
-      <#if shortDateInput?exists && shortDateInput>
+      <#if shortDateInput?? && shortDateInput>
         jQuery("#${id}").datepicker({
       <#else>
         jQuery("#${id}").datetimepicker({
@@ -296,7 +296,7 @@ under the License.
     <#if confirmation?has_content>onclick="return confirm('${confirmation?js_string}');"</#if>/>
   <#else>
     <input type="<#if containerId?has_content>button<#else>submit</#if>" <@renderClass className alert />
-    <#if name?exists> name="${name}"</#if><#if title?has_content> value="${title}"</#if><#if event?has_content> ${event}="${action}"</#if>
+    <#if name??> name="${name}"</#if><#if title?has_content> value="${title}"</#if><#if event?has_content> ${event}="${action}"</#if>
     <#if containerId?has_content> onclick="<#if confirmation?has_content>if (confirm('${confirmation?js_string}')) </#if>ajaxSubmitFormUpdateAreas('${containerId}', '${ajaxUrl}')"
       <#else><#if confirmation?has_content> onclick="return confirm('${confirmation?js_string}');"</#if>
     </#if>/>
@@ -517,7 +517,7 @@ under the License.
       </span><#rt/>
     </#if>
     <#rt/>
-    <input id="${name?html}_fld1_value" type="text" <@renderClass className alert /><#if name?has_content> name="${name}_fld1_value"</#if><#if localizedInputTitle?exists> title="${localizedInputTitle?html}"</#if><#if value2?has_content> value="${value2}"</#if><#if size?has_content> size="${size}"</#if><#if maxlength?has_content> maxlength="${maxlength}"</#if>/><#rt/>
+    <input id="${name?html}_fld1_value" type="text" <@renderClass className alert /><#if name?has_content> name="${name}_fld1_value"</#if><#if localizedInputTitle??> title="${localizedInputTitle?html}"</#if><#if value2?has_content> value="${value2}"</#if><#if size?has_content> size="${size}"</#if><#if maxlength?has_content> maxlength="${maxlength}"</#if>/><#rt/>
     <#if dateType != "time">
       <script type="text/javascript">
         <#if dateType == "date">

Modified: ofbiz/trunk/framework/widget/templates/htmlScreenMacroLibrary.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/templates/htmlScreenMacroLibrary.ftl?rev=1618325&r1=1618324&r2=1618325&view=diff
==============================================================================
--- ofbiz/trunk/framework/widget/templates/htmlScreenMacroLibrary.ftl (original)
+++ ofbiz/trunk/framework/widget/templates/htmlScreenMacroLibrary.ftl Sat Aug 16 10:58:51 2014
@@ -46,17 +46,17 @@ under the License.
 <#macro renderContentBegin editRequest enableEditValue editContainerStyle><#if editRequest?has_content && enableEditValue == "true"><div class=${editContainerStyle}></#if></#macro>
 <#macro renderContentBody></#macro>
 <#macro renderContentEnd urlString editMode editContainerStyle editRequest enableEditValue>
-<#if editRequest?exists && enableEditValue == "true">
-<#if urlString?exists><a href="${urlString}">${editMode}</a><#rt/></#if>
-<#if editContainerStyle?exists></div><#rt/></#if>
+<#if editRequest?? && enableEditValue == "true">
+<#if urlString??><a href="${urlString}">${editMode}</a><#rt/></#if>
+<#if editContainerStyle??></div><#rt/></#if>
 </#if>
 </#macro>
-<#macro renderSubContentBegin editContainerStyle editRequest enableEditValue><#if editRequest?exists && enableEditValue == "true"><div class="${editContainerStyle}"></#if></#macro>
+<#macro renderSubContentBegin editContainerStyle editRequest enableEditValue><#if editRequest?? && enableEditValue == "true"><div class="${editContainerStyle}"></#if></#macro>
 <#macro renderSubContentBody></#macro>
 <#macro renderSubContentEnd urlString editMode editContainerStyle editRequest enableEditValue>
-<#if editRequest?exists && enableEditValue == "true">
-<#if urlString?exists><a href="${urlString}">${editMode}</a><#rt/></#if>
-<#if editContainerStyle?exists></div><#rt/></#if>
+<#if editRequest?? && enableEditValue == "true">
+<#if urlString??><a href="${urlString}">${editMode}</a><#rt/></#if>
+<#if editContainerStyle??></div><#rt/></#if>
 </#if>
 </#macro>
 

Modified: ofbiz/trunk/framework/widget/templates/textFormMacroLibrary.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/templates/textFormMacroLibrary.ftl?rev=1618325&r1=1618324&r2=1618325&view=diff
==============================================================================
--- ofbiz/trunk/framework/widget/templates/textFormMacroLibrary.ftl (original)
+++ ofbiz/trunk/framework/widget/templates/textFormMacroLibrary.ftl Sat Aug 16 10:58:51 2014
@@ -17,7 +17,7 @@ specific language governing permissions
 under the License.
 -->
 
-<#macro renderField text><#if text?exists>"${text}"</#if></#macro>
+<#macro renderField text><#if text??>"${text}"</#if></#macro>
 
 <#macro renderDisplayField type imageLocation idName description class alert inPlaceEditorId="" inPlaceEditorUrl="" inPlaceEditorParams="">
 <@renderField description />

Modified: ofbiz/trunk/framework/widget/templates/textScreenMacroLibrary.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/templates/textScreenMacroLibrary.ftl?rev=1618325&r1=1618324&r2=1618325&view=diff
==============================================================================
--- ofbiz/trunk/framework/widget/templates/textScreenMacroLibrary.ftl (original)
+++ ofbiz/trunk/framework/widget/templates/textScreenMacroLibrary.ftl Sat Aug 16 10:58:51 2014
@@ -40,7 +40,7 @@ under the License.
 
 <#macro renderHorizontalSeparator id style></#macro>
 <#macro renderLabel text id style>
-    <#if text?exists>
+    <#if text??>
         ${text}<#lt/>
     </#if>
 </#macro>

Modified: ofbiz/trunk/framework/widget/templates/xmlFormMacroLibrary.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/templates/xmlFormMacroLibrary.ftl?rev=1618325&r1=1618324&r2=1618325&view=diff
==============================================================================
--- ofbiz/trunk/framework/widget/templates/xmlFormMacroLibrary.ftl (original)
+++ ofbiz/trunk/framework/widget/templates/xmlFormMacroLibrary.ftl Sat Aug 16 10:58:51 2014
@@ -17,7 +17,7 @@ specific language governing permissions
 under the License.
 -->
 
-<#macro renderField text><#if text?exists>${text?xml}</#if></#macro>
+<#macro renderField text><#if text??>${text?xml}</#if></#macro>
 
 <#macro renderFormatListWrapperOpen formName style columnStyles><${formName}Export></#macro>
 


Free forum by Nabble Edit this page