svn commit: r1618554 [3/38] - in /ofbiz/branches/OFBIZ-5312-ofb
Locked
svn commit: r1618554 [3/38] - in /ofbiz/branches/OFBIZ-5312-ofb
 
|
Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/webapp/accounting/payment/manualCCTx.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/webapp/accounting/payment/manualCCTx.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/webapp/accounting/payment/manualCCTx.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/webapp/accounting/payment/manualCCTx.ftl Mon Aug 18 07:42:27 2014 @@ -75,7 +75,7 @@ under the License. <td width="26%" align="right" valign="middle"><b>${uiLabelMap.PartyFirstName}</b></td> <td width="5"> </td> <td width="74%"> - <input type="text" size="30" maxlength="60" name="firstName" value="${(person.firstName)?if_exists}" /> + <input type="text" size="30" maxlength="60" name="firstName" value="${(person.firstName)!}" /> <span class="tooltip">${uiLabelMap.CommonRequired}</span> </td> </tr> @@ -83,7 +83,7 @@ under the License. <td width="26%" align="right" valign="middle"><b>${uiLabelMap.PartyLastName}</b></td> <td width="5"> </td> <td width="74%"> - <input type="text" size="30" maxlength="60" name="lastName" value="${(person.lastName)?if_exists}" /> + <input type="text" size="30" maxlength="60" name="lastName" value="${(person.lastName)!}" /> <span class="tooltip">${uiLabelMap.CommonRequired}</span> </td> </tr> @@ -104,7 +104,7 @@ under the License. <td width="26%" align="right" valign="middle"><b>${uiLabelMap.PartyFirstName}</b></td> <td width="5"> </td> <td width="74%"> - <input type="text" size="30" maxlength="30" name="firstName" value="${(person.firstName)?if_exists}" <#if requestParameters.useShipAddr?exists>disabled</#if> /> + <input type="text" size="30" maxlength="30" name="firstName" value="${(person.firstName)!}" <#if requestParameters.useShipAddr??>disabled</#if> /> <span class="tooltip">${uiLabelMap.CommonRequired}</span> </td> </tr> @@ -112,7 +112,7 @@ under the License. <td width="26%" align="right" valign="middle"><b>${uiLabelMap.PartyLastName}</b></td> <td width="5"> </td> <td width="74%"> - <input type="text" size="30" maxlength="30" name="lastName" value="${(person.lastName)?if_exists}" <#if requestParameters.useShipAddr?exists>disabled</#if> /> + <input type="text" size="30" maxlength="30" name="lastName" value="${(person.lastName)!}" <#if requestParameters.useShipAddr??>disabled</#if> /> <span class="tooltip">${uiLabelMap.CommonRequired}</span> </td> </tr> @@ -121,7 +121,7 @@ under the License. <td width="26%" align="right" valign="middle"><b>${uiLabelMap.AccountingBillToAddress1}</b></td> <td width="5"> </td> <td width="74%"> - <input type="text" size="30" maxlength="30" name="address1" value="${(postalFields.address1)?if_exists}" <#if requestParameters.useShipAddr?exists>disabled</#if> /> + <input type="text" size="30" maxlength="30" name="address1" value="${(postalFields.address1)!}" <#if requestParameters.useShipAddr??>disabled</#if> /> <span class="tooltip">${uiLabelMap.CommonRequired}</span> </td> </tr> @@ -129,14 +129,14 @@ under the License. <td width="26%" align="right" valign="middle"><b>${uiLabelMap.AccountingBillToAddress2}</b></td> <td width="5"> </td> <td width="74%"> - <input type="text" size="30" maxlength="30" name="address2" value="${(postalFields.address2)?if_exists}" <#if requestParameters.useShipAddr?exists>disabled</#if> /> + <input type="text" size="30" maxlength="30" name="address2" value="${(postalFields.address2)!}" <#if requestParameters.useShipAddr??>disabled</#if> /> </td> </tr> <tr> <td width="26%" align="right" valign="middle"><b>${uiLabelMap.CommonCity}</b></td> <td width="5"> </td> <td width="74%"> - <input type="text" size="30" maxlength="30" name="city" value="${(postalFields.city)?if_exists}" <#if requestParameters.useShipAddr?exists>disabled</#if> /> + <input type="text" size="30" maxlength="30" name="city" value="${(postalFields.city)!}" <#if requestParameters.useShipAddr??>disabled</#if> /> <span class="tooltip">${uiLabelMap.CommonRequired}</span> </td> </tr> @@ -144,8 +144,8 @@ under the License. <td width="26%" align="right" valign="middle"><b>${uiLabelMap.CommonStateProvince}</b></td> <td width="5"> </td> <td width="74%"> - <select name="stateProvinceGeoId" <#if requestParameters.useShipAddr?exists>disabled</#if>> - <#if (postalFields.stateProvinceGeoId)?exists> + <select name="stateProvinceGeoId" <#if requestParameters.useShipAddr??>disabled</#if>> + <#if (postalFields.stateProvinceGeoId)??> <option>${postalFields.stateProvinceGeoId}</option> <option value="${postalFields.stateProvinceGeoId}">---</option> <#else> @@ -159,7 +159,7 @@ under the License. <td width="26%" align="right" valign="middle"><b>${uiLabelMap.CommonZipPostalCode}</b></td> <td width="5"> </td> <td width="74%"> - <input type="text" size="12" maxlength="10" name="postalCode" value="${(postalFields.postalCode)?if_exists}" <#if requestParameters.useShipAddr?exists>disabled</#if> /> + <input type="text" size="12" maxlength="10" name="postalCode" value="${(postalFields.postalCode)!}" <#if requestParameters.useShipAddr??>disabled</#if> /> <span class="tooltip">${uiLabelMap.CommonRequired}</span> </td> </tr> @@ -167,8 +167,8 @@ under the License. <td width="26%" align="right" valign="middle"><b>${uiLabelMap.CommonCountry}</b></td> <td width="5"> </td> <td width="74%"> - <select name="countryGeoId" <#if requestParameters.useShipAddr?exists>disabled</#if>> - <#if (postalFields.countryGeoId)?exists> + <select name="countryGeoId" <#if requestParameters.useShipAddr??>disabled</#if>> + <#if (postalFields.countryGeoId)??> <option>${postalFields.countryGeoId}</option> <option value="${postalFields.countryGeoId}">---</option> </#if> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/webapp/accounting/payment/manualTx.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/webapp/accounting/payment/manualTx.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/webapp/accounting/payment/manualTx.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/webapp/accounting/payment/manualTx.ftl Mon Aug 18 07:42:27 2014 @@ -23,7 +23,7 @@ under the License. <#if security.hasEntityPermission("MANUAL", "_PAYMENT", session) || security.hasEntityPermission("ACCOUNTING", "_CREATE", session)> ${setRequestAttribute("validTx", "false")} <form name="manualTxForm" method="post" action="<@ofbizUrl>manualETx</@ofbizUrl>"> - <#if requestParameters.paymentMethodId?exists> + <#if requestParameters.paymentMethodId??> <input type="hidden" name="paymentMethodId" value="${requestParameters.paymentMethodId}" /> </#if> @@ -47,12 +47,12 @@ under the License. <td width="5"> </td> <td width='74%'> <#if currentStore?has_content> - <div><#if currentStore.storeName?exists>${currentStore.storeName}<#else>${currentStore.productStoreId}</#if></div> + <div><#if currentStore.storeName??>${currentStore.storeName}<#else>${currentStore.productStoreId}</#if></div> <input type="hidden" name="productStoreId" value="${currentStore.productStoreId}" /> <#else> <select name="productStoreId"> <#list productStores as productStore> - <option value="${productStore.productStoreId}"><#if productStore.storeName?exists>${productStore.storeName}<#else>${productStore.productStoreId}</#if></option> + <option value="${productStore.productStoreId}"><#if productStore.storeName??>${productStore.storeName}<#else>${productStore.productStoreId}</#if></option> </#list> </select> </#if> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/webapp/accounting/period/EditCustomTimePeriod.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/webapp/accounting/period/EditCustomTimePeriod.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/webapp/accounting/period/EditCustomTimePeriod.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/webapp/accounting/period/EditCustomTimePeriod.ftl Mon Aug 18 07:42:27 2014 @@ -28,9 +28,9 @@ under the License. <br class="clear"/> </div> <form method="post" action="<@ofbizUrl>EditCustomTimePeriod</@ofbizUrl>" name="setOrganizationPartyIdForm"> - <input type="hidden" name="currentCustomTimePeriodId" value="${currentCustomTimePeriodId?if_exists}" /> + <input type="hidden" name="currentCustomTimePeriodId" value="${currentCustomTimePeriodId!}" /> <span class="label">${uiLabelMap.AccountingShowOnlyPeriodsWithOrganization}</span> - <input type="text" size="20" name="findOrganizationPartyId" value="${findOrganizationPartyId?if_exists}" /> + <input type="text" size="20" name="findOrganizationPartyId" value="${findOrganizationPartyId!}" /> <input type="submit" value='${uiLabelMap.CommonUpdate}' /> </form> </div> @@ -40,7 +40,7 @@ under the License. <#if currentCustomTimePeriod?has_content> <ul> <li class="h3">${uiLabelMap.AccountingCurrentCustomTimePeriod}</li> - <li><a href="<@ofbizUrl>EditCustomTimePeriod?findOrganizationPartyId=${findOrganizationPartyId?if_exists}</@ofbizUrl>">${uiLabelMap.CommonClearCurrent}</a></li> + <li><a href="<@ofbizUrl>EditCustomTimePeriod?findOrganizationPartyId=${findOrganizationPartyId!}</@ofbizUrl>">${uiLabelMap.CommonClearCurrent}</a></li> </ul> <#else> <h3>${uiLabelMap.AccountingCurrentCustomTimePeriod}</h3> @@ -48,8 +48,8 @@ under the License. </div> <#if currentCustomTimePeriod?has_content> <form method="post" action="<@ofbizUrl>updateCustomTimePeriod</@ofbizUrl>" name="updateCustomTimePeriodForm"> - <input type="hidden" name="findOrganizationPartyId" value="${findOrganizationPartyId?if_exists}" /> - <input type="hidden" name="customTimePeriodId" value="${currentCustomTimePeriodId?if_exists}" /> + <input type="hidden" name="findOrganizationPartyId" value="${findOrganizationPartyId!}" /> + <input type="hidden" name="customTimePeriodId" value="${currentCustomTimePeriodId!}" /> <table class="basic-table" cellspacing="0"> <tr class="header-row"> <td>${uiLabelMap.CommonId}</td> @@ -70,7 +70,7 @@ under the License. <#list allCustomTimePeriods as allCustomTimePeriod> <#assign allPeriodType = allCustomTimePeriod.getRelatedOne("PeriodType", true)> <#assign isDefault = false> - <#if (currentCustomTimePeriod.parentPeriodId)?exists> + <#if (currentCustomTimePeriod.parentPeriodId)??> <#if currentCustomTimePeriod.customTimePeriodId = allCustomTimePeriod.customTimePeriodId> <#assign isDefault = true> </#if> @@ -78,22 +78,22 @@ under the License. <option value='${allCustomTimePeriod.customTimePeriodId}'<#if isDefault> selected="selected"</#if>> ${allCustomTimePeriod.organizationPartyId} <#if allPeriodType??>${allPeriodType.description}:</#if> - ${allCustomTimePeriod.periodNum} + ${allCustomTimePeriod.periodNum!} [${allCustomTimePeriod.customTimePeriodId}] </option> </#list> </select> - <#if (currentCustomTimePeriod.parentPeriodId)?exists> - <a href='<@ofbizUrl>EditCustomTimePeriod?currentCustomTimePeriodId=${currentCustomTimePeriod.parentPeriodId}&findOrganizationPartyId=${findOrganizationPartyId?if_exists}</@ofbizUrl>'> + <#if (currentCustomTimePeriod.parentPeriodId)??> + <a href='<@ofbizUrl>EditCustomTimePeriod?currentCustomTimePeriodId=${currentCustomTimePeriod.parentPeriodId}&findOrganizationPartyId=${findOrganizationPartyId!}</@ofbizUrl>'> ${uiLabelMap.CommonSetAsCurrent}</a> </#if> </td> - <td><input type="text" size='12' name="currentCustomTimePeriod" value="${currentCustomTimePeriod.organizationPartyId?if_exists}" /></td> + <td><input type="text" size='12' name="currentCustomTimePeriod" value="${currentCustomTimePeriod.organizationPartyId!}" /></td> <td> <select name="periodTypeId"> <#list periodTypes as periodType> <#assign isDefault = false> - <#if (currentCustomTimePeriod.periodTypeId)?exists> + <#if (currentCustomTimePeriod.periodTypeId)??> <#if currentCustomTimePeriod.periodTypeId = periodType.periodTypeId> <#assign isDefault = true> </#if> @@ -104,8 +104,8 @@ under the License. </#list> </select> </td> - <td><input type="text" size='4' name="periodNum" value="${currentCustomTimePeriod.periodNum?if_exists}" /></td> - <td><input type="text" size='10' name="periodName" value="${currentCustomTimePeriod.periodName?if_exists}" /></td> + <td><input type="text" size='4' name="periodNum" value="${currentCustomTimePeriod.periodNum!}" /></td> + <td><input type="text" size='10' name="periodName" value="${currentCustomTimePeriod.periodName!}" /></td> <td> <#assign hasntStarted = false> <#assign compareDate = currentCustomTimePeriod.getDate("fromDate")> @@ -160,9 +160,7 @@ under the License. <#assign periodType = customTimePeriod.getRelatedOne("PeriodType", true)> <tr> <form method="post" action='<@ofbizUrl>updateCustomTimePeriod</@ofbizUrl>' name='lineForm${line}'> - <input type="hidden" name="findOrganizationPartyId" value="${findOrganizationPartyId?if_exists}" /> - <input type="hidden" name="currentCustomTimePeriodId" value="${currentCustomTimePeriodId?if_exists}" /> - <input type="hidden" name="customTimePeriodId" value="${customTimePeriodId?if_exists}" /> + <input type="hidden" name="customTimePeriodId" value="${customTimePeriod.customTimePeriodId!}" /> <td>${customTimePeriod.customTimePeriodId}</td> <td> <select name="parentPeriodId"> @@ -170,7 +168,7 @@ under the License. <#list allCustomTimePeriods as allCustomTimePeriod> <#assign allPeriodType = allCustomTimePeriod.getRelatedOne("PeriodType", true)> <#assign isDefault = false> - <#if (currentCustomTimePeriod.parentPeriodId)?exists> + <#if (currentCustomTimePeriod.parentPeriodId)??> <#if currentCustomTimePeriod.customTimePeriodId = allCustomTimePeriod.customTimePeriodId> <#assign isDefault = true> </#if> @@ -178,18 +176,18 @@ under the License. <option value='${allCustomTimePeriod.customTimePeriodId}'<#if isDefault> selected="selected"</#if>> ${allCustomTimePeriod.organizationPartyId} <#if allPeriodType??> ${allPeriodType.description}: </#if> - ${allCustomTimePeriod.periodNum} + ${allCustomTimePeriod.periodNum!} [${allCustomTimePeriod.customTimePeriodId}] </option> </#list> </select> </td> - <td><input type="text" size='12' name="organizationPartyId" value="${customTimePeriod.organizationPartyId?if_exists}" /></td> + <td><input type="text" size='12' name="organizationPartyId" value="${customTimePeriod.organizationPartyId!}" /></td> <td> <select name="periodTypeId"> <#list periodTypes as periodType> <#assign isDefault = false> - <#if (customTimePeriod.periodTypeId)?exists> + <#if (customTimePeriod.periodTypeId)??> <#if customTimePeriod.periodTypeId = periodType.periodTypeId> <#assign isDefault = true> </#if> @@ -198,15 +196,15 @@ under the License. </#list> </select> </td> - <td><input type="text" size='4' name="periodNum" value="${customTimePeriod.periodNum?if_exists}" /></td> - <td><input type="text" size='10' name="periodName" value="${customTimePeriod.periodName?if_exists}" /></td> + <td><input type="text" size='4' name="periodNum" value="${customTimePeriod.periodNum!}" /></td> + <td><input type="text" size='10' name="periodName" value="${customTimePeriod.periodName!}" /></td> <td> <#assign hasntStarted = false> <#assign compareDate = customTimePeriod.getDate("fromDate")> <#if compareDate?has_content> <#if nowTimestamp.before(compareDate)><#assign hasntStarted = true></#if> </#if> - <input type="text" size='13' name="fromDate" value="${customTimePeriod.fromDate?if_exists}"<#if hasntStarted> class="alert"</#if> /> + <input type="text" size='13' name="fromDate" value="${customTimePeriod.fromDate?string("yyyy-MM-dd")}"<#if hasntStarted> class="alert"</#if> /> </td> <td> <#assign hasExpired = false> @@ -214,13 +212,13 @@ under the License. <#if compareDate?has_content> <#if nowTimestamp.after(compareDate)><#assign hasExpired = true></#if> </#if> - <input type="text" size='13' name="thruDate" value="${customTimePeriod.thruDate?if_exists}"<#if hasExpired> class="alert"</#if> /> + <input type="text" size='13' name="thruDate" value="${customTimePeriod.thruDate?string("yyyy-MM-dd")}"<#if hasExpired> class="alert"</#if> /> </td> <td class="button-col"> <input type="submit" value='${uiLabelMap.CommonUpdate}'/> - <a href='<@ofbizUrl>deleteCustomTimePeriod?customTimePeriodId=${customTimePeriod.customTimePeriodId?if_exists}&currentCustomTimePeriodId=${currentCustomTimePeriodId?if_exists}&findOrganizationPartyId=${findOrganizationPartyId?if_exists}</@ofbizUrl>'> + <a href='<@ofbizUrl>deleteCustomTimePeriod?customTimePeriodId=${customTimePeriod.customTimePeriodId!}&currentCustomTimePeriodId=${currentCustomTimePeriodId!}&findOrganizationPartyId=${findOrganizationPartyId!}</@ofbizUrl>'> ${uiLabelMap.CommonDelete}</a> - <a href='<@ofbizUrl>EditCustomTimePeriod?currentCustomTimePeriodId=${customTimePeriod.customTimePeriodId?if_exists}&findOrganizationPartyId=${findOrganizationPartyId?if_exists}</@ofbizUrl>'> + <a href='<@ofbizUrl>EditCustomTimePeriod?currentCustomTimePeriodId=${customTimePeriod.customTimePeriodId!}&findOrganizationPartyId=${findOrganizationPartyId!}</@ofbizUrl>'> ${uiLabelMap.CommonSetAsCurrent}</a> </td> </form> @@ -240,8 +238,8 @@ under the License. </div> <div class="screenlet-body"> <form method="post" action="<@ofbizUrl>createCustomTimePeriod</@ofbizUrl>" name="createCustomTimePeriodForm"> - <input type="hidden" name="findOrganizationPartyId" value="${findOrganizationPartyId?if_exists}" /> - <input type="hidden" name="currentCustomTimePeriodId" value="${currentCustomTimePeriodId?if_exists}" /> + <input type="hidden" name="findOrganizationPartyId" value="${findOrganizationPartyId!}" /> + <input type="hidden" name="currentCustomTimePeriodId" value="${currentCustomTimePeriodId!}" /> <input type="hidden" name="useValues" value="true" /> <div> <span class="label">${uiLabelMap.CommonParent}</span> @@ -250,16 +248,16 @@ under the License. <#list allCustomTimePeriods as allCustomTimePeriod> <#assign allPeriodType = allCustomTimePeriod.getRelatedOne("PeriodType", true)> <#assign isDefault = false> - <#if currentCustomTimePeriod?exists> + <#if currentCustomTimePeriod??> <#if currentCustomTimePeriod.customTimePeriodId = allCustomTimePeriod.customTimePeriodId> <#assign isDefault = true> </#if> </#if> <option value="${allCustomTimePeriod.customTimePeriodId}"<#if isDefault> selected="selected"</#if>> ${allCustomTimePeriod.organizationPartyId} - <#if (allCustomTimePeriod.parentPeriodId)?exists>Par:${allCustomTimePeriod.parentPeriodId}</#if> + <#if (allCustomTimePeriod.parentPeriodId)??>Par:${allCustomTimePeriod.parentPeriodId}</#if> <#if allPeriodType??> ${allPeriodType.description}:</#if> - ${allCustomTimePeriod.periodNum} + ${allCustomTimePeriod.periodNum!} [${allCustomTimePeriod.customTimePeriodId}] </option> </#list> @@ -272,7 +270,7 @@ under the License. <select name="periodTypeId"> <#list periodTypes as periodType> <#assign isDefault = false> - <#if newPeriodTypeId?exists> + <#if newPeriodTypeId??> <#if newPeriodTypeId = periodType.periodTypeId> <#assign isDefault = true> </#if> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/webapp/accounting/reports/AcctgTransEntriesSearchResult.fo.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/webapp/accounting/reports/AcctgTransEntriesSearchResult.fo.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/webapp/accounting/reports/AcctgTransEntriesSearchResult.fo.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/webapp/accounting/reports/AcctgTransEntriesSearchResult.fo.ftl Mon Aug 18 07:42:27 2014 @@ -173,7 +173,7 @@ under the License. <fo:block text-align="center" font-size="5pt">${(acctgTransEntry.debitCreditFlag)!}</fo:block> </fo:table-cell> <fo:table-cell border="1pt solid" border-width=".1mm"> - <fo:block text-align="center" font-size="5pt"><#if acctgTransEntry.amount?exists><@ofbizCurrency amount=(acctgTransEntry.amount)! isoCode=(acctgTransEntry.currencyUomId)!/></#if></fo:block> + <fo:block text-align="center" font-size="5pt"><#if acctgTransEntry.amount??><@ofbizCurrency amount=(acctgTransEntry.amount)! isoCode=(acctgTransEntry.currencyUomId)!/></#if></fo:block> </fo:table-cell> <fo:table-cell border="1pt solid" border-width=".1mm"> <fo:block text-align="center" font-size="5pt"> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/webapp/accounting/reports/CostCentersReport.fo.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/webapp/accounting/reports/CostCentersReport.fo.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/webapp/accounting/reports/CostCentersReport.fo.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/webapp/accounting/reports/CostCentersReport.fo.ftl Mon Aug 18 07:42:27 2014 @@ -30,11 +30,11 @@ under the License. <fo:block text-align="center">${uiLabelMap.FormFieldTitle_accountName}</fo:block> </fo:table-cell> <fo:table-cell border="1pt solid" border-width=".1mm"> - <fo:block text-align="center">${uiLabelMap.FormFieldTitle_postedBalance} - (${currencyUomId?if_exists})</fo:block> + <fo:block text-align="center">${uiLabelMap.FormFieldTitle_postedBalance} - (${currencyUomId!})</fo:block> </fo:table-cell> <#list glAccountCategories as glAccountCategory> <fo:table-cell border="1pt solid" border-width=".1mm"> - <fo:block text-align="center">${glAccountCategory.description?if_exists} - (${currencyUomId?if_exists})</fo:block> + <fo:block text-align="center">${glAccountCategory.description!} - (${currencyUomId!})</fo:block> </fo:table-cell> </#list> </fo:table-header> @@ -43,20 +43,20 @@ under the License. <#if glAcctgOrgAndCostCenter?has_content> <fo:table-row> <fo:table-cell border="1pt solid" border-width=".1mm"> - <fo:block text-align="center">${glAcctBalanceByCostCenter.glAccountId?if_exists}</fo:block> + <fo:block text-align="center">${glAcctBalanceByCostCenter.glAccountId!}</fo:block> </fo:table-cell> <fo:table-cell border="1pt solid" border-width=".1mm"> - <fo:block text-align="center">${glAcctBalanceByCostCenter.accountCode?if_exists}</fo:block> + <fo:block text-align="center">${glAcctBalanceByCostCenter.accountCode!}</fo:block> </fo:table-cell> <fo:table-cell border="1pt solid" border-width=".1mm"> - <fo:block text-align="center">${glAcctBalanceByCostCenter.accountName?if_exists}</fo:block> + <fo:block text-align="center">${glAcctBalanceByCostCenter.accountName!}</fo:block> </fo:table-cell> <fo:table-cell border="1pt solid" border-width=".1mm"> - <fo:block text-align="center">${glAcctBalanceByCostCenter.balance?if_exists!}</fo:block> + <fo:block text-align="center">${glAcctBalanceByCostCenter.balance!!}</fo:block> </fo:table-cell> <#list glAccountCategories as glAccountCategory> <fo:table-cell border="1pt solid" border-width=".1mm"> - <fo:block text-align="center">${(glAcctBalanceByCostCenter[glAccountCategory.glAccountCategoryId?if_exists]?if_exists)}</fo:block> + <fo:block text-align="center">${(glAcctBalanceByCostCenter[glAccountCategory.glAccountCategoryId!]!)}</fo:block> </fo:table-cell> </#list> </fo:table-row> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/webapp/accounting/reports/CostCentersReport.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/webapp/accounting/reports/CostCentersReport.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/webapp/accounting/reports/CostCentersReport.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/webapp/accounting/reports/CostCentersReport.ftl Mon Aug 18 07:42:27 2014 @@ -31,12 +31,12 @@ under the License. <#assign alt_row = false> <#list glAcctBalancesByCostCenter as glAcctBalanceByCostCenter> <tr <#if alt_row> class="alternate-row"</#if>> - <td>${glAcctBalanceByCostCenter.glAccountId?if_exists}</td> - <td>${glAcctBalanceByCostCenter.accountCode?if_exists}</td> - <td>${glAcctBalanceByCostCenter.accountName?if_exists}</td> - <td>${glAcctBalanceByCostCenter.balance?if_exists}</td> + <td>${glAcctBalanceByCostCenter.glAccountId!}</td> + <td>${glAcctBalanceByCostCenter.accountCode!}</td> + <td>${glAcctBalanceByCostCenter.accountName!}</td> + <td>${glAcctBalanceByCostCenter.balance!}</td> <#list glAccountCategories as glAccountCategory> - <td>${(glAcctBalanceByCostCenter[glAccountCategory.glAccountCategoryId?if_exists]?if_exists)}</td> + <td>${(glAcctBalanceByCostCenter[glAccountCategory.glAccountCategoryId!]!)}</td> </#list> <#assign alt_row = !alt_row> </tr> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/webapp/accounting/reports/DepositSlip.fo.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/webapp/accounting/reports/DepositSlip.fo.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/webapp/accounting/reports/DepositSlip.fo.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/webapp/accounting/reports/DepositSlip.fo.ftl Mon Aug 18 07:42:27 2014 @@ -21,14 +21,14 @@ under the License. <fo:block font-size="14pt" font-weight="bold" text-align="center">${uiLabelMap.AccountingDepositSlip}</fo:block> <fo:block font-size="12pt" text-align="left" font-weight="bold"> <#if paymentGroup?has_content> - ${uiLabelMap.AccountingPaymentGroupId} : ${parameters.paymentGroupId?if_exists} + ${uiLabelMap.AccountingPaymentGroupId} : ${parameters.paymentGroupId!} <#else> - ${uiLabelMap.FormFieldTitle_finAccountTransId} : ${parameters.finAccountTransId?if_exists} + ${uiLabelMap.FormFieldTitle_finAccountTransId} : ${parameters.finAccountTransId!} </#if> </fo:block> <fo:block font-size="12pt" text-align="left"> <#if paymentGroup?has_content> - ${uiLabelMap.AccountingPaymentGroupName} : ${paymentGroup.paymentGroupName?if_exists} + ${uiLabelMap.AccountingPaymentGroupName} : ${paymentGroup.paymentGroupName!} </#if> </fo:block> <fo:block><fo:leader/></fo:block> @@ -70,21 +70,21 @@ under the License. </#if> <#if payment.paymentMethodTypeId?has_content> <#assign paymentMethodType = delegator.findOne("PaymentMethodType", {"paymentMethodTypeId" : payment.paymentMethodTypeId}, false)/> - <#if payment.paymentMethodTypeId?if_exists == "CREDIT_CARD"> + <#if payment.paymentMethodTypeId! == "CREDIT_CARD"> <#assign creditCard = delegator.findOne("CreditCard", {"paymentMethodId" : payment.paymentMethodId}, false)/> </#if> </#if> <fo:table-row> <fo:table-cell padding="2pt" border="1pt solid" border-width=".1mm"> - <fo:block>${payment.paymentId?if_exists}</fo:block> + <fo:block>${payment.paymentId!}</fo:block> </fo:table-cell> <fo:table-cell padding="2pt" border="1pt solid" border-width=".1mm"> <fo:block text-align="center"> - ${payment.paymentRefNum?if_exists} + ${payment.paymentRefNum!} </fo:block> </fo:table-cell> <fo:table-cell padding="2pt" border="1pt solid" border-width=".1mm"> - <fo:block text-align="right">${paymentMethodType.description?if_exists} <#if creditCard?has_content && creditCard??>(${creditCard.cardType?if_exists})</#if></fo:block> + <fo:block text-align="right">${paymentMethodType.description!} <#if creditCard?has_content && creditCard??>(${creditCard.cardType!})</#if></fo:block> <#assign creditCard = null/> </fo:table-cell> <fo:table-cell padding="2pt" border="1pt solid" border-width=".1mm"> @@ -100,9 +100,9 @@ under the License. </fo:table-cell> <fo:table-cell padding="2pt" border="1pt solid" border-width=".1mm"> <fo:block text-align="right"> - <@ofbizCurrency amount=payment.amount?if_exists isoCode=payment.currencyUomId?if_exists/> - <#assign totalAmount = totalAmount + payment.amount?if_exists/> - <#assign currencyUomId = payment.currencyUomId?if_exists/> + <@ofbizCurrency amount=payment.amount! isoCode=payment.currencyUomId!/> + <#assign totalAmount = totalAmount + payment.amount!/> + <#assign currencyUomId = payment.currencyUomId!/> </fo:block> </fo:table-cell> </fo:table-row> @@ -116,7 +116,7 @@ under the License. </fo:table-cell> <fo:table-cell padding="4pt" background-color="#D4D0C8"> <fo:block text-align="right"> - <@ofbizCurrency amount=totalAmount?if_exists isoCode=currencyUomId?if_exists/> + <@ofbizCurrency amount=totalAmount! isoCode=currencyUomId!/> </fo:block> </fo:table-cell> </fo:table-row> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/webapp/accounting/reports/SalesInvoiceByProductCategorySummary.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/webapp/accounting/reports/SalesInvoiceByProductCategorySummary.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/webapp/accounting/reports/SalesInvoiceByProductCategorySummary.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/webapp/accounting/reports/SalesInvoiceByProductCategorySummary.ftl Mon Aug 18 07:42:27 2014 @@ -19,7 +19,7 @@ under the License. <#macro resultSummary resultMap> <#if resultMap?has_content> - ${resultMap.quantityTotal?default(0)}:${resultMap.amountTotal?default(0)}:<#if (resultMap.quantityTotal?exists && resultMap.quantityTotal > 0)>${resultMap.amountTotal/resultMap.quantityTotal}<#else/>0</#if> + ${resultMap.quantityTotal?default(0)}:${resultMap.amountTotal?default(0)}:<#if (resultMap.quantityTotal?? && resultMap.quantityTotal > 0)>${resultMap.amountTotal/resultMap.quantityTotal}<#else/>0</#if> <#else/> 0:0:0 </#if> @@ -27,9 +27,9 @@ under the License. <ul> <li>Month: ${month}/${year}</li> - <li>Root Category: ${(Static["org.ofbiz.product.category.CategoryContentWrapper"].getProductCategoryContentAsText(rootProductCategory, "CATEGORY_NAME", locale, dispatcher))?if_exists} [${rootProductCategoryId}]</li> - <li>Organization: ${(organizationPartyName.groupName)?if_exists} [${organizationPartyId?default("No Organization Specified")}]</li> - <li>Currency: ${(currencyUom.description)?if_exists} [${currencyUomId?default("No Currency Specified")}]</li> + <li>Root Category: ${(Static["org.ofbiz.product.category.CategoryContentWrapper"].getProductCategoryContentAsText(rootProductCategory, "CATEGORY_NAME", locale, dispatcher))!} [${rootProductCategoryId}]</li> + <li>Organization: ${(organizationPartyName.groupName)!} [${organizationPartyId?default("No Organization Specified")}]</li> + <li>Currency: ${(currencyUom.description)!} [${currencyUomId?default("No Currency Specified")}]</li> </ul> <div>NOTE: each set of numbers is: <quantity>:<total amount>:<average amount></div> <table class="basic-table" cellspacing="0"> @@ -38,10 +38,10 @@ under the License. <td>Day</td> <td>[No Product]</td> <#list productList as product> - <td>${product.internalName?default((Static["org.ofbiz.product.product.ProductContentWrapper"].getProductContentAsText(product, "PRODUCT_NAME", locale, dispatcher))?if_exists)}<br />P:[${product.productId}]</td> + <td>${product.internalName?default((Static["org.ofbiz.product.product.ProductContentWrapper"].getProductContentAsText(product, "PRODUCT_NAME", locale, dispatcher))!)}<br />P:[${product.productId}]</td> </#list> <#list productCategoryList as productCategory> - <td>${(Static["org.ofbiz.product.category.CategoryContentWrapper"].getProductCategoryContentAsText(productCategory, "CATEGORY_NAME", locale, dispatcher))?if_exists}<br />C:[${productCategory.productCategoryId}]</td> + <td>${(Static["org.ofbiz.product.category.CategoryContentWrapper"].getProductCategoryContentAsText(productCategory, "CATEGORY_NAME", locale, dispatcher))!}<br />C:[${productCategory.productCategoryId}]</td> </#list> </tr> <#-- Days of the month --> @@ -54,11 +54,11 @@ under the License. <td class="label">${(productNullResult_index + 1)}</td> <td><@resultSummary resultMap=productNullResult/></td> <#list productList as product> - <#assign productResult = productResultMap[product.productId]?if_exists/> + <#assign productResult = productResultMap[product.productId]!/> <td><@resultSummary resultMap=productResult/></td> </#list> <#list productCategoryList as productCategory> - <#assign categoryResult = categoryResultMap[productCategory.productCategoryId]?if_exists/> + <#assign categoryResult = categoryResultMap[productCategory.productCategoryId]!/> <td><@resultSummary resultMap=categoryResult/></td> </#list> </tr> @@ -69,11 +69,11 @@ under the License. <td class="label">Month Total</td> <td><@resultSummary resultMap=monthProductNullResult/></td> <#list productList as product> - <#assign productResult = monthProductResultMap[product.productId]?if_exists/> + <#assign productResult = monthProductResultMap[product.productId]!/> <td><@resultSummary resultMap=productResult/></td> </#list> <#list productCategoryList as productCategory> - <#assign categoryResult = monthCategoryResultMap[productCategory.productCategoryId]?if_exists/> + <#assign categoryResult = monthCategoryResultMap[productCategory.productCategoryId]!/> <td><@resultSummary resultMap=categoryResult/></td> </#list> </tr> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/webapp/ap/invoices/CommissionRun.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/webapp/ap/invoices/CommissionRun.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/webapp/ap/invoices/CommissionRun.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/webapp/ap/invoices/CommissionRun.ftl Mon Aug 18 07:42:27 2014 @@ -107,18 +107,18 @@ function enableSubmitButton() { <#assign alt_row = false> <#list invoices as invoice> <#assign invoicePaymentInfoList = dispatcher.runSync("getInvoicePaymentInfoList", Static["org.ofbiz.base.util.UtilMisc"].toMap("invoiceId", invoice.invoiceId, "userLogin", userLogin))/> - <#assign invoicePaymentInfo = invoicePaymentInfoList.get("invoicePaymentInfoList").get(0)?if_exists> - <#assign statusItem = delegator.findOne("StatusItem", {"statusId" : invoice.statusId}, false)?if_exists/> + <#assign invoicePaymentInfo = invoicePaymentInfoList.get("invoicePaymentInfoList").get(0)!> + <#assign statusItem = delegator.findOne("StatusItem", {"statusId" : invoice.statusId}, false)!/> <tr valign="middle"<#if alt_row> class="alternate-row"</#if>> <td><input type="checkbox" id="invoiceId_${invoice_index}" name="invoiceIds" value="${invoice.invoiceId}" onclick="javascript:enableSubmitButton();"/></td> <td><a class="buttontext" href="<@ofbizUrl>invoiceOverview?invoiceId=${invoice.invoiceId}</@ofbizUrl>">${invoice.get("invoiceId")}</a></td> - <td><a href="/partymgr/control/viewprofile?partyId=${invoice.partyIdFrom}">${Static["org.ofbiz.party.party.PartyHelper"].getPartyName(delegator, invoice.partyIdFrom, false)?if_exists}</a></td> - <td><a href="/partymgr/control/viewprofile?partyId=${invoice.invoiceRolePartyId}">${Static["org.ofbiz.party.party.PartyHelper"].getPartyName(delegator, invoice.invoiceRolePartyId, false)?if_exists}</a></td> - <td>${statusItem.get("description")?if_exists}</td> - <td>${invoice.get("referenceNumber")?if_exists}</td> - <td>${invoice.get("description")?if_exists}</td> - <td>${invoice.get("invoiceDate")?if_exists}</td> - <td>${invoice.get("dueDate")?if_exists}</td> + <td><a href="/partymgr/control/viewprofile?partyId=${invoice.partyIdFrom}">${Static["org.ofbiz.party.party.PartyHelper"].getPartyName(delegator, invoice.partyIdFrom, false)!}</a></td> + <td><a href="/partymgr/control/viewprofile?partyId=${invoice.invoiceRolePartyId}">${Static["org.ofbiz.party.party.PartyHelper"].getPartyName(delegator, invoice.invoiceRolePartyId, false)!}</a></td> + <td>${statusItem.get("description")!}</td> + <td>${invoice.get("referenceNumber")!}</td> + <td>${invoice.get("description")!}</td> + <td>${invoice.get("invoiceDate")!}</td> + <td>${invoice.get("dueDate")!}</td> <td><@ofbizCurrency amount=invoicePaymentInfo.amount isoCode=defaultOrganizationPartyCurrencyUomId/></td> <td><@ofbizCurrency amount=invoicePaymentInfo.paidAmount isoCode=defaultOrganizationPartyCurrencyUomId/></td> <td><@ofbizCurrency amount=invoicePaymentInfo.outstandingAmount isoCode=defaultOrganizationPartyCurrencyUomId/></td> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/webapp/ap/invoices/PurchaseInvoices.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/webapp/ap/invoices/PurchaseInvoices.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/webapp/ap/invoices/PurchaseInvoices.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/webapp/ap/invoices/PurchaseInvoices.ftl Mon Aug 18 07:42:27 2014 @@ -146,12 +146,12 @@ function runAction() { </div> <input type="hidden" name="invoiceStatusChange" id="invoiceStatusChange" value="<@ofbizUrl>massChangeInvoiceStatus</@ofbizUrl>"/> <input type="hidden" name="organizationPartyId" value="${organizationPartyId}"/> - <input type="hidden" name="partyIdFrom" value="${parameters.partyIdFrom?if_exists}"/> - <input type="hidden" name="statusId" id="statusId" value="${parameters.statusId?if_exists}"/> - <input type="hidden" name="fromInvoiceDate" value="${parameters.fromInvoiceDate?if_exists}"/> - <input type="hidden" name="thruInvoiceDate" value="${parameters.thruInvoiceDate?if_exists}"/> - <input type="hidden" name="fromDueDate" value="${parameters.fromDueDate?if_exists}"/> - <input type="hidden" name="thruDueDate" value="${parameters.thruDueDate?if_exists}"/> + <input type="hidden" name="partyIdFrom" value="${parameters.partyIdFrom!}"/> + <input type="hidden" name="statusId" id="statusId" value="${parameters.statusId!}"/> + <input type="hidden" name="fromInvoiceDate" value="${parameters.fromInvoiceDate!}"/> + <input type="hidden" name="thruInvoiceDate" value="${parameters.thruInvoiceDate!}"/> + <input type="hidden" name="fromDueDate" value="${parameters.fromDueDate!}"/> + <input type="hidden" name="thruDueDate" value="${parameters.thruDueDate!}"/> <div id="issueChecks" style="display: none;" align="right"> <span class="label">${uiLabelMap.AccountingVendorPaymentMethod}</span> <select name="paymentMethodId"> @@ -191,17 +191,17 @@ function runAction() { <#assign alt_row = false> <#list invoices as invoice> <#assign invoicePaymentInfoList = dispatcher.runSync("getInvoicePaymentInfoList", Static["org.ofbiz.base.util.UtilMisc"].toMap("invoiceId", invoice.invoiceId, "userLogin", userLogin))/> - <#assign invoicePaymentInfo = invoicePaymentInfoList.get("invoicePaymentInfoList").get(0)?if_exists> + <#assign invoicePaymentInfo = invoicePaymentInfoList.get("invoicePaymentInfoList").get(0)!> <#assign statusItem = invoice.getRelatedOne("StatusItem", true)> <tr valign="middle"<#if alt_row> class="alternate-row"</#if>> <td><a class="buttontext" href="<@ofbizUrl>invoiceOverview?invoiceId=${invoice.invoiceId}</@ofbizUrl>">${invoice.get("invoiceId")}</a></td> <td><#if invoice.get("invoiceDate")?has_content>${invoice.get("invoiceDate")?date}</td></#if> <td><#if invoice.get("dueDate")?has_content>${invoice.get("dueDate")?date}</td></#if> <td>${statusItem.description?default(invoice.statusId)}</td> - <td>${invoice.get("referenceNumber")?if_exists}</td> - <td>${(invoice.description)?if_exists}</td> - <td><a href="/partymgr/control/viewprofile?partyId=${invoice.partyIdFrom}">${Static["org.ofbiz.party.party.PartyHelper"].getPartyName(delegator, invoice.partyIdFrom, false)?if_exists} [${(invoice.partyIdFrom)?if_exists}] </a></td> - <td><a href="/partymgr/control/viewprofile?partyId=${invoice.partyId}">${Static["org.ofbiz.party.party.PartyHelper"].getPartyName(delegator, invoice.partyId, false)?if_exists} [${(invoice.partyId)?if_exists}]</a></td> + <td>${invoice.get("referenceNumber")!}</td> + <td>${(invoice.description)!}</td> + <td><a href="/partymgr/control/viewprofile?partyId=${invoice.partyIdFrom}">${Static["org.ofbiz.party.party.PartyHelper"].getPartyName(delegator, invoice.partyIdFrom, false)!} [${(invoice.partyIdFrom)!}] </a></td> + <td><a href="/partymgr/control/viewprofile?partyId=${invoice.partyId}">${Static["org.ofbiz.party.party.PartyHelper"].getPartyName(delegator, invoice.partyId, false)!} [${(invoice.partyId)!}]</a></td> <td><@ofbizCurrency amount=invoicePaymentInfo.amount isoCode=defaultOrganizationPartyCurrencyUomId/></td> <td><@ofbizCurrency amount=invoicePaymentInfo.paidAmount isoCode=defaultOrganizationPartyCurrencyUomId/></td> <td><@ofbizCurrency amount=invoicePaymentInfo.outstandingAmount isoCode=defaultOrganizationPartyCurrencyUomId/></td> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/webapp/ar/invoice/ListInvoices.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/webapp/ar/invoice/ListInvoices.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/webapp/ar/invoice/ListInvoices.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/webapp/ar/invoice/ListInvoices.ftl Mon Aug 18 07:42:27 2014 @@ -115,7 +115,7 @@ under the License. <#assign invoiceList = invoices.getCompleteList() /> <#assign eliClose = invoices.close() /> </#if> -<#if invoiceList?has_content && (parameters.noConditionFind)?if_exists == 'Y'> +<#if invoiceList?has_content && (parameters.noConditionFind)! == 'Y'> <div> <span class="label">${uiLabelMap.AccountingRunningTotalOutstanding} :</span> <span class="label" id="showInvoiceRunningTotal"></span> @@ -134,12 +134,12 @@ under the License. </select> <input id="submitButton" type="button" onclick="javascript:jQuery('#listInvoices').submit();" value="${uiLabelMap.CommonRun}" disabled="disabled" /> <input type="hidden" name="organizationPartyId" value="${defaultOrganizationPartyId}"/> - <input type="hidden" name="partyIdFrom" value="${parameters.partyIdFrom?if_exists}"/> - <input type="hidden" name="statusId" id="statusId" value="${parameters.statusId?if_exists}"/> - <input type="hidden" name="fromInvoiceDate" value="${parameters.fromInvoiceDate?if_exists}"/> - <input type="hidden" name="thruInvoiceDate" value="${parameters.thruInvoiceDate?if_exists}"/> - <input type="hidden" name="fromDueDate" value="${parameters.fromDueDate?if_exists}"/> - <input type="hidden" name="thruDueDate" value="${parameters.thruDueDate?if_exists}"/> + <input type="hidden" name="partyIdFrom" value="${parameters.partyIdFrom!}"/> + <input type="hidden" name="statusId" id="statusId" value="${parameters.statusId!}"/> + <input type="hidden" name="fromInvoiceDate" value="${parameters.fromInvoiceDate!}"/> + <input type="hidden" name="thruInvoiceDate" value="${parameters.thruInvoiceDate!}"/> + <input type="hidden" name="fromDueDate" value="${parameters.fromDueDate!}"/> + <input type="hidden" name="thruDueDate" value="${parameters.thruDueDate!}"/> <input type="hidden" name="invoiceStatusChange" id="invoiceStatusChange" value="<@ofbizUrl>massChangeInvoiceStatus</@ofbizUrl>"/> </div> @@ -163,21 +163,21 @@ under the License. <#assign alt_row = false> <#list invoiceList as invoice> <#assign invoicePaymentInfoList = dispatcher.runSync("getInvoicePaymentInfoList", Static["org.ofbiz.base.util.UtilMisc"].toMap("invoiceId", invoice.invoiceId, "userLogin", userLogin))/> - <#assign invoicePaymentInfo = invoicePaymentInfoList.get("invoicePaymentInfoList").get(0)?if_exists> + <#assign invoicePaymentInfo = invoicePaymentInfoList.get("invoicePaymentInfoList").get(0)!> <tr valign="middle"<#if alt_row> class="alternate-row"</#if>> <td><a class="buttontext" href="<@ofbizUrl>invoiceOverview?invoiceId=${invoice.invoiceId}</@ofbizUrl>">${invoice.get("invoiceId")}</a></td> <td> <#assign invoiceType = delegator.findOne("InvoiceType", {"invoiceTypeId" : invoice.invoiceTypeId}, true) /> ${invoiceType.description?default(invoice.invoiceTypeId)} </td> - <td>${(invoice.invoiceDate)?if_exists}</td> + <td>${(invoice.invoiceDate)!}</td> <td> <#assign statusItem = delegator.findOne("StatusItem", {"statusId" : invoice.statusId}, true) /> ${statusItem.description?default(invoice.statusId)} </td> - <td>${(invoice.description)?if_exists}</td> - <td><a href="/partymgr/control/viewprofile?partyId=${invoice.partyIdFrom}">${Static["org.ofbiz.party.party.PartyHelper"].getPartyName(delegator, invoice.partyIdFrom, false)?if_exists} [${(invoice.partyIdFrom)?if_exists}] </a></td> - <td><a href="/partymgr/control/viewprofile?partyId=${invoice.partyId}">${Static["org.ofbiz.party.party.PartyHelper"].getPartyName(delegator, invoice.partyId, false)?if_exists} [${(invoice.partyId)?if_exists}]</a></td> + <td>${(invoice.description)!}</td> + <td><a href="/partymgr/control/viewprofile?partyId=${invoice.partyIdFrom}">${Static["org.ofbiz.party.party.PartyHelper"].getPartyName(delegator, invoice.partyIdFrom, false)!} [${(invoice.partyIdFrom)!}] </a></td> + <td><a href="/partymgr/control/viewprofile?partyId=${invoice.partyId}">${Static["org.ofbiz.party.party.PartyHelper"].getPartyName(delegator, invoice.partyId, false)!} [${(invoice.partyId)!}]</a></td> <td><@ofbizCurrency amount=invoicePaymentInfo.amount isoCode=defaultOrganizationPartyCurrencyUomId/></td> <td><@ofbizCurrency amount=invoicePaymentInfo.paidAmount isoCode=defaultOrganizationPartyCurrencyUomId/></td> <td><@ofbizCurrency amount=invoicePaymentInfo.outstandingAmount isoCode=defaultOrganizationPartyCurrencyUomId/></td> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/webapp/ar/payment/batchPayments.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/webapp/ar/payment/batchPayments.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/webapp/ar/payment/batchPayments.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/webapp/ar/payment/batchPayments.ftl Mon Aug 18 07:42:27 2014 @@ -139,19 +139,19 @@ function setServiceName(selection) { <option value="massPaymentsToVoid">${uiLabelMap.AccountingPaymentTabStatusToVoid}</option> </select> <input id="submitButton" type="button" onclick="javascript:jQuery('#paymentBatchForm').submit();" value="${uiLabelMap.CommonRun}" disabled="disabled" /> - <input type="hidden" name='organizationPartyId' value="${organizationPartyId?if_exists}" /> + <input type="hidden" name='organizationPartyId' value="${organizationPartyId!}" /> <input type="hidden" name='paymentGroupTypeId' value="BATCH_PAYMENT" /> <input type="hidden" name="groupInOneTransaction" value="Y" /> <input type="hidden" name="paymentStatusChange" id="paymentStatusChange" value="<@ofbizUrl>massChangePaymentStatus</@ofbizUrl>" /> - <input type="hidden" name="statusId" id="statusId" value="${parameters.statusId?if_exists}" /> + <input type="hidden" name="statusId" id="statusId" value="${parameters.statusId!}" /> <#if finAccountId?has_content> - <input type="hidden" name='finAccountId' value="${finAccountId?if_exists}" /> + <input type="hidden" name='finAccountId' value="${finAccountId!}" /> </#if> - <input type="hidden" name='paymentMethodTypeId' value="${paymentMethodTypeId?if_exists}" /> - <input type="hidden" name='cardType' value="${cardType?if_exists}" /> - <input type="hidden" name='partyIdFrom' value="${partyIdFrom?if_exists}" /> - <input type="hidden" name='fromDate' value="${fromDate?if_exists}" /> - <input type="hidden" name='thruDate' value="${thruDate?if_exists}" /> + <input type="hidden" name='paymentMethodTypeId' value="${paymentMethodTypeId!}" /> + <input type="hidden" name='cardType' value="${cardType!}" /> + <input type="hidden" name='partyIdFrom' value="${partyIdFrom!}" /> + <input type="hidden" name='fromDate' value="${fromDate!}" /> + <input type="hidden" name='thruDate' value="${thruDate!}" /> </div> </div> <div id="createPaymentBatch" style="display: none;" class="align-float"> @@ -198,23 +198,23 @@ function setServiceName(selection) { <td> ${payment.statusDesc?default(payment.statusId)} </td> - <td>${(payment.comments)?if_exists}</td> + <td>${(payment.comments)!}</td> <td> - <a href="/partymgr/control/viewprofile?partyId=${payment.partyIdFrom}">${(payment.partyFromFirstName)?if_exists} ${(payment.partyFromLastName)?if_exists} ${(payment.partyFromGroupName)?if_exists}[${(payment.partyIdFrom)?if_exists}]</a> + <a href="/partymgr/control/viewprofile?partyId=${payment.partyIdFrom}">${(payment.partyFromFirstName)!} ${(payment.partyFromLastName)!} ${(payment.partyFromGroupName)!}[${(payment.partyIdFrom)!}]</a> </td> <td> - <a href="/partymgr/control/viewprofile?partyId=${payment.partyIdTo}">${(payment.partyToFirstName)?if_exists} ${(payment.partyToLastName)?if_exists} ${(payment.partyToGroupName)?if_exists}[${(payment.partyIdTo)?if_exists}]</a> + <a href="/partymgr/control/viewprofile?partyId=${payment.partyIdTo}">${(payment.partyToFirstName)!} ${(payment.partyToLastName)!} ${(payment.partyToGroupName)!}[${(payment.partyIdTo)!}]</a> </td> - <td>${payment.effectiveDate?if_exists}</td> + <td>${payment.effectiveDate!}</td> <td><@ofbizCurrency amount = payment.amount isoCode = payment.currencyUomId /></td> <td> <#assign amountToApply = Static["org.ofbiz.accounting.payment.PaymentWorker"].getPaymentNotApplied(payment) /> <@ofbizCurrency amount = amountToApply isoCode = amountToApply.currencyUomId /> </td> <td> - <#assign creditCard = (delegator.findOne("CreditCard", {"paymentMethodId" : payment.paymentMethodId}, false))?if_exists /> + <#assign creditCard = (delegator.findOne("CreditCard", {"paymentMethodId" : payment.paymentMethodId}, false))! /> ${payment.paymentMethodTypeDesc?default(payment.paymentMethodTypeId)} - <#if creditCard?has_content>/${(creditCard.cardType)?if_exists}</#if> + <#if creditCard?has_content>/${(creditCard.cardType)!}</#if> </td> <td> <input type="checkbox" id="paymentId_${payment_index}" name="paymentIds" value="${payment.paymentId}" onclick="javascript:getPaymentRunningTotal('paymentId_${payment_index}');" /> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/commonext/webapp/ofbizsetup/organization/viewcontact.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/commonext/webapp/ofbizsetup/organization/viewcontact.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/commonext/webapp/ofbizsetup/organization/viewcontact.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/commonext/webapp/ofbizsetup/organization/viewcontact.ftl Mon Aug 18 07:42:27 2014 @@ -62,14 +62,14 @@ 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.geoName?default(country.geoId)} @@ -77,7 +77,7 @@ under the License. </div> </#if> <#if (postalAddress?has_content && !postalAddress.countryGeoId?has_content) || postalAddress.countryGeoId = "USA"> - <#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)> @@ -88,12 +88,12 @@ under the License. <#if contactMechPurposeType?has_content> <#assign popUptitle = contactMechPurposeType.get("description",locale) + uiLabelMap.CommonGeoLocation> </#if> - <a href="javascript:popUp('<@ofbizUrl>geoLocation?geoPointId=${postalAddress.geoPointId}</@ofbizUrl>', '${popUptitle?if_exists}', '450', '550')" class="buttontext">${uiLabelMap.CommonGeoLocation}</a> + <a href="javascript:popUp('<@ofbizUrl>geoLocation?geoPointId=${postalAddress.geoPointId}</@ofbizUrl>', '${popUptitle!}', '450', '550')" class="buttontext">${uiLabelMap.CommonGeoLocation}</a> </#if> <#elseif "TELECOM_NUMBER" = contactMech.contactMechTypeId> <#assign telecomNumber = contactMechMap.telecomNumber> <div> - ${telecomNumber.countryCode?if_exists} + ${telecomNumber.countryCode!} <#if telecomNumber.areaCode?has_content>${telecomNumber.areaCode?default("000")}-</#if>${telecomNumber.contactNumber?default("000-0000")} <#if partyContactMech.extension?has_content>${uiLabelMap.PartyContactExt} ${partyContactMech.extension}</#if> <#if (telecomNumber?has_content && !telecomNumber.countryCode?has_content) || telecomNumber.countryCode = "011"> @@ -103,23 +103,23 @@ under the License. </div> <#elseif "EMAIL_ADDRESS" = contactMech.contactMechTypeId> <div> - ${contactMech.infoString?if_exists} + ${contactMech.infoString!} <#--a href="<@ofbizUrl>EditCommunicationEvent?partyIdFrom=${userLogin.partyId}&partyIdTo=${partyId}&communicationEventTypeId=EMAIL_COMMUNICATION&contactMechIdTo=${contactMech.contactMechId}&contactMechTypeId=EMAIL_ADDRESS<#if thisUserPrimaryEmail?has_content>&contactMechIdFrom=${thisUserPrimaryEmail.contactMechId}</#if></@ofbizUrl>" class="buttontext">${uiLabelMap.CommonSendEmail}</a--> </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="<@ofbizUrl>createCustRequest</@ofbizUrl>" method="post" onsubmit="javascript:submitFormDisableSubmits(this)"> <input type="hidden" name="partyId" value="${partyId}"/> <input type="hidden" name="fromPartyId" value="${partyId}"/> @@ -133,7 +133,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="<@ofbizUrl>editcontactmech?partyId=${partyId}&contactMechId=${contactMech.contactMechId}</@ofbizUrl>">${uiLabelMap.CommonUpdate}</a> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/content/script/org/ofbiz/content/data/DataServices.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/content/script/org/ofbiz/content/data/DataServices.xml?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/content/script/org/ofbiz/content/data/DataServices.xml (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/content/script/org/ofbiz/content/data/DataServices.xml Mon Aug 18 07:42:27 2014 @@ -724,8 +724,11 @@ under the License. </then> </if> <check-errors/> - - <call-class-method class-name="org.ofbiz.content.data.DataResourceWorker" method-name="getDataResourceContentUploadPath" ret-field="uploadPath"/> + <set field="absolute" value="true" type="Boolean"/> + <call-class-method method-name="getDataResourceContentUploadPath" class-name="org.ofbiz.content.data.DataResourceWorker" ret-field="uploadPath"> + <field field="delegator" type="org.ofbiz.entity.Delegator"/> + <field field="absolute" type="boolean"/> + </call-class-method> <log level="info" message="[attachLocalFileToDataResource] - Found Subdir : ${uploadPath}"/> <set from-field="parameters._uploadedFile_contentType" field="extenLookup.mimeTypeId"/> @@ -792,7 +795,8 @@ under the License. <check-errors/> <set field="absolute" value="false" type="Boolean"/> - <call-class-method class-name="org.ofbiz.content.data.DataResourceWorker" method-name="getDataResourceContentUploadPath" ret-field="uploadPath"> + <call-class-method method-name="getDataResourceContentUploadPath" class-name="org.ofbiz.content.data.DataResourceWorker" ret-field="uploadPath"> + <field field="delegator" type="org.ofbiz.entity.Delegator"/> <field field="absolute" type="boolean"/> </call-class-method> <log level="info" message="[attachLocalFileToDataResource] - Found Subdir : ${uploadPath}"/> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/content/src/org/ofbiz/content/data/DataResourceWorker.java URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/content/src/org/ofbiz/content/data/DataResourceWorker.java?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/content/src/org/ofbiz/content/data/DataResourceWorker.java (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/content/src/org/ofbiz/content/data/DataResourceWorker.java Mon Aug 18 07:42:27 2014 @@ -483,6 +483,16 @@ public class DataResourceWorker impleme return getDataResourceContentUploadPath(initialPath, maxFiles, absolute); } + public static String getDataResourceContentUploadPath(Delegator delegator, boolean absolute) { + String initialPath = EntityUtilProperties.getPropertyValue("content.properties", "content.upload.path.prefix", delegator); + double maxFiles = UtilProperties.getPropertyNumber("content.properties", "content.upload.max.files"); + if (maxFiles < 1) { + maxFiles = 250; + } + + return getDataResourceContentUploadPath(initialPath, maxFiles, absolute); + } + public static String getDataResourceContentUploadPath(String initialPath, double maxFiles) { return getDataResourceContentUploadPath(initialPath, maxFiles, true); } Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/content/template/email/servicenotification.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/content/template/email/servicenotification.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/content/template/email/servicenotification.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/content/template/email/servicenotification.ftl Mon Aug 18 07:42:27 2014 @@ -22,11 +22,11 @@ The service : ${service.name} The Context : <#list serviceContext.keySet() as ckey> - ${ckey?if_exists} --> ${(serviceContext.get(ckey))?if_exists} + ${ckey!} --> ${(serviceContext.get(ckey))!} </#list> The Result : <#list serviceResult.keySet() as rkey> - ${rkey?if_exists} --> ${(serviceResult.get(rkey))?if_exists} + ${rkey!} --> ${(serviceResult.get(rkey))!} </#list> </pre> \ No newline at end of file Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/content/template/survey/genericsurvey.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/content/template/survey/genericsurvey.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/content/template/survey/genericsurvey.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/content/template/survey/genericsurvey.ftl Mon Aug 18 07:42:27 2014 @@ -18,7 +18,7 @@ under the License. --> <#macro renderSurveyQuestionText surveyQuestionAndAppl> - <div>${surveyQuestionAndAppl.question?if_exists}</div> + <div>${surveyQuestionAndAppl.question!}</div> <#if surveyQuestionAndAppl.hint?has_content> <div>${surveyQuestionAndAppl.hint}</div> </#if> @@ -43,37 +43,37 @@ under the License. <option <#if "N" == selectedOption>selected="selected"</#if>>N</option> </select> <#elseif surveyQuestionAndAppl.surveyQuestionTypeId == "TEXTAREA"/> - <textarea cols="40" rows="5" name="${questionFieldName}">${(answer.textResponse)?if_exists}</textarea> + <textarea cols="40" rows="5" name="${questionFieldName}">${(answer.textResponse)!}</textarea> <#elseif surveyQuestionAndAppl.surveyQuestionTypeId == "TEXT_SHORT"/> - <input type="text" size="15" class="inputBox" name="${questionFieldName}" value="${(answer.textResponse)?default(defValue?if_exists)}" /> + <input type="text" size="15" class="inputBox" name="${questionFieldName}" value="${(answer.textResponse)?default(defValue!)}" /> <#elseif surveyQuestionAndAppl.surveyQuestionTypeId == "TEXT_LONG"/> - <input type="text" size="35" class="inputBox" name="${questionFieldName}" value="${(answer.textResponse)?default(defValue?if_exists)}" /> + <input type="text" size="35" class="inputBox" name="${questionFieldName}" value="${(answer.textResponse)?default(defValue!)}" /> <#elseif surveyQuestionAndAppl.surveyQuestionTypeId == "EMAIL"/> - <input type="text" size="30" class="inputBox" name="${questionFieldName}" value="${(answer.textResponse)?default(defValue?if_exists)}" /> + <input type="text" size="30" class="inputBox" name="${questionFieldName}" value="${(answer.textResponse)?default(defValue!)}" /> <#elseif surveyQuestionAndAppl.surveyQuestionTypeId == "URL"/> - <input type="text" size="40" class="inputBox" name="${questionFieldName}" value="${(answer.textResponse)?default(defValue?if_exists)}" /> + <input type="text" size="40" class="inputBox" name="${questionFieldName}" value="${(answer.textResponse)?default(defValue!)}" /> <#elseif surveyQuestionAndAppl.surveyQuestionTypeId == "DATE"/> - <input type="text" size="12" class="inputBox" name="${questionFieldName}" value="${(answer.textResponse)?default(defValue?if_exists)}" /> + <input type="text" size="12" class="inputBox" name="${questionFieldName}" value="${(answer.textResponse)?default(defValue!)}" /> <#elseif surveyQuestionAndAppl.surveyQuestionTypeId == "CREDIT_CARD"/> - <input type="text" size="20" class="inputBox" name="${questionFieldName}" value="${(answer.textResponse)?default(defValue?if_exists)}" /> + <input type="text" size="20" class="inputBox" name="${questionFieldName}" value="${(answer.textResponse)?default(defValue!)}" /> <#elseif surveyQuestionAndAppl.surveyQuestionTypeId == "GIFT_CARD"/> - <input type="text" size="20" class="inputBox" name="${questionFieldName}" value="${(answer.textResponse)?default(defValue?if_exists)}" /> + <input type="text" size="20" class="inputBox" name="${questionFieldName}" value="${(answer.textResponse)?default(defValue!)}" /> <#elseif surveyQuestionAndAppl.surveyQuestionTypeId == "NUMBER_CURRENCY"/> - <input type="text" size="6" class="inputBox" name="${questionFieldName}" value="${(answer.currencyResponse)?default(defValue?if_exists)}" /> + <input type="text" size="6" class="inputBox" name="${questionFieldName}" value="${(answer.currencyResponse)?default(defValue!)}" /> <#elseif surveyQuestionAndAppl.surveyQuestionTypeId == "NUMBER_FLOAT"/> - <input type="text" size="6" class="inputBox" name="${questionFieldName}" value="${(answer.floatResponse)?default(defValue?if_exists)}" /> + <input type="text" size="6" class="inputBox" name="${questionFieldName}" value="${(answer.floatResponse)?default(defValue!)}" /> <#elseif surveyQuestionAndAppl.surveyQuestionTypeId == "NUMBER_LONG"/> - <input type="text" size="6" class="inputBox" name="${questionFieldName}" value="${(answer.numericResponse?default(defValue)?string("#"))?if_exists}" /> + <input type="text" size="6" class="inputBox" name="${questionFieldName}" value="${(answer.numericResponse?default(defValue)?string("#"))!}" /> <#elseif surveyQuestionAndAppl.surveyQuestionTypeId == "PASSWORD"/> - <input type="password" size="30" class="textBox" name="${questionFieldName}" value="${(answer.textResponse)?default(defValue?if_exists)}" /> + <input type="password" size="30" class="textBox" name="${questionFieldName}" value="${(answer.textResponse)?default(defValue!)}" /> <#elseif surveyQuestionAndAppl.surveyQuestionTypeId == "CONTENT"/> <#if (answer.contentId)?has_content> <#assign content = answer.getRelatedOne("Content", false)> - <a href="/content/control/img?imgId=${content.dataResourceId}" class="buttontext">${answer.contentId}</a> - ${content.contentName?if_exists} + <a href="/content/control/img?imgId=${content.dataResourceId}" class="buttontext">${answer.contentId}</a> - ${content.contentName!} </#if> <input type="file" size="15" name="${questionFieldName}" class="inputBox"/> <#elseif surveyQuestionAndAppl.surveyQuestionTypeId == "OPTION"/> - <#assign options = surveyQuestionAndAppl.getRelated("SurveyQuestionOption", null, sequenceSort, false)?if_exists/> + <#assign options = surveyQuestionAndAppl.getRelated("SurveyQuestionOption", null, sequenceSort, false)!/> <#assign selectedOption = (answer.surveyOptionSeqId)?default("_NA_")/> <select name="${questionFieldName}"> <#if surveyQuestionAndAppl.requiredField?default("N") != "Y"> @@ -81,7 +81,7 @@ under the License. </#if> <#if options?has_content> <#list options as option> - <option value="${option.surveyOptionSeqId}" <#if option.surveyOptionSeqId == selectedOption>selected="selected"</#if>>${option.description?if_exists}</option> + <option value="${option.surveyOptionSeqId}" <#if option.surveyOptionSeqId == selectedOption>selected="selected"</#if>>${option.description!}</option> </#list> <#else> <option value="">Nothing to choose</option> @@ -89,7 +89,7 @@ under the License. </select> <#elseif surveyQuestionAndAppl.surveyQuestionTypeId == "ENUMERATION"/> <select name="${questionFieldName}"> - <#assign formatString = surveyQuestionAndAppl.get("formatString")?if_exists/> + <#assign formatString = surveyQuestionAndAppl.get("formatString")!/> <#assign enums = surveyQuestionAndAppl.getRelated("Enumeration", null, null, false)/> <#list enums as enum> <#if (((answer.textResponse)?has_content && answer.textResponse == enum.enumId) || (defValue == enum.enumId))> @@ -107,8 +107,8 @@ under the License. </select> <#elseif surveyQuestionAndAppl.surveyQuestionTypeId == "GEO"/> <select name="${questionFieldName}"> - <#assign formatString = surveyQuestionAndAppl.get("formatString")?if_exists/> - <#assign parentGeoId = surveyQuestionAndAppl.get("geoId")?if_exists/> + <#assign formatString = surveyQuestionAndAppl.get("formatString")!/> + <#assign parentGeoId = surveyQuestionAndAppl.get("geoId")!/> <#assign geos = Static["org.ofbiz.common.geo.GeoWorker"].expandGeoGroup(parentGeoId, delegator)> <#list geos as geo> <#if (((answer.textResponse)?has_content && answer.textResponse == geo.geoId) || (defValue == geo.geoId))> @@ -159,7 +159,7 @@ under the License. <#-- survey ID --> <input type="hidden" name="surveyId" value="${survey.surveyId}"/> -<h1>${survey.description?if_exists}</h1> +<h1>${survey.description!}</h1> <br /> <#if survey.comments?has_content> @@ -176,7 +176,7 @@ under the License. <#-- Get and setup MultiResp info for this question --> <#assign openMultiRespHeader = false/> <#assign closeMultiRespHeader = false/> - <#assign surveyMultiResp = surveyQuestionAndAppl.getRelatedOne("SurveyMultiResp", true)?if_exists/> + <#assign surveyMultiResp = surveyQuestionAndAppl.getRelatedOne("SurveyMultiResp", true)!/> <#if surveyMultiResp?has_content> <#assign surveyMultiRespColumnList = surveyMultiResp.getRelated("SurveyMultiRespColumn", null, Static["org.ofbiz.base.util.UtilMisc"].toList("sequenceNum"), true)/> @@ -220,7 +220,7 @@ under the License. </#if> <#if surveyMultiResp?has_content> - <#assign sqaaWithColIdList = (sqaaWithColIdListByMultiRespId[surveyMultiResp.surveyMultiRespId])?if_exists/> + <#assign sqaaWithColIdList = (sqaaWithColIdListByMultiRespId[surveyMultiResp.surveyMultiRespId])!/> <tr> <td> <@renderSurveyQuestionText surveyQuestionAndAppl=surveyQuestionAndAppl/> @@ -251,7 +251,7 @@ under the License. <#else/> <#-- special formatting for select boxes --> <#assign align = "left"/> - <#if surveyQuestionAndAppl?exists && surveyQuestionAndAppl.surveyQuestionTypeId?has_content> + <#if surveyQuestionAndAppl?? && surveyQuestionAndAppl.surveyQuestionTypeId?has_content> <#if (surveyQuestionAndAppl.surveyQuestionTypeId == "BOOLEAN" || surveyQuestionAndAppl.surveyQuestionTypeId == "CONTENT" || surveyQuestionAndAppl.surveyQuestionTypeId == "OPTION")> <#assign align = "right"/> </#if> @@ -259,19 +259,19 @@ under the License. <#-- get an answer from the answerMap --> <#if surveyAnswers?has_content> - <#assign answer = surveyAnswers.get(surveyQuestionAndAppl.surveyQuestionId)?if_exists/> + <#assign answer = surveyAnswers.get(surveyQuestionAndAppl.surveyQuestionId)!/> </#if> <#-- get the default value from value map --> <#if defaultValues?has_content> - <#assign defValue = defaultValues.get(surveyQuestionAndAppl.surveyQuestionId)?if_exists/> + <#assign defValue = defaultValues.get(surveyQuestionAndAppl.surveyQuestionId)!/> </#if> <tr> - <#if surveyQuestionAndAppl?exists && surveyQuestionAndAppl.surveyQuestionTypeId?has_content> + <#if surveyQuestionAndAppl?? && surveyQuestionAndAppl.surveyQuestionTypeId?has_content> <#-- seperator options --> <#if surveyQuestionAndAppl.surveyQuestionTypeId == "SEPERATOR_TEXT"> - <td colspan="5"><div>${surveyQuestionAndAppl.question?if_exists}</div></td> + <td colspan="5"><div>${surveyQuestionAndAppl.question!}</div></td> <#elseif surveyQuestionAndAppl.surveyQuestionTypeId == "SEPERATOR_LINE"/> <td colspan="5"><hr /></td> <#else/> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |