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 12:58:53 UTC
svn commit: r1618325 [1/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...
Author: ashish
Date: Sat Aug 16 10:58:51 2014
New Revision: 1618325
URL: http://svn.apache.org/r1618325
Log:
Applied the patch OFBIZ-4902_framework.patch from OFBIZ-4902 - Replace in Freemarker templates the deprecated built-ins: default, exists, if_exists.
Thanks http://ofbiz.us team for providing the patch work.
Modified:
ofbiz/trunk/framework/bi/webapp/bi/reportbuilder/RenderStarSchemaReport.ftl
ofbiz/trunk/framework/common/webcommon/error.fo.ftl
ofbiz/trunk/framework/common/webcommon/forgotPassword.ftl
ofbiz/trunk/framework/common/webcommon/includes/ViewCertificate.ftl
ofbiz/trunk/framework/common/webcommon/includes/ajaxAutocompleteOptions.ftl
ofbiz/trunk/framework/common/webcommon/includes/countries.ftl
ofbiz/trunk/framework/common/webcommon/includes/fo/basic-header.fo.ftl
ofbiz/trunk/framework/common/webcommon/includes/genericLink.ftl
ofbiz/trunk/framework/common/webcommon/includes/helplink.ftl
ofbiz/trunk/framework/common/webcommon/includes/insertDropDown.ftl
ofbiz/trunk/framework/common/webcommon/includes/lookup.ftl
ofbiz/trunk/framework/common/webcommon/includes/messages.ftl
ofbiz/trunk/framework/common/webcommon/includes/setMultipleSelectJs.ftl
ofbiz/trunk/framework/common/webcommon/includes/simple.fo.ftl
ofbiz/trunk/framework/common/webcommon/includes/simple.ftl
ofbiz/trunk/framework/common/webcommon/includes/states.ftl
ofbiz/trunk/framework/common/webcommon/login.ftl
ofbiz/trunk/framework/common/webcommon/portal/listPortalPortlets.ftl
ofbiz/trunk/framework/common/webcommon/portal/showPortlet.ftl
ofbiz/trunk/framework/common/webcommon/viewBlocked.ftl
ofbiz/trunk/framework/webapp/config/url.properties
ofbiz/trunk/framework/webtools/webapp/webtools/artifactinfo/ArtifactInfo.ftl
ofbiz/trunk/framework/webtools/webapp/webtools/cert/viewbrowsercerts.ftl
ofbiz/trunk/framework/webtools/webapp/webtools/datafile/viewdatafile.ftl
ofbiz/trunk/framework/webtools/webapp/webtools/entity/ConnectionPoolStatus.ftl
ofbiz/trunk/framework/webtools/webapp/webtools/entity/EntityExportAll.ftl
ofbiz/trunk/framework/webtools/webapp/webtools/entity/EntityImport.ftl
ofbiz/trunk/framework/webtools/webapp/webtools/entity/EntityImportDir.ftl
ofbiz/trunk/framework/webtools/webapp/webtools/entity/EntityImportReaders.ftl
ofbiz/trunk/framework/webtools/webapp/webtools/entity/EntityMaint.ftl
ofbiz/trunk/framework/webtools/webapp/webtools/entity/EntityRefList.ftl
ofbiz/trunk/framework/webtools/webapp/webtools/entity/EntitySQLProcessor.ftl
ofbiz/trunk/framework/webtools/webapp/webtools/entity/ListGeneric.ftl
ofbiz/trunk/framework/webtools/webapp/webtools/entity/xmldsdump.ftl
ofbiz/trunk/framework/webtools/webapp/webtools/labelmanager/SearchLabels.ftl
ofbiz/trunk/framework/webtools/webapp/webtools/labelmanager/UpdateLabel.ftl
ofbiz/trunk/framework/webtools/webapp/webtools/labelmanager/ViewFile.ftl
ofbiz/trunk/framework/webtools/webapp/webtools/labelmanager/ViewHardcodedLabels.ftl
ofbiz/trunk/framework/webtools/webapp/webtools/labelmanager/ViewLabels.ftl
ofbiz/trunk/framework/webtools/webapp/webtools/labelmanager/ViewReferences.ftl
ofbiz/trunk/framework/webtools/webapp/webtools/ping.ftl
ofbiz/trunk/framework/webtools/webapp/webtools/service/availableservices.ftl
ofbiz/trunk/framework/webtools/webapp/webtools/service/serviceResult.ftl
ofbiz/trunk/framework/webtools/webapp/webtools/service/setServiceParameter.ftl
ofbiz/trunk/framework/webtools/webapp/webtools/service/setServiceParameterSync.ftl
ofbiz/trunk/framework/webtools/webapp/webtools/service/threads.ftl
ofbiz/trunk/framework/webtools/webapp/webtools/tempexpr/tempExprMaint.ftl
ofbiz/trunk/framework/widget/templates/csvFormMacroLibrary.ftl
ofbiz/trunk/framework/widget/templates/csvScreenMacroLibrary.ftl
ofbiz/trunk/framework/widget/templates/foFormMacroLibrary.ftl
ofbiz/trunk/framework/widget/templates/htmlFormMacroLibrary.ftl
ofbiz/trunk/framework/widget/templates/htmlScreenMacroLibrary.ftl
ofbiz/trunk/framework/widget/templates/textFormMacroLibrary.ftl
ofbiz/trunk/framework/widget/templates/textScreenMacroLibrary.ftl
ofbiz/trunk/framework/widget/templates/xmlFormMacroLibrary.ftl
Modified: ofbiz/trunk/framework/bi/webapp/bi/reportbuilder/RenderStarSchemaReport.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/bi/webapp/bi/reportbuilder/RenderStarSchemaReport.ftl?rev=1618325&r1=1618324&r2=1618325&view=diff
==============================================================================
--- ofbiz/trunk/framework/bi/webapp/bi/reportbuilder/RenderStarSchemaReport.ftl (original)
+++ ofbiz/trunk/framework/bi/webapp/bi/reportbuilder/RenderStarSchemaReport.ftl Sat Aug 16 10:58:51 2014
@@ -19,9 +19,9 @@ under the License.
<table cellspacing="0" class="basic-table hover-bar">
<tr class="header-row">
- <#assign firstRecord = records[0]?if_exists/>
+ <#assign firstRecord = records[0]!/>
<#list columnNames as columnName>
- <td<#if firstRecord?exists && firstRecord[columnName]?default("")?is_number> class="align-text"</#if>>
+ <td<#if firstRecord?? && firstRecord[columnName]?default("")?is_number> class="align-text"</#if>>
${columnName}
</td>
</#list>
Modified: ofbiz/trunk/framework/common/webcommon/error.fo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/webcommon/error.fo.ftl?rev=1618325&r1=1618324&r2=1618325&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/webcommon/error.fo.ftl (original)
+++ ofbiz/trunk/framework/common/webcommon/error.fo.ftl Sat Aug 16 10:58:51 2014
@@ -54,7 +54,7 @@ under the License.
<fo:table-body>
<fo:table-row>
<fo:table-cell>
- <#if logoImageUrl?exists>
+ <#if logoImageUrl??>
<fo:block>
<fo:external-graphic src="${logoImageUrl}" overflow="hidden" height="40px" content-height="scale-to-fit"/>
</fo:block>
@@ -71,7 +71,7 @@ under the License.
<fo:block font-weight="bold">${uiLabelMap.CommonUsername}</fo:block>
</fo:list-item-label>
<fo:list-item-body start-indent="body-start()">
- <fo:block><#if userLogin?exists>${userLogin.userLoginId?if_exists}</#if></fo:block>
+ <fo:block><#if userLogin??>${userLogin.userLoginId!}</#if></fo:block>
</fo:list-item-body>
</fo:list-item>
<fo:list-item>
@@ -79,7 +79,7 @@ under the License.
<fo:block font-weight="bold">${uiLabelMap.CommonDate}</fo:block>
</fo:list-item-label>
<fo:list-item-body start-indent="body-start()">
- <fo:block>${nowTimestamp?if_exists}</fo:block>
+ <fo:block>${nowTimestamp!}</fo:block>
</fo:list-item-body>
</fo:list-item>
</fo:list-block>
@@ -100,7 +100,7 @@ under the License.
${uiLabelMap.CommonFollowingErrorsOccurred}:
</fo:block>
<fo:block space-after="0.2in" color="red">
- ${errorMessage?if_exists}
+ ${errorMessage!}
</fo:block>
<fo:block id="theEnd"/>
</fo:flow>
Modified: ofbiz/trunk/framework/common/webcommon/forgotPassword.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/webcommon/forgotPassword.ftl?rev=1618325&r1=1618324&r2=1618325&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/webcommon/forgotPassword.ftl (original)
+++ ofbiz/trunk/framework/common/webcommon/forgotPassword.ftl Sat Aug 16 10:58:51 2014
@@ -23,7 +23,7 @@ under the License.
<h3>${uiLabelMap.CommonForgotYourPassword}?</h3>
</div>
<div class="screenlet-body">
- <form method="post" action="<@o...@ofbizUrl>" name="forgotpassword">
+ <form method="post" action="<@o...@ofbizUrl>" name="forgotpassword">
<table class="basic-table" cellspacing="0">
<tr>
<td class="label">${uiLabelMap.CommonUsername}</td>
Modified: ofbiz/trunk/framework/common/webcommon/includes/ViewCertificate.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/webcommon/includes/ViewCertificate.ftl?rev=1618325&r1=1618324&r2=1618325&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/webcommon/includes/ViewCertificate.ftl (original)
+++ ofbiz/trunk/framework/common/webcommon/includes/ViewCertificate.ftl Sat Aug 16 10:58:51 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>
@@ -49,7 +49,7 @@ under the License.
<td> </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/framework/common/webcommon/includes/ajaxAutocompleteOptions.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/webcommon/includes/ajaxAutocompleteOptions.ftl?rev=1618325&r1=1618324&r2=1618325&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/webcommon/includes/ajaxAutocompleteOptions.ftl (original)
+++ ofbiz/trunk/framework/common/webcommon/includes/ajaxAutocompleteOptions.ftl Sat Aug 16 10:58:51 2014
@@ -16,12 +16,12 @@ KIND, either express or implied. See th
specific language governing permissions and limitations
under the License.
-->
-<#if description?exists>
- <#if autocompleteOptions?exists>
+<#if description??>
+ <#if autocompleteOptions??>
<#list autocompleteOptions as autocompleteOption>
<#assign displayString = ""/>
<#list displayFieldsSet as key>
- <#assign field = autocompleteOption.get(key)?if_exists>
+ <#assign field = autocompleteOption.get(key)!>
<#if field?has_content>
<#if (key != context.returnField)>
<#assign displayString = displayString + field + " ">
@@ -35,7 +35,7 @@ under the License.
<script type="text/javascript">
var autocomp = [
<#if autocompleteOptions?has_content>
- <#if !displayReturnField?exists>
+ <#if !displayReturnField??>
<#assign displayReturnField = Static["org.ofbiz.base.util.UtilProperties"].getPropertyValue("widget.properties", "widget.autocompleter.displayReturnField")>
</#if>
<#list autocompleteOptions as autocompleteOption>
@@ -43,7 +43,7 @@ var autocomp = [
<#assign displayString = ""/>
<#assign returnField = ""/>
<#list displayFieldsSet as key>
- <#assign field = autocompleteOption.get(key)?if_exists>
+ <#assign field = autocompleteOption.get(key)!>
<#if field?has_content>
<#if (key == context.returnField)>
<#assign returnField = field/>
Modified: ofbiz/trunk/framework/common/webcommon/includes/countries.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/webcommon/includes/countries.ftl?rev=1618325&r1=1618324&r2=1618325&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/webcommon/includes/countries.ftl (original)
+++ ofbiz/trunk/framework/common/webcommon/includes/countries.ftl Sat Aug 16 10:58:51 2014
@@ -18,7 +18,7 @@ under the License.
-->
<#assign countries = Static["org.ofbiz.common.CommonWorkers"].getCountryList(delegator)>
<#list countries as country>
- <#if defaultCountryGeoId?exists>
+ <#if defaultCountryGeoId??>
<option value='${country.geoId}' ${(country.geoId==defaultCountryGeoId)?string("selected=\"selected\"","")}>${country.get("geoName",locale)?default(country.geoId)}</option>
<#else>
<option value='${country.geoId}'>${country.get("geoName",locale)?default(country.geoId)}</option>
Modified: ofbiz/trunk/framework/common/webcommon/includes/fo/basic-header.fo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/webcommon/includes/fo/basic-header.fo.ftl?rev=1618325&r1=1618324&r2=1618325&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/webcommon/includes/fo/basic-header.fo.ftl (original)
+++ ofbiz/trunk/framework/common/webcommon/includes/fo/basic-header.fo.ftl Sat Aug 16 10:58:51 2014
@@ -19,7 +19,7 @@ under the License.
<#escape x as x?xml>
<fo:static-content flow-name="xsl-region-before">
<fo:block font-size="${(layoutSettings.headerFontSize)?default("14pt")}" text-align="center" margin-bottom="14pt">
- ${(layoutSettings.documentTitle)?if_exists}
+ ${(layoutSettings.documentTitle)!}
</fo:block>
</fo:static-content>
</#escape>
Modified: ofbiz/trunk/framework/common/webcommon/includes/genericLink.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/webcommon/includes/genericLink.ftl?rev=1618325&r1=1618324&r2=1618325&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/webcommon/includes/genericLink.ftl (original)
+++ ofbiz/trunk/framework/common/webcommon/includes/genericLink.ftl Sat Aug 16 10:58:51 2014
@@ -17,17 +17,17 @@ specific language governing permissions
under the License.
-->
-<#if requestParameters?exists && genericLinkName?exists && genericLinkTarget?exists && genericLinkText?exists>
-<form name="${genericLinkName}" <#if genericLinkWindow?exists>target="${genericLinkWindow}"</#if> action="<@o...@ofbizUrl>" method="post">
-<#if (!excludeParameters?exists || excludeParameters != "N") && requestParameters?exists>
+<#if requestParameters?? && genericLinkName?? && genericLinkTarget?? && genericLinkText??>
+<form name="${genericLinkName}" <#if genericLinkWindow??>target="${genericLinkWindow}"</#if> action="<@o...@ofbizUrl>" method="post">
+<#if (!excludeParameters?? || excludeParameters != "N") && requestParameters??>
<#assign requestParameterKeys = requestParameters.keySet().iterator()>
<#list requestParameterKeys as requestParameterKey>
<#assign requestParameterValue = requestParameters.get(requestParameterKey)>
-<#if requestParameterValue?exists && requestParameterValue?has_content>
+<#if requestParameterValue?? && requestParameterValue?has_content>
<input type="hidden" name="${requestParameterKey}" value="${requestParameterValue}"/>
</#if>
</#list>
</#if>
-<a href="javascript:document.${genericLinkName}.submit();" <#if genericLinkStyle?exists>class="${genericLinkStyle}"</#if>>${genericLinkText}</a>
+<a href="javascript:document.${genericLinkName}.submit();" <#if genericLinkStyle??>class="${genericLinkStyle}"</#if>>${genericLinkText}</a>
</form>
</#if>
Modified: ofbiz/trunk/framework/common/webcommon/includes/helplink.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/webcommon/includes/helplink.ftl?rev=1618325&r1=1618324&r2=1618325&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/webcommon/includes/helplink.ftl (original)
+++ ofbiz/trunk/framework/common/webcommon/includes/helplink.ftl Sat Aug 16 10:58:51 2014
@@ -18,6 +18,6 @@ under the License.
-->
<#-- uncomment this to show the current screen help topic key (this is useful to cut and paste in the help link resources files
-${helpTopic?if_exists}
+${helpTopic!}
-->
Modified: ofbiz/trunk/framework/common/webcommon/includes/insertDropDown.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/webcommon/includes/insertDropDown.ftl?rev=1618325&r1=1618324&r2=1618325&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/webcommon/includes/insertDropDown.ftl (original)
+++ ofbiz/trunk/framework/common/webcommon/includes/insertDropDown.ftl Sat Aug 16 10:58:51 2014
@@ -17,22 +17,22 @@ specific language governing permissions
under the License.
-->
-${StringUtil.wrapString(topLine.textBegin?if_exists)}
+${StringUtil.wrapString(topLine.textBegin!)}
<#assign listSize = topLine.dropDownList.size()>
<#if topLine.dropDownList.size() gt 1>
<form method="post" action="<@o...@ofbizUrl>" onsubmit="javascript:submitFormDisableSubmits(this)" name="${topLine.action}" id="${topLine.action}">
- <#if topLine.hiddenFieldList?exists>
+ <#if topLine.hiddenFieldList??>
<#list topLine.hiddenFieldList as field>
<input type="hidden" name="${field.name}" value="${field.value}"/>
</#list>
</#if>
- <select name="${topLine.selectionName?if_exists}" onchange="javascript:document.${topLine.action}.submit();">
+ <select name="${topLine.selectionName!}" onchange="javascript:document.${topLine.action}.submit();">
<#list topLine.dropDownList as option>
- <option <#if option.key == topLine.selectedKey >selected="selected"</#if> value="${option.key?if_exists}">${option.value?if_exists}</option>
+ <option <#if option.key == topLine.selectedKey >selected="selected"</#if> value="${option.key!}">${option.value!}</option>
</#list>
</select>
</form>
<#else>
- ${topLine.dropDownList[0].value?if_exists}
+ ${topLine.dropDownList[0].value!}
</#if>
-${StringUtil.wrapString(topLine.textEnd?if_exists)}
+${StringUtil.wrapString(topLine.textEnd!)}
Modified: ofbiz/trunk/framework/common/webcommon/includes/lookup.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/webcommon/includes/lookup.ftl?rev=1618325&r1=1618324&r2=1618325&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/webcommon/includes/lookup.ftl (original)
+++ ofbiz/trunk/framework/common/webcommon/includes/lookup.ftl Sat Aug 16 10:58:51 2014
@@ -26,7 +26,7 @@ under the License.
<html lang="${docLangAttr}" dir="${langDir}" xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
- <title>${title?if_exists}</title>
+ <title>${title!}</title>
<#-- the trick "<scr" + "ipt below is because browsers should not parse the contents of CDATA elements, but apparently they do. -->
<script language="JavaScript" type="text/javascript">//<![CDATA[
var jQueryLibLoaded = false;
Modified: ofbiz/trunk/framework/common/webcommon/includes/messages.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/webcommon/includes/messages.ftl?rev=1618325&r1=1618324&r2=1618325&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/webcommon/includes/messages.ftl (original)
+++ ofbiz/trunk/framework/common/webcommon/includes/messages.ftl Sat Aug 16 10:58:51 2014
@@ -19,20 +19,20 @@ under the License.
<#escape x as x?html>
<#if requestAttributes.errorMessageList?has_content><#assign errorMessageList=requestAttributes.errorMessageList></#if>
<#if requestAttributes.eventMessageList?has_content><#assign eventMessageList=requestAttributes.eventMessageList></#if>
- <#if requestAttributes.serviceValidationException?exists><#assign serviceValidationException = requestAttributes.serviceValidationException></#if>
+ <#if requestAttributes.serviceValidationException??><#assign serviceValidationException = requestAttributes.serviceValidationException></#if>
<#if requestAttributes.uiLabelMap?has_content><#assign uiLabelMap = requestAttributes.uiLabelMap></#if>
<#if !errorMessage?has_content>
- <#assign errorMessage = requestAttributes._ERROR_MESSAGE_?if_exists>
+ <#assign errorMessage = requestAttributes._ERROR_MESSAGE_!>
</#if>
<#if !errorMessageList?has_content>
- <#assign errorMessageList = requestAttributes._ERROR_MESSAGE_LIST_?if_exists>
+ <#assign errorMessageList = requestAttributes._ERROR_MESSAGE_LIST_!>
</#if>
<#if !eventMessage?has_content>
- <#assign eventMessage = requestAttributes._EVENT_MESSAGE_?if_exists>
+ <#assign eventMessage = requestAttributes._EVENT_MESSAGE_!>
</#if>
<#if !eventMessageList?has_content>
- <#assign eventMessageList = requestAttributes._EVENT_MESSAGE_LIST_?if_exists>
+ <#assign eventMessageList = requestAttributes._EVENT_MESSAGE_LIST_!>
</#if>
<#-- display the error messages -->
Modified: ofbiz/trunk/framework/common/webcommon/includes/setMultipleSelectJs.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/webcommon/includes/setMultipleSelectJs.ftl?rev=1618325&r1=1618324&r2=1618325&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/webcommon/includes/setMultipleSelectJs.ftl (original)
+++ ofbiz/trunk/framework/common/webcommon/includes/setMultipleSelectJs.ftl Sat Aug 16 10:58:51 2014
@@ -16,13 +16,13 @@ KIND, either express or implied. See th
specific language governing permissions and limitations
under the License.
-->
-<#if asm_multipleSelect?exists> <#-- we check only this var and suppose the others are also present -->
+<#if asm_multipleSelect??> <#-- we check only this var and suppose the others are also present -->
<script type="text/javascript">
jQuery(document).ready(function() {
- multiple = jQuery("#${asm_multipleSelect?if_exists}");
+ multiple = jQuery("#${asm_multipleSelect!}");
- <#if asm_title?exists>
- // set the dropdown "title" if exists
+ <#if asm_title??>
+ // set the dropdown "title" if??
multiple.attr('title', '${asm_title}');
</#if>
@@ -34,7 +34,7 @@ jQuery(document).ready(function() {
//, debugMode: true
});
- <#if asm_relatedField?exists> <#-- can be used without related field -->
+ <#if asm_relatedField??> <#-- can be used without related field -->
// track possible relatedField changes
// on initial focus (focus-field-name must be asm_relatedField) or if the field value changes, select related multi values.
typeValue = jQuery('#${asm_typeField}').val();
Modified: ofbiz/trunk/framework/common/webcommon/includes/simple.fo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/webcommon/includes/simple.fo.ftl?rev=1618325&r1=1618324&r2=1618325&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/webcommon/includes/simple.fo.ftl (original)
+++ ofbiz/trunk/framework/common/webcommon/includes/simple.fo.ftl Sat Aug 16 10:58:51 2014
@@ -55,7 +55,7 @@ under the License.
<fo:table-row>
<fo:table-cell>
<fo:block>
- <#if logoImageUrl?exists>
+ <#if logoImageUrl??>
<fo:external-graphic src="${logoImageUrl}" overflow="hidden" height="40px" content-height="scale-to-fit"/>
</#if>
</fo:block>
@@ -63,7 +63,7 @@ under the License.
<fo:table-cell>
<#-- The title of the report -->
<fo:block font-weight="bold" text-decoration="underline" space-after="0.03in">
- <#if titleProperty?exists>${uiLabelMap.get(titleProperty)}<#else>${title?if_exists}</#if>
+ <#if titleProperty??>${uiLabelMap.get(titleProperty)}<#else>${title!}</#if>
</fo:block>
<#-- Username and date -->
<fo:list-block provisional-distance-between-starts="1in">
@@ -72,7 +72,7 @@ under the License.
<fo:block font-weight="bold">${uiLabelMap.CommonUsername}</fo:block>
</fo:list-item-label>
<fo:list-item-body start-indent="body-start()">
- <fo:block><#if userLogin?exists>${userLogin.userLoginId?if_exists}</#if></fo:block>
+ <fo:block><#if userLogin??>${userLogin.userLoginId!}</#if></fo:block>
</fo:list-item-body>
</fo:list-item>
<fo:list-item>
@@ -80,7 +80,7 @@ under the License.
<fo:block font-weight="bold">${uiLabelMap.CommonDate}</fo:block>
</fo:list-item-label>
<fo:list-item-body start-indent="body-start()">
- <fo:block>${nowTimestamp?if_exists}</fo:block>
+ <fo:block>${nowTimestamp!}</fo:block>
</fo:list-item-body>
</fo:list-item>
</fo:list-block>
Modified: ofbiz/trunk/framework/common/webcommon/includes/simple.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/webcommon/includes/simple.ftl?rev=1618325&r1=1618324&r2=1618325&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/webcommon/includes/simple.ftl (original)
+++ ofbiz/trunk/framework/common/webcommon/includes/simple.ftl Sat Aug 16 10:58:51 2014
@@ -26,7 +26,7 @@ under the License.
<html lang="${docLangAttr}" dir="${langDir}" xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
- <title>${layoutSettings.companyName?if_exists}: <#if (page.titleProperty)?has_content>${uiLabelMap[page.titleProperty]}<#else>${(page.title)?if_exists}</#if></title>
+ <title>${layoutSettings.companyName!}: <#if (page.titleProperty)?has_content>${uiLabelMap[page.titleProperty]}<#else>${(page.title)!}</#if></title>
<#if layoutSettings.shortcutIcon?has_content>
<link rel="shortcut icon" href="<@o...@ofbizContentUrl>" />
</#if>
Modified: ofbiz/trunk/framework/common/webcommon/includes/states.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/webcommon/includes/states.ftl?rev=1618325&r1=1618324&r2=1618325&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/webcommon/includes/states.ftl (original)
+++ ofbiz/trunk/framework/common/webcommon/includes/states.ftl Sat Aug 16 10:58:51 2014
@@ -22,7 +22,7 @@ under the License.
</#list>
<#-- Here is some alternate code to get states limited to a region
-<#if requestParameters.CUSTOMER_COUNTRY?exists>
+<#if requestParameters.CUSTOMER_COUNTRY??>
<#assign stateAssocs = Static["org.ofbiz.common.CommonWorkers"].getAssociatedStateList(delegator,requestParameters.CUSTOMER_COUNTRY)>
<#else>
<#assign stateAssocs = Static["org.ofbiz.common.CommonWorkers"].getAssociatedStateList(delegator,null)>
Modified: ofbiz/trunk/framework/common/webcommon/login.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/webcommon/login.ftl?rev=1618325&r1=1618324&r2=1618325&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/webcommon/login.ftl (original)
+++ ofbiz/trunk/framework/common/webcommon/login.ftl Sat Aug 16 10:58:51 2014
@@ -17,7 +17,7 @@ specific language governing permissions
under the License.
-->
-<#if requestAttributes.uiLabelMap?exists><#assign uiLabelMap = requestAttributes.uiLabelMap></#if>
+<#if requestAttributes.uiLabelMap??><#assign uiLabelMap = requestAttributes.uiLabelMap></#if>
<#assign useMultitenant = Static["org.ofbiz.base.util.UtilProperties"].getPropertyValue("general.properties", "multitenant")>
<#assign username = requestParameters.USERNAME?default((sessionAttributes.autoUserLogin.userLoginId)?default(""))>
@@ -43,13 +43,13 @@ under the License.
<td><input type="password" name="PASSWORD" value="" size="20"/></td>
</tr>
<#if ("Y" == useMultitenant) >
- <#if !requestAttributes.tenantId?exists>
+ <#if !requestAttributes.tenantId??>
<tr>
<td class="label">${uiLabelMap.CommonTenantId}</td>
- <td><input type="text" name="tenantId" value="${parameters.tenantId?if_exists}" size="20"/></td>
+ <td><input type="text" name="tenantId" value="${parameters.tenantId!}" size="20"/></td>
</tr>
<#else>
- <input type="hidden" name="tenantId" value="${requestAttributes.tenantId?if_exists}"/>
+ <input type="hidden" name="tenantId" value="${requestAttributes.tenantId!}"/>
</#if>
</#if>
<tr>
Modified: ofbiz/trunk/framework/common/webcommon/portal/listPortalPortlets.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/webcommon/portal/listPortalPortlets.ftl?rev=1618325&r1=1618324&r2=1618325&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/webcommon/portal/listPortalPortlets.ftl (original)
+++ ofbiz/trunk/framework/common/webcommon/portal/listPortalPortlets.ftl Sat Aug 16 10:58:51 2014
@@ -40,7 +40,7 @@ under the License.
<form method="post" action="<@o...@ofbizUrl>" onsubmit="javascript:submitFormDisableSubmits(this)" name="createPortalPortlet_${portalPortlet.portalPortletId}"><input name="portalPortletId" value="${portalPortlet.portalPortletId}" type="hidden"/><input name="portalPageId" value="${parameters.portalPageId}" type="hidden"/><input name="columnSeqId" value="${parameters.columnSeqId}" type="hidden"/></form><a class="buttontext" href="javascript:document.createPortalPortlet_${portalPortlet.portalPortletId}.submit()">${uiLabelMap.CommonAdd}: ${portalPortlet.portletName}</a>
</div>
<div>
- ${portalPortlet.description?if_exists}
+ ${portalPortlet.description!}
</div>
<div>
${parameters.portletCategoryId}
Modified: ofbiz/trunk/framework/common/webcommon/portal/showPortlet.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/webcommon/portal/showPortlet.ftl?rev=1618325&r1=1618324&r2=1618325&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/webcommon/portal/showPortlet.ftl (original)
+++ ofbiz/trunk/framework/common/webcommon/portal/showPortlet.ftl Sat Aug 16 10:58:51 2014
@@ -27,5 +27,5 @@ under the License.
</td></tr>
</table>
<#else/>
-<h2>Portlet '${parameters.portalPortletId?if_exists}' not found. You may not have the necessary seed or other data for it.</h2>
+<h2>Portlet '${parameters.portalPortletId!}' not found. You may not have the necessary seed or other data for it.</h2>
</#if>
Modified: ofbiz/trunk/framework/common/webcommon/viewBlocked.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/webcommon/viewBlocked.ftl?rev=1618325&r1=1618324&r2=1618325&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/webcommon/viewBlocked.ftl (original)
+++ ofbiz/trunk/framework/common/webcommon/viewBlocked.ftl Sat Aug 16 10:58:51 2014
@@ -23,7 +23,7 @@ under the License.
<h3>${uiLabelMap.CommonViewBlocked}</h3>
</div>
<div class="screenlet-body">
- ${errorMessage?if_exists}
+ ${errorMessage!}
<br />
</div>
</div>
Modified: ofbiz/trunk/framework/webapp/config/url.properties
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/config/url.properties?rev=1618325&r1=1618324&r2=1618325&view=diff
==============================================================================
--- ofbiz/trunk/framework/webapp/config/url.properties (original)
+++ ofbiz/trunk/framework/webapp/config/url.properties Sat Aug 16 10:58:51 2014
@@ -22,11 +22,11 @@
# HTTPS Port (Secure port)
port.https.enabled=Y
-port.https=8443
+port.https=38443
force.https.host=
# HTTP Port (Not Secure port)
-port.http=8080
+port.http=38080
force.http.host=
# Static Content URLs to make it easy to move the serving load for static content to other machines
Modified: ofbiz/trunk/framework/webtools/webapp/webtools/artifactinfo/ArtifactInfo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/artifactinfo/ArtifactInfo.ftl?rev=1618325&r1=1618324&r2=1618325&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/webapp/webtools/artifactinfo/ArtifactInfo.ftl (original)
+++ ofbiz/trunk/framework/webtools/webapp/webtools/artifactinfo/ArtifactInfo.ftl Sat Aug 16 10:58:51 2014
@@ -28,12 +28,12 @@ under the License.
</div>
</#if>
-<#if !artifactInfo?exists>
+<#if !artifactInfo??>
<#-- add form here to specify artifact info name. -->
<div>
<form name="ArtifactInfoByName" method="post" action="<@o...@ofbizUrl>" class="basic-form">
- Search Names/Locations: <input type="text" name="name" value="${parameters.name?if_exists}" size="40"/>
+ Search Names/Locations: <input type="text" name="name" value="${parameters.name!}" size="40"/>
<select name="type">
<option></option>
<option>entity</option>
@@ -49,8 +49,8 @@ under the License.
</div>
<div>
<form name="ArtifactInfoByNameAndType" method="post" action="<@o...@ofbizUrl>" class="basic-form">
- <div>Name: <input type="text" name="name" value="${parameters.name?if_exists}" size="40"/></div>
- <div>Location: <input type="text" name="location" value="${parameters.location?if_exists}" size="60"/></div>
+ <div>Name: <input type="text" name="name" value="${parameters.name!}" size="40"/></div>
+ <div>Location: <input type="text" name="location" value="${parameters.location!}" size="60"/></div>
<div>Type:
<select name="type">
<option>entity</option>
@@ -78,7 +78,7 @@ under the License.
<#else/>
<h1>${uiLabelMap.WebtoolsArtifactInfo} (${artifactInfo.getDisplayType()}): ${artifactInfo.getDisplayName()}</h1>
- <#if artifactInfo.getLocationURL()?exists>
+ <#if artifactInfo.getLocationURL()??>
<div>Defined in: <a href="${artifactInfo.getLocationURL()}">${artifactInfo.getLocationURL()}</a></div>
</#if>
@@ -87,41 +87,41 @@ under the License.
<h2>Entity Fields</h2>
<table>
<#list artifactInfo.modelEntity.getFieldsUnmodifiable() as modelField>
- <tr><td>${modelField.getName()}<#if modelField.getIsPk()>*</#if></td><td>${modelField.getType()}</td><td>${modelField.getDescription()?if_exists}</td></tr>
+ <tr><td>${modelField.getName()}<#if modelField.getIsPk()>*</#if></td><td>${modelField.getType()}</td><td>${modelField.getDescription()!}</td></tr>
</#list>
</table>
<div>
<h2>Entities Related (One)</h2>
- <#list artifactInfo.getEntitiesRelatedOne()?if_exists as entityArtifactInfo>
+ <#list artifactInfo.getEntitiesRelatedOne()! as entityArtifactInfo>
<@displayEntityArtifactInfo entityArtifactInfo=entityArtifactInfo/>
</#list>
</div>
<div>
<h2>Entities Related (Many)</h2>
- <#list artifactInfo.getEntitiesRelatedMany()?if_exists as entityArtifactInfo>
+ <#list artifactInfo.getEntitiesRelatedMany()! as entityArtifactInfo>
<@displayEntityArtifactInfo entityArtifactInfo=entityArtifactInfo/>
</#list>
</div>
<div>
<h2>Services Using This Entity</h2>
- <#list artifactInfo.getServicesUsingEntity()?if_exists as serviceArtifactInfo>
+ <#list artifactInfo.getServicesUsingEntity()! as serviceArtifactInfo>
<@displayServiceArtifactInfo serviceArtifactInfo=serviceArtifactInfo/>
</#list>
</div>
<div>
<h2>Forms Using This Entity</h2>
- <#list artifactInfo.getFormsUsingEntity()?if_exists as formWidgetArtifactInfo>
+ <#list artifactInfo.getFormsUsingEntity()! as formWidgetArtifactInfo>
<@displayFormWidgetArtifactInfo formWidgetArtifactInfo=formWidgetArtifactInfo/>
</#list>
</div>
<div>
<h2>Screens Using This Entity</h2>
- <#list artifactInfo.getScreensUsingEntity()?if_exists as screenWidgetArtifactInfo>
+ <#list artifactInfo.getScreensUsingEntity()! as screenWidgetArtifactInfo>
<@displayScreenWidgetArtifactInfo screenWidgetArtifactInfo=screenWidgetArtifactInfo/>
</#list>
</div>
@@ -130,75 +130,75 @@ under the License.
<h2>Service Info</h2>
<div> Description: ${artifactInfo.modelService.description}</div>
<div> Run (${artifactInfo.modelService.engineName}): ${artifactInfo.modelService.location} :: ${artifactInfo.modelService.invoke}</div>
- <div> Impl Location: <a href="${artifactInfo.getImplementationLocationURL()?if_exists}">${artifactInfo.getImplementationLocationURL()?if_exists}</a></div>
+ <div> Impl Location: <a href="${artifactInfo.getImplementationLocationURL()!}">${artifactInfo.getImplementationLocationURL()!}</a></div>
<h2>Service Parameters</h2>
<table>
<tr><td>Name</td><td>Type</td><td>Optional</td><td>Mode</td><td>Entity.field</td></tr>
<#list artifactInfo.modelService.getAllParamNames() as paramName>
<#assign modelParam = artifactInfo.modelService.getParam(paramName)/>
- <tr><td>${modelParam.getName()}<#if modelParam.getInternal()> (internal)</#if></td><td>${modelParam.getType()}</td><td><#if modelParam.isOptional()>optional<#else/>required</#if></td><td>${modelParam.getMode()}</td><td>${modelParam.getEntityName()?if_exists}.${modelParam.getFieldName()?if_exists}</td></tr>
+ <tr><td>${modelParam.getName()}<#if modelParam.getInternal()> (internal)</#if></td><td>${modelParam.getType()}</td><td><#if modelParam.isOptional()>optional<#else/>required</#if></td><td>${modelParam.getMode()}</td><td>${modelParam.getEntityName()!}.${modelParam.getFieldName()!}</td></tr>
</#list>
</table>
<div>
<h2>Entities Used By This Service</h2>
- <#list artifactInfo.getEntitiesUsedByService()?if_exists as entityArtifactInfo>
+ <#list artifactInfo.getEntitiesUsedByService()! as entityArtifactInfo>
<@displayEntityArtifactInfo entityArtifactInfo=entityArtifactInfo/>
</#list>
</div>
<div>
<h2>Services Calling This Service</h2>
- <#list artifactInfo.getServicesCallingService()?if_exists as serviceArtifactInfo>
+ <#list artifactInfo.getServicesCallingService()! as serviceArtifactInfo>
<@displayServiceArtifactInfo serviceArtifactInfo=serviceArtifactInfo/>
</#list>
</div>
<div>
<h2>Services Called By This Service</h2>
- <#list artifactInfo.getServicesCalledByService()?if_exists as serviceArtifactInfo>
+ <#list artifactInfo.getServicesCalledByService()! as serviceArtifactInfo>
<@displayServiceArtifactInfo serviceArtifactInfo=serviceArtifactInfo/>
</#list>
</div>
<div>
<h2>Service ECA Rules Triggered By This Service</h2>
- <#list artifactInfo.getServiceEcaRulesTriggeredByService()?if_exists as serviceEcaArtifactInfo>
+ <#list artifactInfo.getServiceEcaRulesTriggeredByService()! as serviceEcaArtifactInfo>
<@displayServiceEcaArtifactInfo serviceEcaArtifactInfo=serviceEcaArtifactInfo/>
</#list>
</div>
<div>
<h2>Service ECA Rules Calling This Service</h2>
- <#list artifactInfo.getServiceEcaRulesCallingService()?if_exists as serviceEcaArtifactInfo>
+ <#list artifactInfo.getServiceEcaRulesCallingService()! as serviceEcaArtifactInfo>
<@displayServiceEcaArtifactInfo serviceEcaArtifactInfo=serviceEcaArtifactInfo/>
</#list>
</div>
<div>
<h2>Forms Calling This Service</h2>
- <#list artifactInfo.getFormsCallingService()?if_exists as formWidgetArtifactInfo>
+ <#list artifactInfo.getFormsCallingService()! as formWidgetArtifactInfo>
<@displayFormWidgetArtifactInfo formWidgetArtifactInfo=formWidgetArtifactInfo/>
</#list>
</div>
<div>
<h2>Forms Based On This Service</h2>
- <#list artifactInfo.getFormsBasedOnService()?if_exists as formWidgetArtifactInfo>
+ <#list artifactInfo.getFormsBasedOnService()! as formWidgetArtifactInfo>
<@displayFormWidgetArtifactInfo formWidgetArtifactInfo=formWidgetArtifactInfo/>
</#list>
</div>
<div>
<h2>Screens Calling This Service</h2>
- <#list artifactInfo.getScreensCallingService()?if_exists as screenWidgetArtifactInfo>
+ <#list artifactInfo.getScreensCallingService()! as screenWidgetArtifactInfo>
<@displayScreenWidgetArtifactInfo screenWidgetArtifactInfo=screenWidgetArtifactInfo/>
</#list>
</div>
<div>
<h2>Requests with Events That Call This Service</h2>
- <#list artifactInfo.getRequestsWithEventCallingService()?if_exists as controllerRequestArtifactInfo>
+ <#list artifactInfo.getRequestsWithEventCallingService()! as controllerRequestArtifactInfo>
<@displayControllerRequestArtifactInfo controllerRequestArtifactInfo=controllerRequestArtifactInfo/>
</#list>
</div>
@@ -206,48 +206,48 @@ under the License.
<#elseif artifactInfo.getType() == "form"/>
<div>
<h2>Form Extended by This Form</h2>
- <#if artifactInfo.getFormThisFormExtends()?exists>
+ <#if artifactInfo.getFormThisFormExtends()??>
<@displayFormWidgetArtifactInfo formWidgetArtifactInfo=artifactInfo.getFormThisFormExtends()/>
</#if>
</div>
<div>
<h2>Entities Used in This Form</h2>
- <#list artifactInfo.getEntitiesUsedInForm()?if_exists as entityArtifactInfo>
+ <#list artifactInfo.getEntitiesUsedInForm()! as entityArtifactInfo>
<@displayEntityArtifactInfo entityArtifactInfo=entityArtifactInfo/>
</#list>
</div>
<div>
<h2>Services Used in This Form</h2>
- <#list artifactInfo.getServicesUsedInForm()?if_exists as serviceArtifactInfo>
+ <#list artifactInfo.getServicesUsedInForm()! as serviceArtifactInfo>
<@displayServiceArtifactInfo serviceArtifactInfo=serviceArtifactInfo/>
</#list>
</div>
<div>
<h2>Forms Extending This Form</h2>
- <#list artifactInfo.getFormsExtendingThisForm()?if_exists as formWidgetArtifactInfo>
+ <#list artifactInfo.getFormsExtendingThisForm()! as formWidgetArtifactInfo>
<@displayFormWidgetArtifactInfo formWidgetArtifactInfo=formWidgetArtifactInfo/>
</#list>
</div>
<div>
<h2>Screens Including This Form</h2>
- <#list artifactInfo.getScreensIncludingThisForm()?if_exists as screenWidgetArtifactInfo>
+ <#list artifactInfo.getScreensIncludingThisForm()! as screenWidgetArtifactInfo>
<@displayScreenWidgetArtifactInfo screenWidgetArtifactInfo=screenWidgetArtifactInfo/>
</#list>
</div>
<div>
<h2>Controller Requests That Are Linked to in This Form</h2>
- <#list artifactInfo.getRequestsLinkedToInForm()?if_exists as controllerRequestArtifactInfo>
+ <#list artifactInfo.getRequestsLinkedToInForm()! as controllerRequestArtifactInfo>
<@displayControllerRequestArtifactInfo controllerRequestArtifactInfo=controllerRequestArtifactInfo/>
</#list>
</div>
<div>
<h2>Controller Requests That Are Targeted By This Form</h2>
- <#list artifactInfo.getRequestsTargetedByForm()?if_exists as controllerRequestArtifactInfo>
+ <#list artifactInfo.getRequestsTargetedByForm()! as controllerRequestArtifactInfo>
<@displayControllerRequestArtifactInfo controllerRequestArtifactInfo=controllerRequestArtifactInfo/>
</#list>
</div>
@@ -255,55 +255,55 @@ under the License.
<#elseif artifactInfo.getType() == "screen"/>
<div>
<h2>Entities Used in This Screen</h2>
- <#list artifactInfo.getEntitiesUsedInScreen()?if_exists as entityArtifactInfo>
+ <#list artifactInfo.getEntitiesUsedInScreen()! as entityArtifactInfo>
<@displayEntityArtifactInfo entityArtifactInfo=entityArtifactInfo/>
</#list>
</div>
<div>
<h2>Services Used in This Screen</h2>
- <#list artifactInfo.getServicesUsedInScreen()?if_exists as serviceArtifactInfo>
+ <#list artifactInfo.getServicesUsedInScreen()! as serviceArtifactInfo>
<@displayServiceArtifactInfo serviceArtifactInfo=serviceArtifactInfo/>
</#list>
</div>
<div>
<h2>Forms Included in This Screen</h2>
- <#list artifactInfo.getFormsIncludedInScreen()?if_exists as formWidgetArtifactInfo>
+ <#list artifactInfo.getFormsIncludedInScreen()! as formWidgetArtifactInfo>
<@displayFormWidgetArtifactInfo formWidgetArtifactInfo=formWidgetArtifactInfo/>
</#list>
</div>
<div>
<h2>Screens Include in This Screen</h2>
- <#list artifactInfo.getScreensIncludedInScreen()?if_exists as screenWidgetArtifactInfo>
+ <#list artifactInfo.getScreensIncludedInScreen()! as screenWidgetArtifactInfo>
<@displayScreenWidgetArtifactInfo screenWidgetArtifactInfo=screenWidgetArtifactInfo/>
</#list>
</div>
<div>
<h2>Screens Including This Screen</h2>
- <#list artifactInfo.getScreensIncludingThisScreen()?if_exists as screenWidgetArtifactInfo>
+ <#list artifactInfo.getScreensIncludingThisScreen()! as screenWidgetArtifactInfo>
<@displayScreenWidgetArtifactInfo screenWidgetArtifactInfo=screenWidgetArtifactInfo/>
</#list>
</div>
<div>
<h2>Controller Requests That Are Linked to in This Screen</h2>
- <#list artifactInfo.getRequestsLinkedToInScreen()?if_exists as controllerRequestArtifactInfo>
+ <#list artifactInfo.getRequestsLinkedToInScreen()! as controllerRequestArtifactInfo>
<@displayControllerRequestArtifactInfo controllerRequestArtifactInfo=controllerRequestArtifactInfo/>
</#list>
</div>
<div>
<h2>Controller Views Referring to This Screen</h2>
- <#list artifactInfo.getViewsReferringToScreen()?if_exists as controllerViewArtifactInfo>
+ <#list artifactInfo.getViewsReferringToScreen()! as controllerViewArtifactInfo>
<@displayControllerViewArtifactInfo controllerViewArtifactInfo=controllerViewArtifactInfo/>
</#list>
</div>
<#elseif artifactInfo.getType() == "request"/>
- <#if artifactInfo.getServiceCalledByRequestEvent()?exists>
+ <#if artifactInfo.getServiceCalledByRequestEvent()??>
<div>
<h2>Service Called by Request Event</h2>
<@displayServiceArtifactInfo serviceArtifactInfo=artifactInfo.getServiceCalledByRequestEvent()/>
@@ -312,41 +312,41 @@ under the License.
<div>
<h2>Forms Referring to This Request</h2>
- <#list artifactInfo.getFormInfosReferringToRequest()?if_exists as formWidgetArtifactInfo>
+ <#list artifactInfo.getFormInfosReferringToRequest()! as formWidgetArtifactInfo>
<@displayFormWidgetArtifactInfo formWidgetArtifactInfo=formWidgetArtifactInfo/>
</#list>
</div>
<div>
<h2>Forms Targeting This Request</h2>
- <#list artifactInfo.getFormInfosTargetingRequest()?if_exists as formWidgetArtifactInfo>
+ <#list artifactInfo.getFormInfosTargetingRequest()! as formWidgetArtifactInfo>
<@displayFormWidgetArtifactInfo formWidgetArtifactInfo=formWidgetArtifactInfo/>
</#list>
</div>
<div>
<h2>Screens Referring to This Request</h2>
- <#list artifactInfo.getScreenInfosReferringToRequest()?if_exists as screenWidgetArtifactInfo>
+ <#list artifactInfo.getScreenInfosReferringToRequest()! as screenWidgetArtifactInfo>
<@displayScreenWidgetArtifactInfo screenWidgetArtifactInfo=screenWidgetArtifactInfo/>
</#list>
</div>
<div>
<h2>Requests That Are Responses to This Request</h2>
- <#list artifactInfo.getRequestsThatAreResponsesToThisRequest()?if_exists as controllerRequestArtifactInfo>
+ <#list artifactInfo.getRequestsThatAreResponsesToThisRequest()! as controllerRequestArtifactInfo>
<@displayControllerRequestArtifactInfo controllerRequestArtifactInfo=controllerRequestArtifactInfo/>
</#list>
</div>
<div>
<h2>Requests That This Request is a Responses To</h2>
- <#list artifactInfo.getRequestsThatThisRequestIsResponsTo()?if_exists as controllerRequestArtifactInfo>
+ <#list artifactInfo.getRequestsThatThisRequestIsResponsTo()! as controllerRequestArtifactInfo>
<@displayControllerRequestArtifactInfo controllerRequestArtifactInfo=controllerRequestArtifactInfo/>
</#list>
</div>
<div>
<h2>Controller Views That Are Responses to This Request</h2>
- <#list artifactInfo.getViewsThatAreResponsesToThisRequest()?if_exists as controllerViewArtifactInfo>
+ <#list artifactInfo.getViewsThatAreResponsesToThisRequest()! as controllerViewArtifactInfo>
<@displayControllerViewArtifactInfo controllerViewArtifactInfo=controllerViewArtifactInfo/>
</#list>
</div>
@@ -354,12 +354,12 @@ under the License.
<#elseif artifactInfo.getType() == "view"/>
<div>
<h2>Requests That This View is a Responses To</h2>
- <#list artifactInfo.getRequestsThatThisViewIsResponseTo()?if_exists as controllerRequestArtifactInfo>
+ <#list artifactInfo.getRequestsThatThisViewIsResponseTo()! as controllerRequestArtifactInfo>
<@displayControllerRequestArtifactInfo controllerRequestArtifactInfo=controllerRequestArtifactInfo/>
</#list>
</div>
- <#if artifactInfo.getScreenCalledByThisView()?exists>
+ <#if artifactInfo.getScreenCalledByThisView()??>
<div>
<h2>Screen Called by This View</h2>
<@displayScreenWidgetArtifactInfo screenWidgetArtifactInfo=artifactInfo.getScreenCalledByThisView()/>
Modified: ofbiz/trunk/framework/webtools/webapp/webtools/cert/viewbrowsercerts.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/cert/viewbrowsercerts.ftl?rev=1618325&r1=1618324&r2=1618325&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/webapp/webtools/cert/viewbrowsercerts.ftl (original)
+++ ofbiz/trunk/framework/webtools/webapp/webtools/cert/viewbrowsercerts.ftl Sat Aug 16 10:58:51 2014
@@ -18,9 +18,9 @@ under the License.
-->
<#assign isSecure = request.isSecure()/>
-<#assign clientCerts = request.getAttribute("javax.servlet.request.X509Certificate")?if_exists/>
+<#assign clientCerts = request.getAttribute("javax.servlet.request.X509Certificate")!/>
<#if (!clientCerts?has_content)>
- <#assign clientCerts = request.getAttribute("javax.net.ssl.peer_certificates")?if_exists/>
+ <#assign clientCerts = request.getAttribute("javax.net.ssl.peer_certificates")!/>
</#if>
<div class="screenlet">
@@ -31,7 +31,7 @@ under the License.
<#if (clientCerts?has_content)>
<table class="basic-table">
<#list clientCerts as cert>
- <#assign certString = Static["org.ofbiz.base.util.KeyStoreUtil"].certToString(cert)?if_exists>
+ <#assign certString = Static["org.ofbiz.base.util.KeyStoreUtil"].certToString(cert)!>
<#if (certString?has_content)>
<tr>
<td class="label">${uiLabelMap.WebtoolsCertsCert}</td>
Modified: ofbiz/trunk/framework/webtools/webapp/webtools/datafile/viewdatafile.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/datafile/viewdatafile.ftl?rev=1618325&r1=1618324&r2=1618325&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/webapp/webtools/datafile/viewdatafile.ftl (original)
+++ ofbiz/trunk/framework/webtools/webapp/webtools/datafile/viewdatafile.ftl Sat Aug 16 10:58:51 2014
@@ -23,7 +23,7 @@ under the License.
<table class="basic-table" cellspacing="0">
<tr>
<td class="label">${uiLabelMap.WebtoolsDataDefinitionFileName}</td>
- <td><input name="DEFINITION_LOCATION" type="text" size="60" value="${parameters.DEFINITION_LOCATION?if_exists}" /></td>
+ <td><input name="DEFINITION_LOCATION" type="text" size="60" value="${parameters.DEFINITION_LOCATION!}" /></td>
<td><span class="label">${uiLabelMap.WebtoolsDataIsUrl}</span><input type="checkbox" name="DEFINITION_IS_URL"<#if parameters.DEFINITION_IS_URL?has_content> checked="checked"</#if> /></td>
</tr>
<tr>
@@ -34,28 +34,28 @@ under the License.
<option value=""></option>
<#list definitionNames as oneDefinitionName>
boolean isSelected = definitionName?? && definitionName.equals(oneDefinitionName);
- <option value="${oneDefinitionName}" <#if parameters.DEFINITION_NAME?exists && parameters.DEFINITION_NAME == oneDefinitionName> selected="selected" </#if>>${oneDefinitionName}</option>
+ <option value="${oneDefinitionName}" <#if parameters.DEFINITION_NAME?? && parameters.DEFINITION_NAME == oneDefinitionName> selected="selected" </#if>>${oneDefinitionName}</option>
</#list>
</select>
<#else>
- <input name="DEFINITION_NAME" type="text" size="30" value="${definitionName?if_exists}" />
+ <input name="DEFINITION_NAME" type="text" size="30" value="${definitionName!}" />
</#if>
</td>
<td> </td>
</tr>
<tr>
<td class="label">${uiLabelMap.WebtoolsDataFileName}</td>
- <td><input name="DATAFILE_LOCATION" type="text" size="60" value="${parameters.DATAFILE_LOCATION?if_exists}" /></td>
+ <td><input name="DATAFILE_LOCATION" type="text" size="60" value="${parameters.DATAFILE_LOCATION!}" /></td>
<td><span class="label">${uiLabelMap.WebtoolsDataIsUrl}</span><input type="checkbox" name="DATAFILE_IS_URL"<#if parameters.DATAFILE_IS_URL?has_content> checked="checked"</#if> /></td>
</tr>
<tr>
<td class="label">${uiLabelMap.WebtoolsDataSaveToFile}</td>
- <td><input name="DATAFILE_SAVE" type="text" size="60" value="${parameters.DATAFILE_SAVE?if_exists}"/></td>
+ <td><input name="DATAFILE_SAVE" type="text" size="60" value="${parameters.DATAFILE_SAVE!}"/></td>
<td> </td>
</tr>
<tr>
<td class="label">${uiLabelMap.WebtoolsDataSaveToXml}</td>
- <td><input name="ENTITYXML_FILE_SAVE" type="text" size="60" value="${parameters.ENTITYXML_FILE_SAVE?if_exists}" /></td>
+ <td><input name="ENTITYXML_FILE_SAVE" type="text" size="60" value="${parameters.ENTITYXML_FILE_SAVE!}" /></td>
<td> </td>
</tr>
<tr>
Modified: ofbiz/trunk/framework/webtools/webapp/webtools/entity/ConnectionPoolStatus.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/entity/ConnectionPoolStatus.ftl?rev=1618325&r1=1618324&r2=1618325&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/webapp/webtools/entity/ConnectionPoolStatus.ftl (original)
+++ ofbiz/trunk/framework/webtools/webapp/webtools/entity/ConnectionPoolStatus.ftl Sat Aug 16 10:58:51 2014
@@ -18,7 +18,7 @@ under the License.
-->
<h1>Connection Pool Status</h1>
-<#assign groups = delegator.getModelGroupReader().getGroupNames(delegator.getDelegatorName())?if_exists/>
+<#assign groups = delegator.getModelGroupReader().getGroupNames(delegator.getDelegatorName())!/>
<table class="basic-table light-grid hover-bar">
<tr class="header-row">
<td>Helper Name</td>
@@ -34,20 +34,20 @@ under the License.
<#assign alt_row = false>
<#if (groups?has_content)>
<#list groups as group>
- <#assign helper = delegator.getGroupHelperName(group)?if_exists/>
+ <#assign helper = delegator.getGroupHelperName(group)!/>
<#if (helper?has_content)>
- <#assign dataSourceInfo = Static["org.ofbiz.entity.connection.DBCPConnectionFactory"].getDataSourceInfo(helper)?if_exists/>
+ <#assign dataSourceInfo = Static["org.ofbiz.entity.connection.DBCPConnectionFactory"].getDataSourceInfo(helper)!/>
<#if (dataSourceInfo?has_content)>
<tr>
<td>${helper}</td>
- <td>${dataSourceInfo.poolNumActive?if_exists}</td>
- <td>${dataSourceInfo.poolNumIdle?if_exists}</td>
- <td>${dataSourceInfo.poolNumTotal?if_exists}</td>
- <td>${dataSourceInfo.poolMaxActive?if_exists}</td>
- <td>${dataSourceInfo.poolMaxIdle?if_exists}</td>
- <td>${dataSourceInfo.poolMinIdle?if_exists}</td>
- <td>${dataSourceInfo.poolMinEvictableIdleTimeMillis?if_exists}</td>
- <td>${dataSourceInfo.poolMaxWait?if_exists}</td>
+ <td>${dataSourceInfo.poolNumActive!}</td>
+ <td>${dataSourceInfo.poolNumIdle!}</td>
+ <td>${dataSourceInfo.poolNumTotal!}</td>
+ <td>${dataSourceInfo.poolMaxActive!}</td>
+ <td>${dataSourceInfo.poolMaxIdle!}</td>
+ <td>${dataSourceInfo.poolMinIdle!}</td>
+ <td>${dataSourceInfo.poolMinEvictableIdleTimeMillis!}</td>
+ <td>${dataSourceInfo.poolMaxWait!}</td>
</tr>
</#if>
</#if>
Modified: ofbiz/trunk/framework/webtools/webapp/webtools/entity/EntityExportAll.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/entity/EntityExportAll.ftl?rev=1618325&r1=1618324&r2=1618325&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/webapp/webtools/entity/EntityExportAll.ftl (original)
+++ ofbiz/trunk/framework/webtools/webapp/webtools/entity/EntityExportAll.ftl Sat Aug 16 10:58:51 2014
@@ -28,7 +28,7 @@ under the License.
</#if>
<hr />
<form method="post" action="<@o...@ofbizUrl>">
- ${uiLabelMap.WebtoolsOutputDirectory}: <input type="text" size="60" name="outpath" value="${outpath?if_exists}" /><br />
+ ${uiLabelMap.WebtoolsOutputDirectory}: <input type="text" size="60" name="outpath" value="${outpath!}" /><br />
${uiLabelMap.CommonFromDate}: <@htmlTemplate.renderDateTimeField name="fromDate" event="" action="" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" value="" size="25" maxlength="30" id="fromDate" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/><br/>
${uiLabelMap.WebtoolsTimeoutSeconds}: <input type="text" size="6" value="${txTimeout?default('7200')}" name="txTimeout"/><br />
<br />
Modified: ofbiz/trunk/framework/webtools/webapp/webtools/entity/EntityImport.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/entity/EntityImport.ftl?rev=1618325&r1=1618324&r2=1618325&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/webapp/webtools/entity/EntityImport.ftl (original)
+++ ofbiz/trunk/framework/webtools/webapp/webtools/entity/EntityImport.ftl Sat Aug 16 10:58:51 2014
@@ -23,14 +23,14 @@ under the License.
<form method="post" action="<@o...@ofbizUrl>">
${uiLabelMap.WebtoolsAbsoluteFileNameOrUrl}:<br />
- <input type="text" size="60" name="filename" value="${filename?if_exists}"/><br />
+ <input type="text" size="60" name="filename" value="${filename!}"/><br />
${uiLabelMap.WebtoolsAbsoluteFTLFilename}:<br />
- <input type="text" size="40" name="fmfilename" value="${fmfilename?if_exists}"/><br />
- <input type="checkbox" name="isUrl" <#if isUrl?exists>checked="checked"</#if>/>${uiLabelMap.WebtoolsIsURL}<br />
- <input type="checkbox" name="mostlyInserts" <#if mostlyInserts?exists>checked="checked"</#if>/>${uiLabelMap.WebtoolsMostlyInserts}<br />
- <input type="checkbox" name="maintainTimeStamps" <#if keepStamps?exists>checked="checked"</#if>/>${uiLabelMap.WebtoolsMaintainTimestamps}<br />
- <input type="checkbox" name="createDummyFks" <#if createDummyFks?exists>checked="checked"</#if>/>${uiLabelMap.WebtoolsCreateDummyFks}<br />
- <input type="checkbox" name="checkDataOnly" <#if checkDataOnly?exists>checked="checked"</#if>/>${uiLabelMap.WebtoolsCheckDataOnly}<br />
+ <input type="text" size="40" name="fmfilename" value="${fmfilename!}"/><br />
+ <input type="checkbox" name="isUrl" <#if isUrl??>checked="checked"</#if>/>${uiLabelMap.WebtoolsIsURL}<br />
+ <input type="checkbox" name="mostlyInserts" <#if mostlyInserts??>checked="checked"</#if>/>${uiLabelMap.WebtoolsMostlyInserts}<br />
+ <input type="checkbox" name="maintainTimeStamps" <#if keepStamps??>checked="checked"</#if>/>${uiLabelMap.WebtoolsMaintainTimestamps}<br />
+ <input type="checkbox" name="createDummyFks" <#if createDummyFks??>checked="checked"</#if>/>${uiLabelMap.WebtoolsCreateDummyFks}<br />
+ <input type="checkbox" name="checkDataOnly" <#if checkDataOnly??>checked="checked"</#if>/>${uiLabelMap.WebtoolsCheckDataOnly}<br />
${uiLabelMap.WebtoolsTimeoutSeconds}:<input type="text" size="6" value="${txTimeoutStr?default("7200")}" name="txTimeout"/><br />
<div class="button-bar"><input type="submit" value="${uiLabelMap.WebtoolsImportFile}"/></div>
</form>
@@ -39,7 +39,7 @@ under the License.
<textarea rows="20" cols="85" name="fulltext">${fulltext?default("<entity-engine-xml>\n</entity-engine-xml>")}</textarea>
<div class="button-bar"><input type="submit" value="${uiLabelMap.WebtoolsImportText}"/></div>
</form>
- <#if messages?exists>
+ <#if messages??>
<hr />
<h3>${uiLabelMap.WebtoolsResults}:</h3>
<#list messages as message>
Modified: ofbiz/trunk/framework/webtools/webapp/webtools/entity/EntityImportDir.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/entity/EntityImportDir.ftl?rev=1618325&r1=1618324&r2=1618325&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/webapp/webtools/entity/EntityImportDir.ftl (original)
+++ ofbiz/trunk/framework/webtools/webapp/webtools/entity/EntityImportDir.ftl Sat Aug 16 10:58:51 2014
@@ -23,17 +23,17 @@ under the License.
<form method="post" action="<@o...@ofbizUrl>">
${uiLabelMap.WebtoolsAbsolutePath}:<br />
- <input type="text" size="60" name="path" value="${path?if_exists}"/><br />
- <input type="checkbox" name="mostlyInserts" <#if mostlyInserts?exists>checked="checked"</#if>/>${uiLabelMap.WebtoolsMostlyInserts}<br />
- <input type="checkbox" name="maintainTimeStamps" <#if keepStamps?exists>checked="checked"</#if>/>${uiLabelMap.WebtoolsMaintainTimestamps}<br />
- <input type="checkbox" name="createDummyFks" <#if createDummyFks?exists>checked="checked"</#if>/>${uiLabelMap.WebtoolsCreateDummyFks}<br />
- <input type="checkbox" name="deleteFiles" <#if (deleteFiles?exists)>checked="checked"</#if>/>${uiLabelMap.WebtoolsDeleteFiles}<br />
- <input type="checkbox" name="checkDataOnly" <#if checkDataOnly?exists>checked="checked"</#if>/>${uiLabelMap.WebtoolsCheckDataOnly}<br />
+ <input type="text" size="60" name="path" value="${path!}"/><br />
+ <input type="checkbox" name="mostlyInserts" <#if mostlyInserts??>checked="checked"</#if>/>${uiLabelMap.WebtoolsMostlyInserts}<br />
+ <input type="checkbox" name="maintainTimeStamps" <#if keepStamps??>checked="checked"</#if>/>${uiLabelMap.WebtoolsMaintainTimestamps}<br />
+ <input type="checkbox" name="createDummyFks" <#if createDummyFks??>checked="checked"</#if>/>${uiLabelMap.WebtoolsCreateDummyFks}<br />
+ <input type="checkbox" name="deleteFiles" <#if (deleteFiles??)>checked="checked"</#if>/>${uiLabelMap.WebtoolsDeleteFiles}<br />
+ <input type="checkbox" name="checkDataOnly" <#if checkDataOnly??>checked="checked"</#if>/>${uiLabelMap.WebtoolsCheckDataOnly}<br />
${uiLabelMap.WebtoolsTimeoutSeconds}:<input type="text" size="6" value="${txTimeoutStr?default("7200")}" name="txTimeout"/><br />
${uiLabelMap.WebtoolsPause}:<input type="text" size="6" value="${filePauseStr?default("0")}" name="filePause"/><br />
<div class="button-bar"><input type="submit" value="${uiLabelMap.WebtoolsImportFile}"/></div>
</form>
- <#if messages?exists>
+ <#if messages??>
<hr />
<h1>${uiLabelMap.WebtoolsResults}:</h1>
<#list messages as message>
Modified: ofbiz/trunk/framework/webtools/webapp/webtools/entity/EntityImportReaders.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/entity/EntityImportReaders.ftl?rev=1618325&r1=1618324&r2=1618325&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/webapp/webtools/entity/EntityImportReaders.ftl (original)
+++ ofbiz/trunk/framework/webtools/webapp/webtools/entity/EntityImportReaders.ftl Sat Aug 16 10:58:51 2014
@@ -23,14 +23,14 @@ under the License.
<form method="post" action="<@o...@ofbizUrl>">
Enter Readers (comma separated, no spaces; from entityengine.xml and ofbiz-component.xml files; common ones include seed,ext,demo):<br />
<input type="text" size="60" name="readers" value="${readers?default("seed")}"/><br />
- <input type="checkbox" name="mostlyInserts" <#if mostlyInserts?exists>checked="checked"</#if> value="true"/>${uiLabelMap.WebtoolsMostlyInserts}<br />
- <input type="checkbox" name="maintainTimeStamps" <#if keepStamps?exists>checked="checked"</#if> value="true"/>${uiLabelMap.WebtoolsMaintainTimestamps}<br />
- <input type="checkbox" name="createDummyFks" <#if createDummyFks?exists>checked="checked"</#if> value="true"/>${uiLabelMap.WebtoolsCreateDummyFks}<br />
- <input type="checkbox" name="checkDataOnly" <#if checkDataOnly?exists>checked="checked"</#if> value="true"/>${uiLabelMap.WebtoolsCheckDataOnly}<br />
+ <input type="checkbox" name="mostlyInserts" <#if mostlyInserts??>checked="checked"</#if> value="true"/>${uiLabelMap.WebtoolsMostlyInserts}<br />
+ <input type="checkbox" name="maintainTimeStamps" <#if keepStamps??>checked="checked"</#if> value="true"/>${uiLabelMap.WebtoolsMaintainTimestamps}<br />
+ <input type="checkbox" name="createDummyFks" <#if createDummyFks??>checked="checked"</#if> value="true"/>${uiLabelMap.WebtoolsCreateDummyFks}<br />
+ <input type="checkbox" name="checkDataOnly" <#if checkDataOnly??>checked="checked"</#if> value="true"/>${uiLabelMap.WebtoolsCheckDataOnly}<br />
${uiLabelMap.WebtoolsTimeoutSeconds}:<input type="text" size="6" value="${txTimeoutStr?default("7200")}" name="txTimeout"/><br />
<div class="button-bar"><input type="submit" value="${uiLabelMap.WebtoolsImport}"/></div>
</form>
- <#if messages?exists>
+ <#if messages??>
<hr />
<h3>${uiLabelMap.WebtoolsResults}:</h3>
<#list messages as message>
Modified: ofbiz/trunk/framework/webtools/webapp/webtools/entity/EntityMaint.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/entity/EntityMaint.ftl?rev=1618325&r1=1618324&r2=1618325&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/webapp/webtools/entity/EntityMaint.ftl (original)
+++ ofbiz/trunk/framework/webtools/webapp/webtools/entity/EntityMaint.ftl Sat Aug 16 10:58:51 2014
@@ -22,11 +22,11 @@ under the License.
<select name="filterByGroupName">
<option value="">${uiLabelMap.CommonAll}</option>
<#list entityGroups as group>
- <option value="${group}" <#if filterByGroupName?exists><#if group = filterByGroupName>selected="selected"</#if></#if>>${group}</option>
+ <option value="${group}" <#if filterByGroupName??><#if group = filterByGroupName>selected="selected"</#if></#if>>${group}</option>
</#list>
</select>
<b>${uiLabelMap.WebtoolsEntityName}:</b>
- <input type= "text" name= "filterByEntityName" value="${parameters.filterByEntityName?if_exists}"/>
+ <input type= "text" name= "filterByEntityName" value="${parameters.filterByEntityName!}"/>
<input type="submit" value="${uiLabelMap.CommonApply}"/>
</form>
</div>
Modified: ofbiz/trunk/framework/webtools/webapp/webtools/entity/EntityRefList.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/entity/EntityRefList.ftl?rev=1618325&r1=1618324&r2=1618325&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/webapp/webtools/entity/EntityRefList.ftl (original)
+++ ofbiz/trunk/framework/webtools/webapp/webtools/entity/EntityRefList.ftl Sat Aug 16 10:58:51 2014
@@ -67,7 +67,7 @@ under the License.
<#if forstatic>
<a href="<@o...@ofbizUrl>" target="entityFrame">${entity.entityName}</a>
<#else>
- <a href="<@o...@ofbizUrl>" target="entityFrame">${entity.entityName}</a>
+ <a href="<@o...@ofbizUrl>" target="entityFrame">${entity.entityName}</a>
</#if>
<br />
</#list>
Modified: ofbiz/trunk/framework/webtools/webapp/webtools/entity/EntitySQLProcessor.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/entity/EntitySQLProcessor.ftl?rev=1618325&r1=1618324&r2=1618325&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/webapp/webtools/entity/EntitySQLProcessor.ftl (original)
+++ ofbiz/trunk/framework/webtools/webapp/webtools/entity/EntitySQLProcessor.ftl Sat Aug 16 10:58:51 2014
@@ -25,7 +25,7 @@ under the License.
<td>
<select name="group">
<#list groups as group>
- <option value="${group}" <#if selGroup?exists><#if group = selGroup>selected="selected"</#if></#if>>${group}</option>
+ <option value="${group}" <#if selGroup??><#if group = selGroup>selected="selected"</#if></#if>>${group}</option>
</#list>
</select>
</td>
@@ -35,7 +35,7 @@ under the License.
${uiLabelMap.WebtoolsSqlCommand}
</td>
<td>
- <textarea name="sqlCommand" cols="100" rows="5">${sqlCommand?if_exists}</textarea>
+ <textarea name="sqlCommand" cols="100" rows="5">${sqlCommand!}</textarea>
</td>
</tr>
<tr>
@@ -80,7 +80,7 @@ under the License.
<#list records as record>
<tr <#if alt_row> class="alternate-row"</#if> >
<#list record as field>
- <td>${field?if_exists}</td>
+ <td>${field!}</td>
</#list>
</tr>
<#assign alt_row = !alt_row>
Modified: ofbiz/trunk/framework/webtools/webapp/webtools/entity/ListGeneric.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/entity/ListGeneric.ftl?rev=1618325&r1=1618324&r2=1618325&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/webapp/webtools/entity/ListGeneric.ftl (original)
+++ ofbiz/trunk/framework/webtools/webapp/webtools/entity/ListGeneric.ftl Sat Aug 16 10:58:51 2014
@@ -38,7 +38,7 @@ under the License.
</#if>
</td>
<#list fieldList as field>
- <td>${record.fields.get(field.name)?if_exists?string}</td>
+ <td>${record.fields.get(field.name)!?string}</td>
</#list>
</tr>
<#assign alt_row = !alt_row>
Modified: ofbiz/trunk/framework/webtools/webapp/webtools/entity/xmldsdump.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/entity/xmldsdump.ftl?rev=1618325&r1=1618324&r2=1618325&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/webapp/webtools/entity/xmldsdump.ftl (original)
+++ ofbiz/trunk/framework/webtools/webapp/webtools/entity/xmldsdump.ftl Sat Aug 16 10:58:51 2014
@@ -16,7 +16,7 @@ KIND, either express or implied. See th
specific language governing permissions and limitations
under the License.
-->
-<#if tobrowser?exists && tobrowser>
+<#if tobrowser?? && tobrowser>
<h1>${uiLabelMap.WebtoolsExportFromDataSource}</h1>
<br />
<p>This page can be used to export data from the database. The exported documents will have a root tag of "<entity-engine-xml>".</p>
@@ -59,7 +59,7 @@ under the License.
<table class="basic-table">
<tr>
<td class="label">${uiLabelMap.WebtoolsOutputDirectory}</td>
- <td><input type="text" size="60" name="outpath" value="${parameters.outpath?if_exists}"/></td>
+ <td><input type="text" size="60" name="outpath" value="${parameters.outpath!}"/></td>
</tr>
<tr>
<td class="label">${uiLabelMap.WebtoolsMaxRecordsPerFile}</td>
@@ -67,7 +67,7 @@ under the License.
</tr>
<tr>
<td class="label">${uiLabelMap.WebtoolsSingleFilename}</td>
- <td><input type="text" size="60" name="filename" value="${parameters.filename?if_exists}"/></td>
+ <td><input type="text" size="60" name="filename" value="${parameters.filename!}"/></td>
</tr>
<tr>
<td class="label">${uiLabelMap.WebtoolsRecordsUpdatedSince}</td>
@@ -90,7 +90,7 @@ under the License.
<p>${uiLabelMap.WebtoolsEntityNames}:</p>
<@displayButtonBar/>
<div>${uiLabelMap.WebtoolsEntitySyncDump}:
- <input name="entitySyncId" size="30" value="${entitySyncId?if_exists}"/>
+ <input name="entitySyncId" size="30" value="${entitySyncId!}"/>
</div>
${uiLabelMap.WebtoolsPreConfiguredSet}:
<select name="preConfiguredSetName">
Modified: ofbiz/trunk/framework/webtools/webapp/webtools/labelmanager/SearchLabels.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/labelmanager/SearchLabels.ftl?rev=1618325&r1=1618324&r2=1618325&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/webapp/webtools/labelmanager/SearchLabels.ftl (original)
+++ ofbiz/trunk/framework/webtools/webapp/webtools/labelmanager/SearchLabels.ftl Sat Aug 16 10:58:51 2014
@@ -25,7 +25,7 @@ under the License.
${uiLabelMap.WebtoolsLabelManagerKey}
</td>
<td>
- <input type="text" name="labelKey" size="30" maxlength="70" value="${parameters.labelKey?if_exists}" />
+ <input type="text" name="labelKey" size="30" maxlength="70" value="${parameters.labelKey!}" />
</td>
<td class="label">
${uiLabelMap.WebtoolsLabelManagerComponentName}
@@ -34,7 +34,7 @@ under the License.
<select name="labelComponentName">
<option value="">${uiLabelMap.WebtoolsLabelManagerAllComponents}</option>
<#list componentNamesFound as componentNameFound>
- <option <#if parameters.labelComponentName?exists && parameters.labelComponentName == componentNameFound>selected="selected"</#if> value="${componentNameFound}">${componentNameFound}</option>
+ <option <#if parameters.labelComponentName?? && parameters.labelComponentName == componentNameFound>selected="selected"</#if> value="${componentNameFound}">${componentNameFound}</option>
</#list>
</select>
</td>
@@ -48,7 +48,7 @@ under the License.
<option value="">${uiLabelMap.WebtoolsLabelManagerAllFiles}</option>
<#list filesFound as fileInfo>
<#assign fileName = fileInfo.getFileName()/>
- <option <#if parameters.labelFileName?exists && parameters.labelFileName == fileName>selected="selected"</#if> value="${fileName}">${fileName}</option>
+ <option <#if parameters.labelFileName?? && parameters.labelFileName == fileName>selected="selected"</#if> value="${fileName}">${fileName}</option>
</#list>
</select>
</td>
@@ -59,7 +59,7 @@ under the License.
<select name="labelLocaleName">
<option value="">${uiLabelMap.WebtoolsLabelManagerAllLocales}</option>
<#list localesFound as localeFound>
- <#assign locale = Static["org.ofbiz.base.util.UtilMisc"].parseLocale(localeFound)?if_exists/>
+ <#assign locale = Static["org.ofbiz.base.util.UtilMisc"].parseLocale(localeFound)!/>
<#assign langAttr = localeFound.toString()?replace("_", "-")>
<#assign langDir = "ltr">
<#if 1 < langAttr?length>
@@ -67,7 +67,7 @@ under the License.
<#assign langDir = "rtl">
</#if>
</#if>
- <option <#if parameters.labelLocaleName?exists && parameters.labelLocaleName == localeFound>selected="selected"</#if> value="${localeFound}" lang="${langAttr}" dir="${langDir}"><#if locale?exists && locale?has_content>${locale.getDisplayName(locale)}<#else>${localeFound}</#if></option>
+ <option <#if parameters.labelLocaleName?? && parameters.labelLocaleName == localeFound>selected="selected"</#if> value="${localeFound}" lang="${langAttr}" dir="${langDir}"><#if locale?? && locale?has_content>${locale.getDisplayName(locale)}<#else>${localeFound}</#if></option>
</#list>
</select>
</td>
@@ -77,13 +77,13 @@ under the License.
${uiLabelMap.WebtoolsLabelManagerOnlyNotUsedLabels}
</td>
<td>
- <input type="checkbox" name="onlyNotUsedLabels" value="Y" <#if parameters.onlyNotUsedLabels?exists && parameters.onlyNotUsedLabels == "Y">checked="checked"</#if> />
+ <input type="checkbox" name="onlyNotUsedLabels" value="Y" <#if parameters.onlyNotUsedLabels?? && parameters.onlyNotUsedLabels == "Y">checked="checked"</#if> />
</td>
<td class="label">
${uiLabelMap.WebtoolsLabelManagerOnlyMissingTranslations}
</td>
<td>
- <input type="checkbox" name="onlyMissingTranslations" value="Y" <#if parameters.onlyMissingTranslations?exists && parameters.onlyMissingTranslations == "Y">checked="checked"</#if> />
+ <input type="checkbox" name="onlyMissingTranslations" value="Y" <#if parameters.onlyMissingTranslations?? && parameters.onlyMissingTranslations == "Y">checked="checked"</#if> />
</td>
</tr>
<tr>
Modified: ofbiz/trunk/framework/webtools/webapp/webtools/labelmanager/UpdateLabel.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/labelmanager/UpdateLabel.ftl?rev=1618325&r1=1618324&r2=1618325&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/webapp/webtools/labelmanager/UpdateLabel.ftl (original)
+++ ofbiz/trunk/framework/webtools/webapp/webtools/labelmanager/UpdateLabel.ftl Sat Aug 16 10:58:51 2014
@@ -31,7 +31,7 @@ under the License.
<tr>
<td class="label">${uiLabelMap.WebtoolsLabelManagerKey}</td>
<td>
- <#if parameters.sourceKey?exists>
+ <#if parameters.sourceKey??>
${parameters.sourceKey}
<input type="hidden" name="key" value="${parameters.sourceKey}" />
<input type="hidden" name="update_label" value="Y" />
@@ -44,20 +44,20 @@ under the License.
<tr>
<td class="label">${uiLabelMap.WebtoolsLabelManagerKeyComment}</td>
<td>
- <input type="text" name="keyComment" size="70" value="${parameters.sourceKeyComment?if_exists}" />
+ <input type="text" name="keyComment" size="70" value="${parameters.sourceKeyComment!}" />
</td>
</tr>
<tr>
<td class="label">${uiLabelMap.WebtoolsLabelManagerFileName}</td>
<td>
- <#if parameters.sourceFileName?exists>
+ <#if parameters.sourceFileName??>
${parameters.sourceFileName}
<input type="hidden" name="fileName" value="${parameters.sourceFileName}" />
<#else>
<select name="fileName">
<#list filesFound as fileInfo>
<#assign fileName = fileInfo.file.getName()/>
- <option <#if parameters.fileName?exists && parameters.fileName == fileName>selected="selected"</#if> value="${fileName}">${fileName}</option>
+ <option <#if parameters.fileName?? && parameters.fileName == fileName>selected="selected"</#if> value="${fileName}">${fileName}</option>
</#list>
</select>
</#if>
@@ -66,7 +66,7 @@ under the License.
<tr>
<td colspan="2" align="center">
<input type="submit" value="${uiLabelMap.CommonBack}"/>
- <#if parameters.sourceKey?exists>
+ <#if parameters.sourceKey??>
<input type="submit" value="${uiLabelMap.WebtoolsLabelManagerRemove}" name="removeLabel"/>
<input type="submit" value="${uiLabelMap.CommonUpdate}" name="confirm" onclick="javascript:updateAndSaveLabel()"/>
<#else>
@@ -78,21 +78,21 @@ under the License.
<#list localesFound as localeFound>
<#assign labelValue = "">
<#assign labelComment = "">
- <#if parameters.sourceKey?exists>
- <#assign value = (label.getLabelValue(localeFound))?if_exists>
+ <#if parameters.sourceKey??>
+ <#assign value = (label.getLabelValue(localeFound))!>
<#if value?has_content>
<#assign labelValue = value.getLabelValue()>
<#assign labelComment = value.getLabelComment()>
</#if>
</#if>
<#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>
<tr>
- <#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))>
@@ -106,8 +106,8 @@ under the License.
</#if>
<td>
<input type="hidden" name="localeNames" value="${localeFound}" />
- <input type="text" name="localeValues" size="70" value="${labelValue?if_exists}" />
- <input type="text" name="localeComments" size="70" value="${labelComment?if_exists}" />
+ <input type="text" name="localeValues" size="70" value="${labelValue!}" />
+ <input type="text" name="localeComments" size="70" value="${labelComment!}" />
</td>
</tr>
</#if>
@@ -115,7 +115,7 @@ under the License.
<tr>
<td colspan="2" align="center">
<input type="submit" value="${uiLabelMap.CommonBack}"/>
- <#if parameters.sourceKey?exists>
+ <#if parameters.sourceKey??>
<input type="submit" value="${uiLabelMap.WebtoolsLabelManagerRemove}" name="removeLabel"/>
<input type="submit" value="${uiLabelMap.CommonUpdate}" name="confirm" onclick="javascript:updateAndSaveLabel()"/>
<#else>
Modified: ofbiz/trunk/framework/webtools/webapp/webtools/labelmanager/ViewFile.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/labelmanager/ViewFile.ftl?rev=1618325&r1=1618324&r2=1618325&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/webapp/webtools/labelmanager/ViewFile.ftl (original)
+++ ofbiz/trunk/framework/webtools/webapp/webtools/labelmanager/ViewFile.ftl Sat Aug 16 10:58:51 2014
@@ -20,11 +20,11 @@ under the License.
<table class="basic-table" cellspacing="3">
<tr>
<td class="label">${uiLabelMap.WebtoolsLabelManagerKey}</td>
- <td>${parameters.sourceKey?if_exists}</td>
+ <td>${parameters.sourceKey!}</td>
</tr>
<tr>
<td class="label">${uiLabelMap.WebtoolsLabelManagerFileName}</td>
- <td>${parameters.fileName?if_exists}</td>
+ <td>${parameters.fileName!}</td>
</tr>
<tr>
<td colspan="2"> </td>