You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by as...@apache.org on 2014/08/16 13:35:02 UTC
svn commit: r1618336 [12/21] - in /ofbiz/trunk/applications:
accounting/webapp/accounting/agreement/ accounting/webapp/accounting/common/
accounting/webapp/accounting/finaccounttrans/
accounting/webapp/accounting/invoice/ accounting/webapp/accounting/p...
Modified: ofbiz/trunk/applications/party/webapp/partymgr/party/contactmechtemplates/PostalAddress_USA.fo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/party/contactmechtemplates/PostalAddress_USA.fo.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/webapp/partymgr/party/contactmechtemplates/PostalAddress_USA.fo.ftl (original)
+++ ofbiz/trunk/applications/party/webapp/partymgr/party/contactmechtemplates/PostalAddress_USA.fo.ftl Sat Aug 16 11:34:57 2014
@@ -16,9 +16,9 @@ KIND, either express or implied. See th
specific language governing permissions and limitations
under the License.
-->
- <fo:block>${postalAddress.address1?if_exists}</fo:block>
- <#if postalAddress.address2?has_content><fo:block>${postalAddress.address2?if_exists}</fo:block></#if>
- <fo:block>${postalAddress.city?if_exists}<#if postalAddress.stateProvinceGeoId?has_content>, ${postalAddress.stateProvinceGeoId}</#if> ${postalAddress.postalCode?if_exists}</fo:block>
+ <fo:block>${postalAddress.address1!}</fo:block>
+ <#if postalAddress.address2?has_content><fo:block>${postalAddress.address2!}</fo:block></#if>
+ <fo:block>${postalAddress.city!}<#if postalAddress.stateProvinceGeoId?has_content>, ${postalAddress.stateProvinceGeoId}</#if> ${postalAddress.postalCode!}</fo:block>
<#if postalAddress.countryGeoId?has_content>
<fo:block>
<#assign country = postalAddress.getRelatedOne("CountryGeo", true)>
Modified: ofbiz/trunk/applications/party/webapp/partymgr/party/contactmechtemplates/PostalAddress_USA.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/party/contactmechtemplates/PostalAddress_USA.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/webapp/partymgr/party/contactmechtemplates/PostalAddress_USA.ftl (original)
+++ ofbiz/trunk/applications/party/webapp/partymgr/party/contactmechtemplates/PostalAddress_USA.ftl Sat Aug 16 11:34:57 2014
@@ -19,21 +19,21 @@ under the License.
<div>
<#if postalAddress.toName?has_content><b>${uiLabelMap.PartyAddrToName}:</b> ${postalAddress.toName}<br /></#if>
<#if postalAddress.attnName?has_content><b>${uiLabelMap.PartyAddrAttnName}:</b> ${postalAddress.attnName}<br /></#if>
- ${postalAddress.address1?if_exists}<br />
+ ${postalAddress.address1!}<br />
<#if postalAddress.address2?has_content>${postalAddress.address2}<br /></#if>
- ${postalAddress.city?if_exists},
+ ${postalAddress.city!},
<#if postalAddress.stateProvinceGeoId?has_content>
<#assign stateProvince = postalAddress.getRelatedOne("StateProvinceGeo", true)>
${stateProvince.abbreviation?default(stateProvince.geoId)}
</#if>
- ${postalAddress.postalCode?if_exists}
+ ${postalAddress.postalCode!}
<#if postalAddress.countryGeoId?has_content><br />
<#assign country = postalAddress.getRelatedOne("CountryGeo", true)>
${country.get("geoName", locale)?default(country.geoId)}
</#if>
</div>
<#if !postalAddress.countryGeoId?has_content>
- <#assign addr1 = postalAddress.address1?if_exists>
+ <#assign addr1 = postalAddress.address1!>
<#if addr1?has_content && (addr1.indexOf(" ") > 0)>
<#assign addressNum = addr1.substring(0, addr1.indexOf(" "))>
<#assign addressOther = addr1.substring(addr1.indexOf(" ")+1)>
Modified: ofbiz/trunk/applications/party/webapp/partymgr/party/editGeoLocation.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/party/editGeoLocation.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/webapp/partymgr/party/editGeoLocation.ftl (original)
+++ ofbiz/trunk/applications/party/webapp/partymgr/party/editGeoLocation.ftl Sat Aug 16 11:34:57 2014
@@ -125,8 +125,8 @@ under the License.
</form>
<br/><br/>
<form id="updateMapForm" method="post" action="<@o...@ofbizUrl>">
- <input type="hidden" name="partyId" value="${partyId?if_exists}"/>
- <input type="hidden" name="geoPointId" value="${geoPointId?if_exists}"/>
+ <input type="hidden" name="partyId" value="${partyId!}"/>
+ <input type="hidden" name="geoPointId" value="${geoPointId!}"/>
<input type="hidden" name="lat" id="lat"/>
<input type="hidden" name="lng" id="lng"/>
<input type="submit" id="createMapButton" class="smallSubmit" value="${uiLabelMap.CommonSubmit}">
Modified: ofbiz/trunk/applications/party/webapp/partymgr/party/editShoppingList.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/party/editShoppingList.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/webapp/partymgr/party/editShoppingList.ftl (original)
+++ ofbiz/trunk/applications/party/webapp/partymgr/party/editShoppingList.ftl Sat Aug 16 11:34:57 2014
@@ -24,7 +24,7 @@ under the License.
<li class="h3">${uiLabelMap.PartyShoppingLists}</li>
<li>
<form id="createEmptyShoppingList" action="<@o...@ofbizUrl>" method="post">
- <input type="hidden" name="partyId" value="${partyId?if_exists}" />
+ <input type="hidden" name="partyId" value="${partyId!}" />
<a href="javascript:document.getElementById('createEmptyShoppingList').submit();" class="buttontext">${uiLabelMap.CommonCreateNew}</a>
</form>
</li>
@@ -43,7 +43,7 @@ under the License.
<option value="${list.shoppingListId}">${list.listName}</option>
</#list>
</select>
- <input type="hidden" name="partyId" value="${partyId?if_exists}" />
+ <input type="hidden" name="partyId" value="${partyId!}" />
<a href="javascript:document.selectShoppingList.submit();" class="smallSubmit">${uiLabelMap.CommonEdit}</a>
</form>
<#else>
@@ -61,19 +61,19 @@ under the License.
<li>
<form method="post" name="createQuoteFromShoppingListForm" action="/ordermgr/control/createQuoteFromShoppingList">
<input type= "hidden" name= "applyStorePromotions" value= "N"/>
- <input type= "hidden" name= "shoppingListId" value= "${shoppingList.shoppingListId?if_exists}"/>
+ <input type= "hidden" name= "shoppingListId" value= "${shoppingList.shoppingListId!}"/>
</form>
<a href="javascript:document.createQuoteFromShoppingListForm.submit()">${uiLabelMap.PartyCreateNewQuote}</a>
</li>
- <li><a href="/ordermgr/control/createCustRequestFromShoppingList?shoppingListId=${shoppingList.shoppingListId?if_exists}">${uiLabelMap.PartyCreateNewCustRequest}</a></li>
- <li><a href="/ordermgr/control/loadCartFromShoppingList?shoppingListId=${shoppingList.shoppingListId?if_exists}">${uiLabelMap.OrderNewOrder}</a></li>
+ <li><a href="/ordermgr/control/createCustRequestFromShoppingList?shoppingListId=${shoppingList.shoppingListId!}">${uiLabelMap.PartyCreateNewCustRequest}</a></li>
+ <li><a href="/ordermgr/control/loadCartFromShoppingList?shoppingListId=${shoppingList.shoppingListId!}">${uiLabelMap.OrderNewOrder}</a></li>
</ul>
<br class="clear"/>
</div>
<div class="screenlet-body">
<form name="updateList" method="post" action="<@o...@ofbizUrl>">
<input type="hidden" name="shoppingListId" value="${shoppingList.shoppingListId}" />
- <input type="hidden" name="partyId" value="${shoppingList.partyId?if_exists}" />
+ <input type="hidden" name="partyId" value="${shoppingList.partyId!}" />
<table class="basic-table" cellspacing='0'>
<tr>
<td class="label">${uiLabelMap.PartyListName}</td>
@@ -81,13 +81,13 @@ under the License.
</tr>
<tr>
<td class="label">${uiLabelMap.CommonDescription}</td>
- <td><input type="text" size="70" name="description" value="${shoppingList.description?if_exists}" <#if shoppingList.listName?default("") == "auto-save">disabled="disabled"</#if> />
+ <td><input type="text" size="70" name="description" value="${shoppingList.description!}" <#if shoppingList.listName?default("") == "auto-save">disabled="disabled"</#if> />
</tr>
<tr>
<td class="label">${uiLabelMap.PartyListType}</td>
<td>
<select name="shoppingListTypeId" <#if shoppingList.listName?default("") == "auto-save">disabled</#if>>
- <#if shoppingListType?exists>
+ <#if shoppingListType??>
<option value="${shoppingListType.shoppingListTypeId}">${shoppingListType.get("description",locale)?default(shoppingListType.shoppingListTypeId)}</option>
<option value="${shoppingListType.shoppingListTypeId}">--</option>
</#if>
@@ -112,7 +112,7 @@ under the License.
<td class="label">${uiLabelMap.PartyParentList}</td>
<td>
<select name="parentShoppingListId" <#if shoppingList.listName?default("") == "auto-save">disabled</#if>>
- <#if parentShoppingList?exists>
+ <#if parentShoppingList??>
<option value="${parentShoppingList.shoppingListId}">${parentShoppingList.listName?default(parentShoppingList.shoppingListId)}</option>
</#if>
<option value="">${uiLabelMap.PartyNoParent}</option>
@@ -120,7 +120,7 @@ under the License.
<option value="${newParShoppingList.shoppingListId}">${newParShoppingList.listName?default(newParShoppingList.shoppingListId)}</option>
</#list>
</select>
- <#if parentShoppingList?exists>
+ <#if parentShoppingList??>
<a href="<@o...@ofbizUrl>" class="smallSubmit">${uiLabelMap.CommonGotoParent} (${parentShoppingList.listName?default(parentShoppingList.shoppingListId)})</a>
</#if>
</td>
@@ -178,7 +178,7 @@ under the License.
<#if shoppingListItemDatas?has_content>
<#-- Pagination -->
<#include "component://common/webcommon/includes/htmlTemplate.ftl"/>
- <#assign commonUrl = "editShoppingList?partyId=" + partyId + "&shoppingListId="+shoppingListId?if_exists+"&"/>
+ <#assign commonUrl = "editShoppingList?partyId=" + partyId + "&shoppingListId="+shoppingListId!+"&"/>
<#assign viewIndexFirst = 0/>
<#assign viewIndexPrevious = viewIndex - 1/>
<#assign viewIndexNext = viewIndex + 1/>
@@ -202,11 +202,11 @@ under the License.
<#assign productContentWrapper = Static["org.ofbiz.product.product.ProductContentWrapper"].makeProductContentWrapper(product, request)>
<#assign unitPrice = shoppingListItemData.unitPrice>
<#assign totalPrice = shoppingListItemData.totalPrice>
- <#assign productVariantAssocs = shoppingListItemData.productVariantAssocs?if_exists>
- <#assign isVirtual = product.isVirtual?exists && product.isVirtual.equals("Y")>
+ <#assign productVariantAssocs = shoppingListItemData.productVariantAssocs!>
+ <#assign isVirtual = product.isVirtual?? && product.isVirtual.equals("Y")>
<tr valign="middle"<#if alt_row> class="alternate-row"</#if>>
<td><a href="/catalog/control/EditProduct?productId=${shoppingListItem.productId}&externalLoginKey=${requestAttributes.externalLoginKey}">${shoppingListItem.productId} -
- ${productContentWrapper.get("PRODUCT_NAME")?default("No Name")}</a> : ${productContentWrapper.get("DESCRIPTION")?if_exists}
+ ${productContentWrapper.get("PRODUCT_NAME")?default("No Name")}</a> : ${productContentWrapper.get("DESCRIPTION")!}
</td>
<form method="post" action="<@o...@ofbizUrl>" name='removeform_${shoppingListItem.shoppingListItemSeqId}'>
<input type="hidden" name="shoppingListId" value="${shoppingListItem.shoppingListId}" />
@@ -221,7 +221,7 @@ under the License.
<td>
<input size="6" type="text" name="quantityPurchased"
<#if shoppingListItem.quantityPurchased?has_content>
- value="${shoppingListItem.quantityPurchased?if_exists?string.number}"
+ value="${shoppingListItem.quantityPurchased!?string.number}"
</#if> />
</td>
</form>
@@ -253,7 +253,7 @@ under the License.
<div class="screenlet-body">
<form name="addToShoppingList" method="post" action="<@o...@ofbizUrl>">
<input type="hidden" name="shoppingListId" value="${shoppingList.shoppingListId}" />
- <input type="hidden" name="partyId" value="${shoppingList.partyId?if_exists}" />
+ <input type="hidden" name="partyId" value="${shoppingList.partyId!}" />
<input type="text" name="productId" value="" />
<input type="text" size="5" name="quantity" value="${requestParameters.quantity?default("1")}" />
<input type="submit" value="${uiLabelMap.PartyAddToShoppingList}" />
Modified: ofbiz/trunk/applications/party/webapp/partymgr/party/editcontactmech.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/party/editcontactmech.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/webapp/partymgr/party/editcontactmech.ftl (original)
+++ ofbiz/trunk/applications/party/webapp/partymgr/party/editcontactmech.ftl Sat Aug 16 11:34:57 2014
@@ -16,7 +16,7 @@ KIND, either express or implied. See th
specific language governing permissions and limitations
under the License.
-->
-<#if !mechMap.contactMech?exists>
+<#if !mechMap.contactMech??>
<#-- When creating a new contact mech, first select the type, then actually create -->
<#if !preContactMechTypeId?has_content>
<h1>${uiLabelMap.PartyCreateNewContact}</h1>
@@ -42,8 +42,8 @@ under the License.
<#if !mechMap.contactMech?has_content>
<h1>${uiLabelMap.PartyCreateNewContact}</h1>
<div id="mech-purpose-types">
- <#if contactMechPurposeType?exists>
- <p>(${uiLabelMap.PartyMsgContactHavePurpose} <b>"${contactMechPurposeType.get("description",locale)?if_exists}"</b>)</p>
+ <#if contactMechPurposeType??>
+ <p>(${uiLabelMap.PartyMsgContactHavePurpose} <b>"${contactMechPurposeType.get("description",locale)!}"</b>)</p>
</#if>
<table class="basic-table" cellspacing="0">
<form method="post" action="<@o...@ofbizUrl>" name="editcontactmechform" id="editcontactmechform">
@@ -51,8 +51,8 @@ under the License.
<input type="hidden" name="contactMechTypeId" value="${mechMap.contactMechTypeId}" />
<input type="hidden" name="partyId" value="${partyId}" />
<#if cmNewPurposeTypeId?has_content><input type="hidden" name="contactMechPurposeTypeId" value="${cmNewPurposeTypeId}" /></#if>
- <#if preContactMechTypeId?exists><input type="hidden" name="preContactMechTypeId" value="${preContactMechTypeId}" /></#if>
- <#if contactMechPurposeTypeId?exists><input type="hidden" name="contactMechPurposeTypeId" value="${contactMechPurposeTypeId?if_exists}" /></#if>
+ <#if preContactMechTypeId??><input type="hidden" name="preContactMechTypeId" value="${preContactMechTypeId}" /></#if>
+ <#if contactMechPurposeTypeId??><input type="hidden" name="contactMechPurposeTypeId" value="${contactMechPurposeTypeId!}" /></#if>
<#if paymentMethodId?has_content><input type='hidden' name='paymentMethodId' value='${paymentMethodId}' /></#if>
<#else>
<h1>${uiLabelMap.PartyEditContactInformation}</h1>
@@ -95,7 +95,7 @@ under the License.
<input type="hidden" name="partyId" value="${partyId}" />
<input type="hidden" name="DONE_PAGE" value="${donePage}" />
<input type="hidden" name="useValues" value="true" />
- <input type="hidden" name="contactMechId" value="${contactMechId?if_exists}" />
+ <input type="hidden" name="contactMechId" value="${contactMechId!}" />
<td class="button-col">
<select name="contactMechPurposeTypeId">
<option></option>
@@ -114,37 +114,37 @@ under the License.
<input type="hidden" name="contactMechId" value="${contactMechId}" />
<input type="hidden" name="contactMechTypeId" value="${mechMap.contactMechTypeId}" />
<input type="hidden" name="partyId" value="${partyId}" />
- <input type="hidden" name="DONE_PAGE" value="${donePage?if_exists}" />
+ <input type="hidden" name="DONE_PAGE" value="${donePage!}" />
</#if>
- <#if "POSTAL_ADDRESS" = mechMap.contactMechTypeId?if_exists>
+ <#if "POSTAL_ADDRESS" = mechMap.contactMechTypeId!>
<tr>
<td class="label">${uiLabelMap.PartyToName}</td>
<td>
- <input type="text" size="50" maxlength="100" name="toName" value="${(mechMap.postalAddress.toName)?default(request.getParameter('toName')?if_exists)}" />
+ <input type="text" size="50" maxlength="100" name="toName" value="${(mechMap.postalAddress.toName)?default(request.getParameter('toName')!)}" />
</td>
</tr>
<tr>
<td class="label">${uiLabelMap.PartyAttentionName}</td>
<td>
- <input type="text" size="50" maxlength="100" name="attnName" value="${(mechMap.postalAddress.attnName)?default(request.getParameter('attnName')?if_exists)}" />
+ <input type="text" size="50" maxlength="100" name="attnName" value="${(mechMap.postalAddress.attnName)?default(request.getParameter('attnName')!)}" />
</td>
</tr>
<tr>
<td class="label">${uiLabelMap.PartyAddressLine1} *</td>
<td>
- <input type="text" size="100" maxlength="255" name="address1" value="${(mechMap.postalAddress.address1)?default(request.getParameter('address1')?if_exists)}" />
+ <input type="text" size="100" maxlength="255" name="address1" value="${(mechMap.postalAddress.address1)?default(request.getParameter('address1')!)}" />
</td>
</tr>
<tr>
<td class="label">${uiLabelMap.PartyAddressLine2}</td>
<td>
- <input type="text" size="100" maxlength="255" name="address2" value="${(mechMap.postalAddress.address2)?default(request.getParameter('address2')?if_exists)}" />
+ <input type="text" size="100" maxlength="255" name="address2" value="${(mechMap.postalAddress.address2)?default(request.getParameter('address2')!)}" />
</td>
</tr>
<tr>
<td class="label">${uiLabelMap.PartyCity} *</td>
<td>
- <input type="text" size="50" maxlength="100" name="city" value="${(mechMap.postalAddress.city)?default(request.getParameter('city')?if_exists)}" />
+ <input type="text" size="50" maxlength="100" name="city" value="${(mechMap.postalAddress.city)?default(request.getParameter('city')!)}" />
</td>
</tr>
<tr>
@@ -157,7 +157,7 @@ under the License.
<tr>
<td class="label">${uiLabelMap.PartyZipCode} *</td>
<td>
- <input type="text" size="30" maxlength="60" name="postalCode" value="${(mechMap.postalAddress.postalCode)?default(request.getParameter('postalCode')?if_exists)}" />
+ <input type="text" size="30" maxlength="60" name="postalCode" value="${(mechMap.postalAddress.postalCode)?default(request.getParameter('postalCode')!)}" />
</td>
</tr>
<tr>
@@ -166,7 +166,7 @@ under the License.
<td>
<select name="countryGeoId" id="editcontactmechform_countryGeoId">
${screens.render("component://common/widget/CommonScreens.xml#countries")}
- <#if (mechMap.postalAddress?exists) && (mechMap.postalAddress.countryGeoId?exists)>
+ <#if (mechMap.postalAddress??) && (mechMap.postalAddress.countryGeoId??)>
<#assign defaultCountryGeoId = mechMap.postalAddress.countryGeoId>
<#else>
<#assign defaultCountryGeoId = Static["org.ofbiz.base.util.UtilProperties"].getPropertyValue("general.properties", "country.geo.id.default")>
@@ -185,32 +185,32 @@ under the License.
</td>
</tr>
- <#elseif "TELECOM_NUMBER" = mechMap.contactMechTypeId?if_exists>
+ <#elseif "TELECOM_NUMBER" = mechMap.contactMechTypeId!>
<tr>
<td class="label">${uiLabelMap.PartyPhoneNumber}</td>
<td>
- <input type="text" size="4" maxlength="10" name="countryCode" value="${(mechMap.telecomNumber.countryCode)?default(request.getParameter('countryCode')?if_exists)}" />
- - <input type="text" size="4" maxlength="10" name="areaCode" value="${(mechMap.telecomNumber.areaCode)?default(request.getParameter('areaCode')?if_exists)}" />
- - <input type="text" size="15" maxlength="15" name="contactNumber" value="${(mechMap.telecomNumber.contactNumber)?default(request.getParameter('contactNumber')?if_exists)}" />
- ${uiLabelMap.PartyContactExt} <input type="text" size="6" maxlength="10" name="extension" value="${(mechMap.partyContactMech.extension)?default(request.getParameter('extension')?if_exists)}" />
+ <input type="text" size="4" maxlength="10" name="countryCode" value="${(mechMap.telecomNumber.countryCode)?default(request.getParameter('countryCode')!)}" />
+ - <input type="text" size="4" maxlength="10" name="areaCode" value="${(mechMap.telecomNumber.areaCode)?default(request.getParameter('areaCode')!)}" />
+ - <input type="text" size="15" maxlength="15" name="contactNumber" value="${(mechMap.telecomNumber.contactNumber)?default(request.getParameter('contactNumber')!)}" />
+ ${uiLabelMap.PartyContactExt} <input type="text" size="6" maxlength="10" name="extension" value="${(mechMap.partyContactMech.extension)?default(request.getParameter('extension')!)}" />
</td>
</tr>
<tr>
<td class="label"></td>
<td>[${uiLabelMap.CommonCountryCode}] [${uiLabelMap.PartyAreaCode}] [${uiLabelMap.PartyContactNumber}] [${uiLabelMap.PartyContactExt}]</td>
</tr>
- <#elseif "EMAIL_ADDRESS" = mechMap.contactMechTypeId?if_exists>
+ <#elseif "EMAIL_ADDRESS" = mechMap.contactMechTypeId!>
<tr>
<td class="label">${mechMap.contactMechType.get("description",locale)}</td>
<td>
- <input type="text" size="60" maxlength="255" name="emailAddress" value="${(mechMap.contactMech.infoString)?default(request.getParameter('emailAddress')?if_exists)}" />
+ <input type="text" size="60" maxlength="255" name="emailAddress" value="${(mechMap.contactMech.infoString)?default(request.getParameter('emailAddress')!)}" />
</td>
</tr>
<#else>
<tr>
<td class="label">${mechMap.contactMechType.get("description",locale)}</td>
<td>
- <input type="text" size="60" maxlength="255" name="infoString" value="${(mechMap.contactMech.infoString)?if_exists}" />
+ <input type="text" size="60" maxlength="255" name="infoString" value="${(mechMap.contactMech.infoString)!}" />
</td>
</tr>
</#if>
Modified: ofbiz/trunk/applications/party/webapp/partymgr/party/editcreditcard.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/party/editcreditcard.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/webapp/partymgr/party/editcreditcard.ftl (original)
+++ ofbiz/trunk/applications/party/webapp/partymgr/party/editcreditcard.ftl Sat Aug 16 11:34:57 2014
@@ -20,7 +20,7 @@ under the License.
<!-- begin editcreditcard.ftl -->
<div class="screenlet">
<div class="screenlet-title-bar">
- <#if !creditCard?exists>
+ <#if !creditCard??>
<h3>${uiLabelMap.AccountingAddNewCreditCard}</h3>
<#else>
<h3>${uiLabelMap.AccountingEditCreditCard}</h3>
@@ -31,7 +31,7 @@ under the License.
<a href="<@o...@ofbizUrl>" class="smallSubmit">${uiLabelMap.CommonCancelDone}</a>
<a href="javascript:document.editcreditcardform.submit()" class="smallSubmit">${uiLabelMap.CommonSave}</a>
</div>
- <#if !creditCard?exists>
+ <#if !creditCard??>
<form method="post" action="<@o...@ofbizUrl>" name="editcreditcardform" style="margin: 0;">
<#else>
<form method="post" action="<@o...@ofbizUrl>" name="editcreditcardform" style="margin: 0;">
@@ -62,20 +62,20 @@ under the License.
<#list curPartyContactMechPurposes as curPartyContactMechPurpose>
<#assign curContactMechPurposeType = curPartyContactMechPurpose.getRelatedOne("ContactMechPurposeType", true)>
<p>
- <b>${curContactMechPurposeType.get("description",locale)?if_exists}</b>
- <#if curPartyContactMechPurpose.thruDate?exists>
+ <b>${curContactMechPurposeType.get("description",locale)!}</b>
+ <#if curPartyContactMechPurpose.thruDate??>
(${uiLabelMap.CommonExpire}:${curPartyContactMechPurpose.thruDate.toString()})
</#if>
</p>
</#list>
- <#if curPostalAddress.toName?exists><p><b>${uiLabelMap.CommonTo}:</b> ${curPostalAddress.toName}</p></#if>
- <#if curPostalAddress.attnName?exists><p><b>${uiLabelMap.PartyAddrAttnName}:</b> ${curPostalAddress.attnName}</p></#if>
- <#if curPostalAddress.address1?exists><p>${curPostalAddress.address1}</p></#if>
- <#if curPostalAddress.address2?exists><p>${curPostalAddress.address2}</p></#if>
- <p>${curPostalAddress.city?if_exists}<#if curPostalAddress.stateProvinceGeoId?has_content>, ${curPostalAddress.stateProvinceGeoId?if_exists}</#if> ${curPostalAddress.postalCode?if_exists}</p>
- <#if curPostalAddress.countryGeoId?exists><p>${curPostalAddress.countryGeoId}</p></#if>
- <p>(${uiLabelMap.CommonUpdated}: ${(curPartyContactMech.fromDate.toString())?if_exists})</p>
- <#if curPartyContactMech.thruDate?exists><p><b>${uiLabelMap.CommonDelete}: ${curPartyContactMech.thruDate.toString()}</b></p></#if>
+ <#if curPostalAddress.toName??><p><b>${uiLabelMap.CommonTo}:</b> ${curPostalAddress.toName}</p></#if>
+ <#if curPostalAddress.attnName??><p><b>${uiLabelMap.PartyAddrAttnName}:</b> ${curPostalAddress.attnName}</p></#if>
+ <#if curPostalAddress.address1??><p>${curPostalAddress.address1}</p></#if>
+ <#if curPostalAddress.address2??><p>${curPostalAddress.address2}</p></#if>
+ <p>${curPostalAddress.city!}<#if curPostalAddress.stateProvinceGeoId?has_content>, ${curPostalAddress.stateProvinceGeoId!}</#if> ${curPostalAddress.postalCode!}</p>
+ <#if curPostalAddress.countryGeoId??><p>${curPostalAddress.countryGeoId}</p></#if>
+ <p>(${uiLabelMap.CommonUpdated}: ${(curPartyContactMech.fromDate.toString())!})</p>
+ <#if curPartyContactMech.thruDate??><p><b>${uiLabelMap.CommonDelete}: ${curPartyContactMech.thruDate.toString()}</b></p></#if>
</td>
</tr>
<#else>
@@ -105,22 +105,22 @@ under the License.
<#list partyContactMechPurposes as partyContactMechPurpose>
<#assign contactMechPurposeType = partyContactMechPurpose.getRelatedOne("ContactMechPurposeType", true)>
<p>
- <b>${contactMechPurposeType.get("description",locale)?if_exists}</b>
- <#if partyContactMechPurpose.thruDate?exists>(${uiLabelMap.CommonExpire}:${partyContactMechPurpose.thruDate})</#if>
+ <b>${contactMechPurposeType.get("description",locale)!}</b>
+ <#if partyContactMechPurpose.thruDate??>(${uiLabelMap.CommonExpire}:${partyContactMechPurpose.thruDate})</#if>
</p>
</#list>
- <#if postalAddress.toName?exists><p><b>${uiLabelMap.CommonTo}:</b> ${postalAddress.toName}</p></#if>
- <#if postalAddress.attnName?exists><p><b>${uiLabelMap.PartyAddrAttnName}:</b> ${postalAddress.attnName}</p></#if>
- <#if postalAddress.address1?exists><p>${postalAddress.address1}</p></#if>
- <#if postalAddress.address2?exists><p>${postalAddress.address2}</p></#if>
- <p>${postalAddress.city}<#if postalAddress.stateProvinceGeoId?has_content>, ${postalAddress.stateProvinceGeoId}</#if> ${postalAddress.postalCode?if_exists}</p>
- <#if postalAddress.countryGeoId?exists><p>${postalAddress.countryGeoId}</p></#if>
- <p>(${uiLabelMap.CommonUpdated}: ${(partyContactMech.fromDate.toString())?if_exists})</p>
- <#if partyContactMech.thruDate?exists><p><b>${uiLabelMap.CommonDelete}: ${partyContactMech.thruDate.toString()}</b></p></#if>
+ <#if postalAddress.toName??><p><b>${uiLabelMap.CommonTo}:</b> ${postalAddress.toName}</p></#if>
+ <#if postalAddress.attnName??><p><b>${uiLabelMap.PartyAddrAttnName}:</b> ${postalAddress.attnName}</p></#if>
+ <#if postalAddress.address1??><p>${postalAddress.address1}</p></#if>
+ <#if postalAddress.address2??><p>${postalAddress.address2}</p></#if>
+ <p>${postalAddress.city}<#if postalAddress.stateProvinceGeoId?has_content>, ${postalAddress.stateProvinceGeoId}</#if> ${postalAddress.postalCode!}</p>
+ <#if postalAddress.countryGeoId??><p>${postalAddress.countryGeoId}</p></#if>
+ <p>(${uiLabelMap.CommonUpdated}: ${(partyContactMech.fromDate.toString())!})</p>
+ <#if partyContactMech.thruDate??><p><b>${uiLabelMap.CommonDelete}: ${partyContactMech.thruDate.toString()}</b></p></#if>
</td>
</tr>
</#list>
- <#if !postalAddressInfos?has_content && !curContactMech?exists>
+ <#if !postalAddressInfos?has_content && !curContactMech??>
<tr><td colspan="2">${uiLabelMap.PartyNoContactInformation}.</td></tr>
</#if>
<#-- not yet supported in party manager
Modified: ofbiz/trunk/applications/party/webapp/partymgr/party/editeftaccount.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/party/editeftaccount.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/webapp/partymgr/party/editeftaccount.ftl (original)
+++ ofbiz/trunk/applications/party/webapp/partymgr/party/editeftaccount.ftl Sat Aug 16 11:34:57 2014
@@ -20,7 +20,7 @@ under the License.
<!-- begin editeftaccount.ftl -->
<div class="screenlet">
<div class="screenlet-title-bar">
- <#if !eftAccount?exists>
+ <#if !eftAccount??>
<h3>${uiLabelMap.AccountingAddNewEftAccount}</h3>
<#else>
<h3>${uiLabelMap.PageTitleEditEftAccount}</h3>
@@ -31,7 +31,7 @@ under the License.
<a href="<@o...@ofbizUrl>" class="smallSubmit">${uiLabelMap.CommonCancelDone}</a>
<a href="javascript:document.editeftaccountform.submit()" class="smallSubmit">${uiLabelMap.CommonSave}</a>
</div>
- <#if !eftAccount?exists>
+ <#if !eftAccount??>
<form method="post" action='<@o...@ofbizUrl>' name="editeftaccountform" style='margin: 0;'>
<#else>
<form method="post" action='<@o...@ofbizUrl>' name="editeftaccountform" style='margin: 0;'>
@@ -42,27 +42,27 @@ under the License.
<tr>
<td class="label">${uiLabelMap.AccountingNameAccount}</td>
<td>
- <input type="text" class='required' size="30" maxlength="60" name="nameOnAccount" value="${eftAccountData.nameOnAccount?if_exists}" />
+ <input type="text" class='required' size="30" maxlength="60" name="nameOnAccount" value="${eftAccountData.nameOnAccount!}" />
<span class="tooltip">${uiLabelMap.CommonRequired}</span>
</td>
</tr>
<tr>
<td class="label">${uiLabelMap.AccountingCompanyNameAccount}</td>
<td>
- <input type="text" size="30" maxlength="60" name="companyNameOnAccount" value="${eftAccountData.companyNameOnAccount?if_exists}" />
+ <input type="text" size="30" maxlength="60" name="companyNameOnAccount" value="${eftAccountData.companyNameOnAccount!}" />
</td>
</tr>
<tr>
<td class="label">${uiLabelMap.AccountingBankName}</td>
<td>
- <input type="text" class='required' size="30" maxlength="60" name="bankName" value="${eftAccountData.bankName?if_exists}" />
+ <input type="text" class='required' size="30" maxlength="60" name="bankName" value="${eftAccountData.bankName!}" />
<span class="tooltip">${uiLabelMap.CommonRequired}</span>
</td>
</tr>
<tr>
<td class="label">${uiLabelMap.AccountingRoutingNumber}</td>
<td>
- <input type="text" class='required' size="10" maxlength="30" name="routingNumber" value="${eftAccountData.routingNumber?if_exists}" />
+ <input type="text" class='required' size="10" maxlength="30" name="routingNumber" value="${eftAccountData.routingNumber!}" />
<span class="tooltip">${uiLabelMap.CommonRequired}</span>
</td>
</tr>
@@ -70,7 +70,7 @@ under the License.
<td class="label">${uiLabelMap.AccountingAccountType}</td>
<td>
<select name="accountType" class='required'>
- <option>${eftAccountData.accountType?if_exists}</option>
+ <option>${eftAccountData.accountType!}</option>
<option></option>
<option>${uiLabelMap.CommonChecking}</option>
<option>${uiLabelMap.CommonSavings}</option>
@@ -81,14 +81,14 @@ under the License.
<tr>
<td class="label">${uiLabelMap.AccountingAccountNumber}</td>
<td>
- <input type="text" class='required' size="20" maxlength="40" name="accountNumber" value="${eftAccountData.accountNumber?if_exists}" />
+ <input type="text" class='required' size="20" maxlength="40" name="accountNumber" value="${eftAccountData.accountNumber!}" />
<span class="tooltip">${uiLabelMap.CommonRequired}</span>
</td>
</tr>
<tr>
<td class="label">${uiLabelMap.CommonDescription}</td>
<td>
- <input type="text" class='required' size="30" maxlength="60" name="description" value="${paymentMethodData.description?if_exists}" />
+ <input type="text" class='required' size="30" maxlength="60" name="description" value="${paymentMethodData.description!}" />
<span class="tooltip">${uiLabelMap.CommonRequired}</span>
</td>
</tr>
@@ -100,7 +100,7 @@ under the License.
[Create New Address]</a>
-->
<table cellspacing="0">
- <#if curPostalAddress?exists>
+ <#if curPostalAddress??>
<tr>
<td class="button-col">
<input type="radio" name="contactMechId" value="${curContactMechId}" checked="checked" />
@@ -109,19 +109,19 @@ under the License.
<p><b>${uiLabelMap.PartyUseCurrentAddress}:</b></p>
<#list curPartyContactMechPurposes as curPartyContactMechPurpose>
<#assign curContactMechPurposeType = curPartyContactMechPurpose.getRelatedOne("ContactMechPurposeType", true)>
- <p><b>${curContactMechPurposeType.get("description",locale)?if_exists}</b></p>
- <#if curPartyContactMechPurpose.thruDate?exists>
+ <p><b>${curContactMechPurposeType.get("description",locale)!}</b></p>
+ <#if curPartyContactMechPurpose.thruDate??>
<p>(${uiLabelMap.CommonExpire}:${curPartyContactMechPurpose.thruDate.toString()})</p>
</#if>
</#list>
- <#if curPostalAddress.toName?exists><p><b>${uiLabelMap.CommonTo}:</b> ${curPostalAddress.toName}</p></#if>
- <#if curPostalAddress.attnName?exists><p><b>${uiLabelMap.PartyAddrAttnName}:</b> ${curPostalAddress.attnName}</p></#if>
- <#if curPostalAddress.address1?exists><p>${curPostalAddress.address1}</p></#if>
- <#if curPostalAddress.address2?exists><p>${curPostalAddress.address2}</p></#if>
+ <#if curPostalAddress.toName??><p><b>${uiLabelMap.CommonTo}:</b> ${curPostalAddress.toName}</p></#if>
+ <#if curPostalAddress.attnName??><p><b>${uiLabelMap.PartyAddrAttnName}:</b> ${curPostalAddress.attnName}</p></#if>
+ <#if curPostalAddress.address1??><p>${curPostalAddress.address1}</p></#if>
+ <#if curPostalAddress.address2??><p>${curPostalAddress.address2}</p></#if>
<p>${curPostalAddress.city}<#if curPostalAddress.stateProvinceGeoId?has_content>, ${curPostalAddress.stateProvinceGeoId}</#if> ${curPostalAddress.postalCode}</p>
- <#if curPostalAddress.countryGeoId?exists><p>${curPostalAddress.countryGeoId}</p></#if>
- <p>(${uiLabelMap.CommonUpdated}: ${(curPartyContactMech.fromDate.toString())?if_exists})</p>
- <#if curPartyContactMech.thruDate?exists><p><b>${uiLabelMap.CommonDelete}: ${curPartyContactMech.thruDate.toString()}</b></p></#if>
+ <#if curPostalAddress.countryGeoId??><p>${curPostalAddress.countryGeoId}</p></#if>
+ <p>(${uiLabelMap.CommonUpdated}: ${(curPartyContactMech.fromDate.toString())!})</p>
+ <#if curPartyContactMech.thruDate??><p><b>${uiLabelMap.CommonDelete}: ${curPartyContactMech.thruDate.toString()}</b></p></#if>
</td>
</tr>
<#else>
@@ -150,21 +150,21 @@ under the License.
<td>
<#list partyContactMechPurposes as partyContactMechPurpose>
<#assign contactMechPurposeType = partyContactMechPurpose.getRelatedOne("ContactMechPurposeType", true)>
- <p><b>${contactMechPurposeType.get("description",locale)?if_exists}</b></p>
- <#if partyContactMechPurpose.thruDate?exists><p>(${uiLabelMap.CommonExpire}:${partyContactMechPurpose.thruDate})</p></#if>
+ <p><b>${contactMechPurposeType.get("description",locale)!}</b></p>
+ <#if partyContactMechPurpose.thruDate??><p>(${uiLabelMap.CommonExpire}:${partyContactMechPurpose.thruDate})</p></#if>
</#list>
- <#if postalAddress.toName?exists><p><b>${uiLabelMap.CommonTo}:</b> ${postalAddress.toName}</p></#if>
- <#if postalAddress.attnName?exists><p><b>${uiLabelMap.PartyAddrAttnName}:</b> ${postalAddress.attnName}</p></#if>
- <#if postalAddress.address1?exists><p>${postalAddress.address1}</p></#if>
- <#if postalAddress.address2?exists><p>${postalAddress.address2}</p></#if>
+ <#if postalAddress.toName??><p><b>${uiLabelMap.CommonTo}:</b> ${postalAddress.toName}</p></#if>
+ <#if postalAddress.attnName??><p><b>${uiLabelMap.PartyAddrAttnName}:</b> ${postalAddress.attnName}</p></#if>
+ <#if postalAddress.address1??><p>${postalAddress.address1}</p></#if>
+ <#if postalAddress.address2??><p>${postalAddress.address2}</p></#if>
<p>${postalAddress.city}<#if postalAddress.stateProvinceGeoId?has_content>, ${postalAddress.stateProvinceGeoId}</#if> ${postalAddress.postalCode}</p>
- <#if postalAddress.countryGeoId?exists><p>${postalAddress.countryGeoId}</p></#if>
- <p>(${uiLabelMap.CommonUpdated}: ${(partyContactMech.fromDate.toString())?if_exists})</p>
- <#if partyContactMech.thruDate?exists><p><b>${uiLabelMap.CommonDelete}: ${partyContactMech.thruDate.toString()}</b></p></#if>
+ <#if postalAddress.countryGeoId??><p>${postalAddress.countryGeoId}</p></#if>
+ <p>(${uiLabelMap.CommonUpdated}: ${(partyContactMech.fromDate.toString())!})</p>
+ <#if partyContactMech.thruDate??><p><b>${uiLabelMap.CommonDelete}: ${partyContactMech.thruDate.toString()}</b></p></#if>
</td>
</tr>
</#list>
- <#if !postalAddressInfos?has_content && !curContactMech?exists>
+ <#if !postalAddressInfos?has_content && !curContactMech??>
<tr><td colspan='2'>${uiLabelMap.PartyNoContactInformation}.</td></tr>
</#if>
</table>
Modified: ofbiz/trunk/applications/party/webapp/partymgr/party/editgiftcard.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/party/editgiftcard.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/webapp/partymgr/party/editgiftcard.ftl (original)
+++ ofbiz/trunk/applications/party/webapp/partymgr/party/editgiftcard.ftl Sat Aug 16 11:34:57 2014
@@ -20,14 +20,14 @@ under the License.
<!-- begin editgiftcard.ftl -->
<div class="screenlet">
<div class="screenlet-title-bar">
- <#if !giftCard?exists>
+ <#if !giftCard??>
<h3>${uiLabelMap.AccountingCreateNewGiftCard}</h3>
<#else>
<h3>${uiLabelMap.AccountingEditGiftCard}</h3>
</#if>
</div>
<div class="screenlet-body">
- <#if !giftCard?exists>
+ <#if !giftCard??>
<form method="post" action="<@o...@ofbizUrl>" name="editgiftcardform" style="margin: 0;">
<#else>
<form method="post" action="<@o...@ofbizUrl>" name="editgiftcardform" style="margin: 0;">
@@ -42,13 +42,13 @@ under the License.
<tr>
<td class="label">${uiLabelMap.AccountingCardNumber}</td>
<td>
- <input type="text" size="20" maxlength="60" name="cardNumber" value="${giftCardData.cardNumber?if_exists}" />
+ <input type="text" size="20" maxlength="60" name="cardNumber" value="${giftCardData.cardNumber!}" />
</td>
</tr>
<tr>
<td class="label">${uiLabelMap.AccountingPinNumber}</td>
<td>
- <input type="text" size="10" maxlength="60" name="pinNumber" value="${giftCardData.pinNumber?if_exists}" />
+ <input type="text" size="10" maxlength="60" name="pinNumber" value="${giftCardData.pinNumber!}" />
</td>
</tr>
<tr>
@@ -56,9 +56,9 @@ under the License.
<td>
<#assign expMonth = "">
<#assign expYear = "">
- <#if giftCardData?exists && giftCardData.expireDate?exists>
+ <#if giftCardData?? && giftCardData.expireDate??>
<#assign expDate = giftCard.expireDate>
- <#if (expDate?exists && expDate.indexOf("/") > 0)>
+ <#if (expDate?? && expDate.indexOf("/") > 0)>
<#assign expMonth = expDate.substring(0,expDate.indexOf("/"))>
<#assign expYear = expDate.substring(expDate.indexOf("/")+1)>
</#if>
@@ -67,10 +67,10 @@ under the License.
<#if giftCardData?has_content && expMonth?has_content>
<#assign ccExprMonth = expMonth>
<#else>
- <#assign ccExprMonth = requestParameters.expMonth?if_exists>
+ <#assign ccExprMonth = requestParameters.expMonth!>
</#if>
<#if ccExprMonth?has_content>
- <option value="${ccExprMonth?if_exists}">${ccExprMonth?if_exists}</option>
+ <option value="${ccExprMonth!}">${ccExprMonth!}</option>
</#if>
${screens.render("component://common/widget/CommonScreens.xml#ccmonths")}
</select>
@@ -78,10 +78,10 @@ under the License.
<#if giftCard?has_content && expYear?has_content>
<#assign ccExprYear = expYear>
<#else>
- <#assign ccExprYear = requestParameters.expYear?if_exists>
+ <#assign ccExprYear = requestParameters.expYear!>
</#if>
<#if ccExprYear?has_content>
- <option value="${ccExprYear?if_exists}">${ccExprYear?if_exists}</option>
+ <option value="${ccExprYear!}">${ccExprYear!}</option>
</#if>
${screens.render("component://common/widget/CommonScreens.xml#ccyears")}
</select>
@@ -90,7 +90,7 @@ under the License.
<tr>
<td class="label">${uiLabelMap.CommonDescription}</td>
<td>
- <input type="text" size="30" maxlength="60" name="description" value="${paymentMethodData.description?if_exists}" />
+ <input type="text" size="30" maxlength="60" name="description" value="${paymentMethodData.description!}" />
</td>
</tr>
</table>
Modified: ofbiz/trunk/applications/party/webapp/partymgr/party/findMatches.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/party/findMatches.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/webapp/partymgr/party/findMatches.ftl (original)
+++ ofbiz/trunk/applications/party/webapp/partymgr/party/findMatches.ftl Sat Aug 16 11:34:57 2014
@@ -30,23 +30,23 @@ under the License.
<form name="matchform" method="post" action="<@o...@ofbizUrl>">
<tr>
<td class="label">${uiLabelMap.PartyLastName}</td>
- <td><input type="text" name="lastName" class="required" value="${parameters.lastName?if_exists}"/><span class="tooltip">${uiLabelMap.CommonRequired}</span></td>
+ <td><input type="text" name="lastName" class="required" value="${parameters.lastName!}"/><span class="tooltip">${uiLabelMap.CommonRequired}</span></td>
</tr>
<tr>
<td class="label">${uiLabelMap.PartyFirstName}</td>
- <td><input type="text" name="firstName" class="required" value="${parameters.firstName?if_exists}"/><span class="tooltip">${uiLabelMap.CommonRequired}</span></td>
+ <td><input type="text" name="firstName" class="required" value="${parameters.firstName!}"/><span class="tooltip">${uiLabelMap.CommonRequired}</span></td>
</tr>
<tr>
<td class="label">${uiLabelMap.CommonAddress1}</td>
- <td><input type="text" name="address1" class="required" value="${parameters.address1?if_exists}"/><span class="tooltip">${uiLabelMap.CommonRequired}</span></td>
+ <td><input type="text" name="address1" class="required" value="${parameters.address1!}"/><span class="tooltip">${uiLabelMap.CommonRequired}</span></td>
</tr>
<tr>
<td class="label">${uiLabelMap.CommonAddress2}</td>
- <td><input type="text" name="address2" value="${parameters.address2?if_exists}"/></td>
+ <td><input type="text" name="address2" value="${parameters.address2!}"/></td>
</tr>
<tr>
<td class="label">${uiLabelMap.CommonCity}</td>
- <td><input type="text" name="city" class="required" value="${parameters.city?if_exists}"/><span class="tooltip">${uiLabelMap.CommonRequired}</span></td>
+ <td><input type="text" name="city" class="required" value="${parameters.city!}"/><span class="tooltip">${uiLabelMap.CommonRequired}</span></td>
</tr>
<tr>
<td class="label">${uiLabelMap.CommonStateProvince}</td>
@@ -63,7 +63,7 @@ under the License.
</tr>
<tr>
<td class="label">${uiLabelMap.PartyZipCode}</td>
- <td><input type="text" name="postalCode" class="required" value="${parameters.postalCode?if_exists}"/><span class="tooltip">${uiLabelMap.CommonRequired}</span></td>
+ <td><input type="text" name="postalCode" class="required" value="${parameters.postalCode!}"/><span class="tooltip">${uiLabelMap.CommonRequired}</span></td>
</tr>
<tr>
<td></td>
@@ -89,8 +89,8 @@ under the License.
<td>${uiLabelMap.PartyPartyId}</td>
</tr>
<#list matches as match>
- <#assign person = match.getRelatedOne("Party", false).getRelatedOne("Person", false)?if_exists>
- <#assign group = match.getRelatedOne("Party", false).getRelatedOne("PartyGroup", false)?if_exists>
+ <#assign person = match.getRelatedOne("Party", false).getRelatedOne("Person", false)!>
+ <#assign group = match.getRelatedOne("Party", false).getRelatedOne("PartyGroup", false)!>
<tr>
<#if person?has_content>
<td>${person.lastName}</td>
Modified: ofbiz/trunk/applications/party/webapp/partymgr/party/findparty.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/party/findparty.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/webapp/partymgr/party/findparty.ftl (original)
+++ ofbiz/trunk/applications/party/webapp/partymgr/party/findparty.ftl Sat Aug 16 11:34:57 2014
@@ -20,7 +20,7 @@ under the License.
<#assign inventoryItemId = parameters.inventoryItemId?default("")>
<#assign serialNumber = parameters.serialNumber?default("")>
<#assign softIdentifier = parameters.softIdentifier?default("")>
-<#assign sortField = parameters.sortField?if_exists/>
+<#assign sortField = parameters.sortField!/>
<#-- Only allow the search fields to be hidden when we have some results -->
<#if partyList?has_content>
<#assign hideFields = parameters.hideFields?default("N")>
@@ -29,9 +29,9 @@ under the License.
</#if>
<h1>${uiLabelMap.PageTitleFindParty}</h1>
<#if (parameters.firstName?has_content || parameters.lastName?has_content)>
- <#assign createUrl = "editperson?create_new=Y&lastName=${parameters.lastName?if_exists}&firstName=${parameters.firstName?if_exists}"/>
+ <#assign createUrl = "editperson?create_new=Y&lastName=${parameters.lastName!}&firstName=${parameters.firstName!}"/>
<#elseif (parameters.groupName?has_content)>
- <#assign createUrl = "editpartygroup?create_new=Y&groupName=${parameters.groupName?if_exists}"/>
+ <#assign createUrl = "editpartygroup?create_new=Y&groupName=${parameters.groupName!}"/>
<#else>
<#assign createUrl = "createnew"/>
</#if>
@@ -41,9 +41,9 @@ under the License.
<#if partyList?has_content>
<ul>
<#if hideFields == "Y">
- <li class="collapsed"><a href="<@o...@ofbizUrl>" title="${uiLabelMap.CommonShowLookupFields}"> </a></li>
+ <li class="collapsed"><a href="<@o...@ofbizUrl>" title="${uiLabelMap.CommonShowLookupFields}"> </a></li>
<#else>
- <li class="expanded"><a href="<@o...@ofbizUrl>" title="${uiLabelMap.CommonHideFields}"> </a></li>
+ <li class="expanded"><a href="<@o...@ofbizUrl>" title="${uiLabelMap.CommonHideFields}"> </a></li>
</#if>
</ul>
<br class="clear"/>
@@ -72,23 +72,23 @@ under the License.
</tr>
<tr>
<td class="label">${uiLabelMap.PartyPartyId}</td>
- <td><input type="text" name="partyId" value="${parameters.partyId?if_exists}"/></td>
+ <td><input type="text" name="partyId" value="${parameters.partyId!}"/></td>
</tr>
<tr>
<td class="label">${uiLabelMap.PartyUserLogin}</td>
- <td><input type="text" name="userLoginId" value="${parameters.userLoginId?if_exists}"/></td>
+ <td><input type="text" name="userLoginId" value="${parameters.userLoginId!}"/></td>
</tr>
<tr>
<td class="label">${uiLabelMap.PartyLastName}</td>
- <td><input type="text" name="lastName" value="${parameters.lastName?if_exists}"/></td>
+ <td><input type="text" name="lastName" value="${parameters.lastName!}"/></td>
</tr>
<tr>
<td class="label">${uiLabelMap.PartyFirstName}</td>
- <td><input type="text" name="firstName" value="${parameters.firstName?if_exists}"/></td>
+ <td><input type="text" name="firstName" value="${parameters.firstName!}"/></td>
</tr>
<tr>
<td class="label">${uiLabelMap.PartyPartyGroupName}</td>
- <td><input type="text" name="groupName" value="${parameters.groupName?if_exists}"/></td>
+ <td><input type="text" name="groupName" value="${parameters.groupName!}"/></td>
</tr>
<tr>
<td class="label">${uiLabelMap.PartyRoleType}</td>
@@ -122,29 +122,29 @@ under the License.
</tr>
<tr>
<td class="label">${uiLabelMap.ProductInventoryItemId}</td>
- <td><input type="text" name="inventoryItemId" value="${parameters.inventoryItemId?if_exists}"/></td>
+ <td><input type="text" name="inventoryItemId" value="${parameters.inventoryItemId!}"/></td>
</tr>
<tr>
<td class="label">${uiLabelMap.ProductSerialNumber}</td>
- <td><input type="text" name="serialNumber" value="${parameters.serialNumber?if_exists}"/></td>
+ <td><input type="text" name="serialNumber" value="${parameters.serialNumber!}"/></td>
</tr>
<tr>
<td class="label">${uiLabelMap.ProductSoftIdentifier}</td>
- <td><input type="text" name="softIdentifier" value="${parameters.softIdentifier?if_exists}"/></td>
+ <td><input type="text" name="softIdentifier" value="${parameters.softIdentifier!}"/></td>
</tr>
<#if extInfo == "P">
<tr><td colspan="3"><hr /></td></tr>
<tr>
<td class="label">${uiLabelMap.CommonAddress1}</td>
- <td><input type="text" name="address1" value="${parameters.address1?if_exists}"/></td>
+ <td><input type="text" name="address1" value="${parameters.address1!}"/></td>
</tr>
<tr>
<td class="label">${uiLabelMap.CommonAddress2}</td>
- <td><input type="text" name="address2" value="${parameters.address2?if_exists}"/></td>
+ <td><input type="text" name="address2" value="${parameters.address2!}"/></td>
</tr>
<tr>
<td class="label">${uiLabelMap.CommonCity}</td>
- <td><input type="text" name="city" value="${parameters.city?if_exists}"/></td>
+ <td><input type="text" name="city" value="${parameters.city!}"/></td>
</tr>
<tr>
<td class="label">${uiLabelMap.CommonStateProvince}</td>
@@ -161,29 +161,29 @@ under the License.
</tr>
<tr>
<td class="label">${uiLabelMap.PartyPostalCode}</td>
- <td><input type="text" name="postalCode" value="${parameters.postalCode?if_exists}"/></td>
+ <td><input type="text" name="postalCode" value="${parameters.postalCode!}"/></td>
</tr>
</#if>
<#if extInfo == "T">
<tr><td colspan="3"><hr /></td></tr>
<tr>
<td class="label">${uiLabelMap.CommonCountryCode}</td>
- <td><input type="text" name="countryCode" value="${parameters.countryCode?if_exists}"/></td>
+ <td><input type="text" name="countryCode" value="${parameters.countryCode!}"/></td>
</tr>
<tr>
<td class="label">${uiLabelMap.PartyAreaCode}</td>
- <td><input type="text" name="areaCode" value="${parameters.areaCode?if_exists}"/></td>
+ <td><input type="text" name="areaCode" value="${parameters.areaCode!}"/></td>
</tr>
<tr>
<td class="label">${uiLabelMap.PartyContactNumber}</td>
- <td><input type="text" name="contactNumber" value="${parameters.contactNumber?if_exists}"/></td>
+ <td><input type="text" name="contactNumber" value="${parameters.contactNumber!}"/></td>
</tr>
</#if>
<#if extInfo == "O">
<tr><td colspan="3"><hr /></td></tr>
<tr>
<td class="label">${uiLabelMap.PartyContactInformation}</td>
- <td><input type="text" name="infoString" value="${parameters.infoString?if_exists}"/></td>
+ <td><input type="text" name="infoString" value="${parameters.infoString!}"/></td>
</tr>
</#if>
<tr>
@@ -199,7 +199,7 @@ under the License.
document.lookupparty.partyId.focus();
</script>
-<#if partyList?exists>
+<#if partyList??>
<#if hideFields != "Y">
<hr />
</#if>
@@ -209,7 +209,7 @@ under the License.
<#if partyList?has_content>
<#-- Pagination -->
<#include "component://common/webcommon/includes/htmlTemplate.ftl"/>
- <#assign commonUrl = "findparty?hideFields=" + hideFields + paramList + "&sortField=" + sortField?if_exists + "&"/>
+ <#assign commonUrl = "findparty?hideFields=" + hideFields + paramList + "&sortField=" + sortField! + "&"/>
<#assign viewIndexFirst = 0/>
<#assign viewIndexPrevious = viewIndex - 1/>
<#assign viewIndexNext = viewIndex + 1/>
@@ -244,12 +244,12 @@ under the License.
<td>${uiLabelMap.PartyType}</td>
<td>${uiLabelMap.PartyMainRole}</td>
<td>
- <a href="<@o...@ofbizUrl>?<#if sortField?has_content><#if sortField == "createdDate">sortField=-createdDate<#elseif sortField == "-createdDate">sortField=createdDate<#else>sortField=createdDate</#if><#else>sortField=createdDate</#if>${paramList?if_exists}&VIEW_SIZE=${viewSize?if_exists}&VIEW_INDEX=${viewIndex?if_exists}"
+ <a href="<@o...@ofbizUrl>?<#if sortField?has_content><#if sortField == "createdDate">sortField=-createdDate<#elseif sortField == "-createdDate">sortField=createdDate<#else>sortField=createdDate</#if><#else>sortField=createdDate</#if>${paramList!}&VIEW_SIZE=${viewSize!}&VIEW_INDEX=${viewIndex!}"
<#if sortField?has_content><#if sortField == "createdDate">class="sort-order-desc"<#elseif sortField == "-createdDate">class="sort-order-asc"<#else>class="sort-order"</#if><#else>class="sort-order"</#if>>${uiLabelMap.FormFieldTitle_createdDate}
</a>
</td>
<td>
- <a href="<@o...@ofbizUrl>?<#if sortField?has_content><#if sortField == "lastModifiedDate">sortField=-lastModifiedDate<#elseif sortField == "-lastModifiedDate">sortField=lastModifiedDate<#else>sortField=lastModifiedDate</#if><#else>sortField=lastModifiedDate</#if>${paramList?if_exists}&VIEW_SIZE=${viewSize?if_exists}&VIEW_INDEX=${viewIndex?if_exists}"
+ <a href="<@o...@ofbizUrl>?<#if sortField?has_content><#if sortField == "lastModifiedDate">sortField=-lastModifiedDate<#elseif sortField == "-lastModifiedDate">sortField=lastModifiedDate<#else>sortField=lastModifiedDate</#if><#else>sortField=lastModifiedDate</#if>${paramList!}&VIEW_SIZE=${viewSize!}&VIEW_INDEX=${viewIndex!}"
<#if sortField?has_content><#if sortField == "lastModifiedDate">class="sort-order-desc"<#elseif sortField == "-lastModifiedDate">class="sort-order-asc"<#else>class="sort-order"</#if><#else>class="sort-order"</#if>>${uiLabelMap.FormFieldTitle_lastModifiedDate}
</a>
</td>
@@ -258,7 +258,7 @@ under the License.
<#assign alt_row = false>
<#assign rowCount = 0>
<#list partyList as partyRow>
- <#assign partyType = partyRow.getRelatedOne("PartyType", false)?if_exists>
+ <#assign partyType = partyRow.getRelatedOne("PartyType", false)!>
<tr valign="middle"<#if alt_row> class="alternate-row"</#if>>
<td><a href="<@o...@ofbizUrl>">${partyRow.partyId}</a></td>
<td>
@@ -293,24 +293,24 @@ under the License.
</#if>
</td>
<#if extInfo?default("") == "T">
- <td>${partyRow.areaCode?if_exists}</td>
+ <td>${partyRow.areaCode!}</td>
</#if>
<#if extInfo?default("") == "P" >
- <td>${partyRow.city?if_exists}, ${partyRow.stateProvinceGeoId?if_exists}</td>
+ <td>${partyRow.city!}, ${partyRow.stateProvinceGeoId!}</td>
</#if>
<#if extInfo?default("") == "P">
- <td>${partyRow.postalCode?if_exists}</td>
+ <td>${partyRow.postalCode!}</td>
</#if>
<#if inventoryItemId?default("") != "">
- <td>${partyRow.inventoryItemId?if_exists}</td>
+ <td>${partyRow.inventoryItemId!}</td>
</#if>
<#if serialNumber?default("") != "">
- <td>${partyRow.serialNumber?if_exists}</td>
+ <td>${partyRow.serialNumber!}</td>
</#if>
<#if softIdentifier?default("") != "">
- <td>${partyRow.softIdentifier?if_exists}</td>
+ <td>${partyRow.softIdentifier!}</td>
</#if>
- <#if partyType?exists>
+ <#if partyType??>
<td>
<#if partyType.partyTypeId?has_content && partyType.partyTypeId=="PERSON">
<#assign partyRelateCom = delegator.findByAnd("PartyRelationship", {"partyIdTo", partyRow.partyId,"roleTypeIdFrom","ACCOUNT","roleTypeIdTo","CONTACT"}, null, false)>
@@ -318,23 +318,23 @@ under the License.
<#list partyRelateCom as partyRelationship>
<#if partyRelationship.partyIdFrom?has_content>
<#assign companyName=Static["org.ofbiz.party.party.PartyHelper"].getPartyName(delegator, partyRelationship.partyIdFrom, true)>
- ${companyName?if_exists}
+ ${companyName!}
</#if>
</#list>
</#if>
</#if>
</td>
- <td><#if partyType.description?exists>${partyType.get("description", locale)}<#else>???</#if></td>
+ <td><#if partyType.description??>${partyType.get("description", locale)}<#else>???</#if></td>
<#else>
<td></td><td></td>
</#if>
<td>
<#assign mainRole = dispatcher.runSync("getPartyMainRole", Static["org.ofbiz.base.util.UtilMisc"].toMap("partyId", partyRow.partyId, "userLogin", userLogin))/>
- ${mainRole.description?if_exists}
+ ${mainRole.description!}
</td>
<#assign partyDate = delegator.findOne("Party", {"partyId":partyRow.partyId}, true)/>
- <td>${partyDate.createdDate?if_exists}</td>
- <td>${partyDate.lastModifiedDate?if_exists}</td>
+ <td>${partyDate.createdDate!}</td>
+ <td>${partyDate.lastModifiedDate!}</td>
<td class="button-col align-float">
<a href="<@o...@ofbizUrl>">${uiLabelMap.CommonDetails}</a>
<#if security.hasEntityPermission("ORDERMGR", "_VIEW", session)>
@@ -364,7 +364,7 @@ under the License.
<h3>${uiLabelMap.PartyNoPartiesFound}</h3>
</div>
</#if>
- <#if lookupErrorMessage?exists>
+ <#if lookupErrorMessage??>
<h3>${lookupErrorMessage}</h3>
</#if>
</div>
Modified: ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/Attributes.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/Attributes.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/Attributes.ftl (original)
+++ ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/Attributes.ftl Sat Aug 16 11:34:57 2014
@@ -22,7 +22,7 @@ under the License.
<ul>
<li class="h3">${uiLabelMap.PartyAttributes}</li>
<#if security.hasEntityPermission("PARTYMGR", "_CREATE", session)>
- <li><a href="<@o...@ofbizUrl>">${uiLabelMap.CommonCreateNew}</a></li>
+ <li><a href="<@o...@ofbizUrl>">${uiLabelMap.CommonCreateNew}</a></li>
</#if>
</ul>
<br class="clear"/>
@@ -39,13 +39,13 @@ under the License.
<#list attributes as attr>
<tr valign="middle"<#if alt_row> class="alternate-row"</#if>>
<td>
- ${attr.attrName?if_exists}
+ ${attr.attrName!}
</td>
<td>
- ${attr.attrValue?if_exists}
+ ${attr.attrValue!}
</td>
<td class="button-col">
- <a href="<@o...@ofbizUrl>">${uiLabelMap.CommonEdit}</a>
+ <a href="<@o...@ofbizUrl>">${uiLabelMap.CommonEdit}</a>
</td>
</tr>
<#-- toggle the row color -->
Modified: ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/AvsSettings.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/AvsSettings.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/AvsSettings.ftl (original)
+++ ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/AvsSettings.ftl Sat Aug 16 11:34:57 2014
@@ -28,7 +28,7 @@ under the License.
<span class="label">${uiLabelMap.PartyAvsString}</span>${(avsOverride.avsDeclineString)?default("${uiLabelMap.CommonGlobal}")}
<#if security.hasEntityPermission("PARTYMGR", "_UPDATE", session)>
<a href="<@o...@ofbizUrl>" class="smallSubmit">${uiLabelMap.CommonEdit}</a>
- <#if avsOverride?exists>
+ <#if avsOverride??>
<a href="<@o...@ofbizUrl>" class="smallSubmit">${uiLabelMap.CommonReset}</a>
</#if>
</#if>
Modified: ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/Cart.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/Cart.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/Cart.ftl (original)
+++ ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/Cart.ftl Sat Aug 16 11:34:57 2014
@@ -44,10 +44,10 @@ under the License.
</tr>
<#list savedCartItems as savedCartItem>
<tr>
- <td>${savedCartItem.shoppingListItemSeqId?if_exists}</td>
- <td class="button-col"><a href="/catalog/control/EditProduct?productId=${savedCartItem.productId}&externalLoginKey=${requestAttributes.externalLoginKey}">${savedCartItem.productId?if_exists}</a></td>
- <td>${savedCartItem.quantity?if_exists}</td>
- <td>${savedCartItem.quantityPurchased?if_exists}</td>
+ <td>${savedCartItem.shoppingListItemSeqId!}</td>
+ <td class="button-col"><a href="/catalog/control/EditProduct?productId=${savedCartItem.productId}&externalLoginKey=${requestAttributes.externalLoginKey}">${savedCartItem.productId!}</a></td>
+ <td>${savedCartItem.quantity!}</td>
+ <td>${savedCartItem.quantityPurchased!}</td>
</tr>
</#list>
</table>
Modified: ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/Contact.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/Contact.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/Contact.ftl (original)
+++ ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/Contact.ftl Sat Aug 16 11:34:57 2014
@@ -65,14 +65,14 @@ under the License.
<#if contactMechPurposeType?has_content>
<#assign popUptitle = contactMechPurposeType.get("description", locale) + uiLabelMap.CommonGeoLocation>
</#if>
- <a href="javascript:popUp('<@o...@ofbizUrl>', '${popUptitle?if_exists}', '450', '550')" class="buttontext">${uiLabelMap.CommonGeoLocation}</a>
+ <a href="javascript:popUp('<@o...@ofbizUrl>', '${popUptitle!}', '450', '550')" class="buttontext">${uiLabelMap.CommonGeoLocation}</a>
</#if>
</#if>
<#elseif "TELECOM_NUMBER" = contactMech.contactMechTypeId>
<#if contactMechMap.telecomNumber?has_content>
<#assign telecomNumber = contactMechMap.telecomNumber>
<div>
- ${telecomNumber.countryCode?if_exists}
+ ${telecomNumber.countryCode!}
<#if telecomNumber.areaCode?has_content>${telecomNumber.areaCode?default("000")}-</#if><#if telecomNumber.contactNumber?has_content>${telecomNumber.contactNumber?default("000-0000")}</#if>
<#if partyContactMech.extension?has_content>${uiLabelMap.PartyContactExt} ${partyContactMech.extension}</#if>
<#if !telecomNumber.countryCode?has_content || telecomNumber.countryCode = "011">
@@ -83,7 +83,7 @@ under the License.
</#if>
<#elseif "EMAIL_ADDRESS" = contactMech.contactMechTypeId>
<div>
- ${contactMech.infoString?if_exists}
+ ${contactMech.infoString!}
<form method="post" action="<@o...@ofbizUrl>" onsubmit="javascript:submitFormDisableSubmits(this)" name="createEmail${contactMech.infoString?replace("@","")?replace(".","")}">
<#if userLogin.partyId?has_content>
<input name="partyIdFrom" value="${userLogin.partyId}" type="hidden"/>
@@ -97,18 +97,18 @@ under the License.
</div>
<#elseif "WEB_ADDRESS" = contactMech.contactMechTypeId>
<div>
- ${contactMech.infoString?if_exists}
+ ${contactMech.infoString!}
<#assign openAddress = contactMech.infoString?default("")>
<#if !openAddress?starts_with("http") && !openAddress?starts_with("HTTP")><#assign openAddress = "http://" + openAddress></#if>
<a target="_blank" href="${openAddress}" class="buttontext">${uiLabelMap.CommonOpenPageNewWindow}</a>
</div>
<#else>
- <div>${contactMech.infoString?if_exists}</div>
+ <div>${contactMech.infoString!}</div>
</#if>
<div>(${uiLabelMap.CommonUpdated}: ${partyContactMech.fromDate})</div>
<#if partyContactMech.thruDate?has_content><div><b>${uiLabelMap.PartyContactEffectiveThru}: ${partyContactMech.thruDate}</b></div></#if>
<#-- create cust request -->
- <#if custRequestTypes?exists>
+ <#if custRequestTypes??>
<form name="createCustRequestForm" action="<@o...@ofbizUrl>" method="post" onsubmit="javascript:submitFormDisableSubmits(this)">
<input type="hidden" name="partyId" value="${partyId}"/>
<input type="hidden" name="fromPartyId" value="${partyId}"/>
@@ -122,7 +122,7 @@ under the License.
</form>
</#if>
</td>
- <td valign="top"><b>(${partyContactMech.allowSolicitation?if_exists})</b></td>
+ <td valign="top"><b>(${partyContactMech.allowSolicitation!})</b></td>
<td class="button-col">
<#if security.hasEntityPermission("PARTYMGR", "_UPDATE", session) || userLogin.partyId == partyId>
<a href="<@o...@ofbizUrl>">${uiLabelMap.CommonUpdate}</a>
Modified: ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/ContentList.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/ContentList.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/ContentList.ftl (original)
+++ ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/ContentList.ftl Sat Aug 16 11:34:57 2014
@@ -23,20 +23,20 @@ under the License.
<#list partyContent as pContent>
<#assign content = pContent.getRelatedOne("Content", false)>
<#assign contentType = content.getRelatedOne("ContentType", true)>
- <#assign mimeType = content.getRelatedOne("MimeType", true)?if_exists>
- <#assign status = content.getRelatedOne("StatusItem", true)?if_exists>
+ <#assign mimeType = content.getRelatedOne("MimeType", true)!>
+ <#assign status = content.getRelatedOne("StatusItem", true)!>
<#assign pcType = pContent.getRelatedOne("PartyContentType", false)>
<tr>
<td class="button-col"><a href="<@o...@ofbizUrl>">${content.contentId}</a></td>
- <td>${(pcType.get("description", locale))?if_exists}</td>
- <td>${content.contentName?if_exists}</td>
- <td>${(contentType.get("description",locale))?if_exists}</td>
- <td>${(mimeType.description)?if_exists}</td>
- <td>${(status.get("description",locale))?if_exists}</td>
- <td>${pContent.fromDate?if_exists}</td>
+ <td>${(pcType.get("description", locale))!}</td>
+ <td>${content.contentName!}</td>
+ <td>${(contentType.get("description",locale))!}</td>
+ <td>${(mimeType.description)!}</td>
+ <td>${(status.get("description",locale))!}</td>
+ <td>${pContent.fromDate!}</td>
<td class="button-col">
<#if (content.contentName?has_content)>
- <a href="<@o...@ofbizUrl>">${uiLabelMap.CommonView}</a>
+ <a href="<@o...@ofbizUrl>">${uiLabelMap.CommonView}</a>
</#if>
<form name="removePartyContent_${pContent_index}" method="post" action="<@o...@ofbizUrl>">
<input type="hidden" name="contentId" value="${pContent.contentId}" />
Modified: ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/FinAccounts.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/FinAccounts.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/FinAccounts.ftl (original)
+++ ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/FinAccounts.ftl Sat Aug 16 11:34:57 2014
@@ -22,13 +22,13 @@ under the License.
<b>${uiLabelMap.AccountingAccountNumber}:</b> <a href="/accounting/control/EditFinAccount?finAccountId=${ownedFinAccount.finAccountId}${StringUtil.wrapString(externalKeyParam)}"
class="smallSubmit">${ownedFinAccount.finAccountId}</a>
<b>${uiLabelMap.AccountingAccountType}:</b> ${(ownedFinAccountType.description)?default('N/A')}
- <b>${uiLabelMap.FormFieldTitle_finAccountName}:</b> ${ownedFinAccount.finAccountName?if_exists}
+ <b>${uiLabelMap.FormFieldTitle_finAccountName}:</b> ${ownedFinAccount.finAccountName!}
</p>
<p>
- <b>${uiLabelMap.AccountingCurrency}:</b> ${(accountCurrencyUom.description)?if_exists} [${ownedFinAccount.currencyUomId?if_exists}]
- <b>${uiLabelMap.AccountingDateOpened}:</b> ${ownedFinAccount.fromDate?if_exists}
+ <b>${uiLabelMap.AccountingCurrency}:</b> ${(accountCurrencyUom.description)!} [${ownedFinAccount.currencyUomId!}]
+ <b>${uiLabelMap.AccountingDateOpened}:</b> ${ownedFinAccount.fromDate!}
<b>${uiLabelMap.CommonStatus}:</b> ${(finAccountStatusItem.description)?default("Active")}
- <#if ownedFinAccount.replenishLevel?exists>
+ <#if ownedFinAccount.replenishLevel??>
<b>${uiLabelMap.FormFieldTitle_replenishLevel}:</b> <@ofbizCurrency amount=ownedFinAccount.replenishLevel isoCode=ownedFinAccount.currencyUomId/>
</#if>
</p>
@@ -52,11 +52,11 @@ under the License.
<#assign displayAmount = -displayAmount>
</#if>
<tr>
- <td>${ownedFinAccountTrans.transactionDate?if_exists}</td>
+ <td>${ownedFinAccountTrans.transactionDate!}</td>
<td>${ownedFinAccountTrans.finAccountTransId}</td>
- <td>${ownedFinAccountTrans.orderId?if_exists}:${ownedFinAccountTrans.orderItemSeqId?if_exists}</td>
- <td>${ownedFinAccountTrans.paymentId?if_exists}</td>
- <td>${finAccountTransType.description?default(ownedFinAccountTrans.finAccountTransTypeId)?if_exists}</td>
+ <td>${ownedFinAccountTrans.orderId!}:${ownedFinAccountTrans.orderItemSeqId!}</td>
+ <td>${ownedFinAccountTrans.paymentId!}</td>
+ <td>${finAccountTransType.description?default(ownedFinAccountTrans.finAccountTransTypeId)!}</td>
<td><@ofbizCurrency amount=displayAmount isoCode=ownedFinAccount.currencyUomId/></td>
</tr>
</#list>
@@ -85,9 +85,9 @@ under the License.
<tbody>
<#list ownedFinAccountAuthList as ownedFinAccountAuth>
<tr>
- <td>${ownedFinAccountAuth.authorizationDate?if_exists}</td>
+ <td>${ownedFinAccountAuth.authorizationDate!}</td>
<td>${ownedFinAccountAuth.finAccountAuthId}</td>
- <td>${ownedFinAccountAuth.thruDate?if_exists}</td>
+ <td>${ownedFinAccountAuth.thruDate!}</td>
<td><@ofbizCurrency amount=-ownedFinAccountAuth.amount isoCode=ownedFinAccount.currencyUomId/></td>
</tr>
</#list>
Modified: ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/LoyaltyPoints.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/LoyaltyPoints.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/LoyaltyPoints.ftl (original)
+++ ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/LoyaltyPoints.ftl Sat Aug 16 11:34:57 2014
@@ -17,7 +17,7 @@ specific language governing permissions
under the License.
-->
- <#if monthsToInclude?exists && totalSubRemainingAmount?exists && totalOrders?exists>
+ <#if monthsToInclude?? && totalSubRemainingAmount?? && totalOrders??>
<div id="totalOrders" class="screenlet">
<div class="screenlet-title-bar">
<ul>
Modified: ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/Notes.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/Notes.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/Notes.ftl (original)
+++ ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/Notes.ftl Sat Aug 16 11:34:57 2014
@@ -33,7 +33,7 @@ under the License.
<#list notes as noteRef>
<tr>
<td>
- <div><b>${uiLabelMap.FormFieldTitle_noteName}: </b>${noteRef.noteName?if_exists}</div>
+ <div><b>${uiLabelMap.FormFieldTitle_noteName}: </b>${noteRef.noteName!}</div>
<#if noteRef.noteParty?has_content>
<div><b>${uiLabelMap.CommonBy}: </b>${Static["org.ofbiz.party.party.PartyHelper"].getPartyName(delegator, noteRef.noteParty, true)}</div>
</#if>
Modified: ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/PaymentMethods.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/PaymentMethods.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/PaymentMethods.ftl (original)
+++ ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/PaymentMethods.ftl Sat Aug 16 11:34:57 2014
@@ -31,7 +31,7 @@ under the License.
<#assign cardNumberDisplay = cardNumber>
</#if>
</#if>
- ${cardNumberDisplay?if_exists}
+ ${cardNumberDisplay!}
</#macro>
<div id="partyPaymentMethod" class="screenlet">
@@ -69,14 +69,14 @@ under the License.
-
<#if security.hasEntityPermission("PAY_INFO", "_VIEW", session) || security.hasEntityPermission("ACCOUNTING", "_VIEW", session)>
${creditCard.cardType}
- <@maskSensitiveNumber cardNumber=creditCard.cardNumber?if_exists/>
+ <@maskSensitiveNumber cardNumber=creditCard.cardNumber!/>
${creditCard.expireDate}
<#else>
${Static["org.ofbiz.party.contact.ContactHelper"].formatCreditCard(creditCard)}
</#if>
<#if paymentMethod.description?has_content>(${paymentMethod.description})</#if>
<#if paymentMethod.glAccountId?has_content>(for GL Account ${paymentMethod.glAccountId})</#if>
- <#if paymentMethod.fromDate?has_content>(${uiLabelMap.CommonUpdated}: ${paymentMethod.fromDate?if_exists})</#if>
+ <#if paymentMethod.fromDate?has_content>(${uiLabelMap.CommonUpdated}: ${paymentMethod.fromDate!})</#if>
<#if paymentMethod.thruDate?has_content><b>(${uiLabelMap.PartyContactEffectiveThru}: ${paymentMethod.thruDate})</#if>
</td>
<td class="button-col">
@@ -96,12 +96,12 @@ under the License.
<#if security.hasEntityPermission("PAY_INFO", "_VIEW", session) || security.hasEntityPermission("ACCOUNTING", "_VIEW", session)>
${giftCard.cardNumber?default("N/A")} [${giftCard.pinNumber?default("N/A")}]
<#else>
- <@maskSensitiveNumber cardNumber=giftCard.cardNumber?if_exists/>
+ <@maskSensitiveNumber cardNumber=giftCard.cardNumber!/>
<#if !cardNumberDisplay?has_content>N/A</#if>
</#if>
<#if paymentMethod.description?has_content>(${paymentMethod.description})</#if>
<#if paymentMethod.glAccountId?has_content>(for GL Account ${paymentMethod.glAccountId})</#if>
- <#if paymentMethod.fromDate?has_content>(${uiLabelMap.CommonUpdated}: ${paymentMethod.fromDate?if_exists})</#if>
+ <#if paymentMethod.fromDate?has_content>(${uiLabelMap.CommonUpdated}: ${paymentMethod.fromDate!})</#if>
<#if paymentMethod.thruDate?has_content><b>(${uiLabelMap.PartyContactEffectiveThru}: ${paymentMethod.thruDate.toString()}</b></#if>
</td>
<td class="button-col">
@@ -117,7 +117,7 @@ under the License.
<td>
${eftAccount.nameOnAccount} - <#if eftAccount.bankName?has_content>${uiLabelMap.PartyBank}: ${eftAccount.bankName}</#if> <#if eftAccount.accountNumber?has_content>${uiLabelMap.PartyAccount} #: ${eftAccount.accountNumber}</#if> <#if paymentMethod.description?has_content>(${paymentMethod.description})</#if>
<#if paymentMethod.glAccountId?has_content>(for GL Account ${paymentMethod.glAccountId})</#if>
- <#if paymentMethod.fromDate?has_content>(${uiLabelMap.CommonUpdated}: ${paymentMethod.fromDate?if_exists})</#if>
+ <#if paymentMethod.fromDate?has_content>(${uiLabelMap.CommonUpdated}: ${paymentMethod.fromDate!})</#if>
<#if paymentMethod.thruDate?has_content><b>(${uiLabelMap.PartyContactEffectiveThru}: ${paymentMethod.thruDate.toString()}</#if>
</td>
<td class="button-col">
@@ -133,7 +133,7 @@ under the License.
<td>
<#if paymentMethod.description?has_content>(${paymentMethod.description})</#if>
<#if paymentMethod.glAccountId?has_content>(for GL Account ${paymentMethod.glAccountId})</#if>
- <#if paymentMethod.fromDate?has_content>(${uiLabelMap.CommonUpdated}: ${paymentMethod.fromDate?if_exists})</#if>
+ <#if paymentMethod.fromDate?has_content>(${uiLabelMap.CommonUpdated}: ${paymentMethod.fromDate!})</#if>
<#if paymentMethod.thruDate?has_content>(${uiLabelMap.PartyContactEffectiveThru}: ${paymentMethod.thruDate.toString()}</#if>
</td>
<td class="button-col">
@@ -162,7 +162,7 @@ under the License.
<#if billing.description?has_content>(${billing.description})</#if>
<#if billing.accountLimit?has_content>(${uiLabelMap.AccountingAccountLimit} $${billing.accountLimit})</#if>
<#if billing.accountBalance?has_content>(${uiLabelMap.AccountingBillingAvailableBalance} $${billing.accountBalance})</#if>
- <#if billing.fromDate?has_content>(${uiLabelMap.CommonUpdated}: ${billing.fromDate?if_exists})</#if>
+ <#if billing.fromDate?has_content>(${uiLabelMap.CommonUpdated}: ${billing.fromDate!})</#if>
<#if billing.thruDate?has_content><b>(${uiLabelMap.PartyContactEffectiveThru}: ${billing.thruDate.toString()}</b></#if>
</td>
<td class="button-col">