svn commit: r1618336 [14/21] - in /ofbiz/trunk/applications: accounting/webapp/accounting/a
Locked
svn commit: r1618336 [14/21] - in /ofbiz/trunk/applications: accounting/webapp/accounting/a
 
|
Modified: ofbiz/trunk/applications/product/webapp/catalog/category/EditCategoryProducts.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/category/EditCategoryProducts.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/catalog/category/EditCategoryProducts.ftl (original) +++ ofbiz/trunk/applications/product/webapp/catalog/category/EditCategoryProducts.ftl Sat Aug 16 11:34:57 2014 @@ -17,20 +17,20 @@ specific language governing permissions under the License. --> <#if activeOnly> - <a href="<@ofbizUrl>EditCategoryProducts?productCategoryId=${productCategoryId?if_exists}&activeOnly=false</@ofbizUrl>" class="buttontext">${uiLabelMap.ProductActiveAndInactive}</a> + <a href="<@ofbizUrl>EditCategoryProducts?productCategoryId=${productCategoryId!}&activeOnly=false</@ofbizUrl>" class="buttontext">${uiLabelMap.ProductActiveAndInactive}</a> <#else> - <a href="<@ofbizUrl>EditCategoryProducts?productCategoryId=${productCategoryId?if_exists}&activeOnly=true</@ofbizUrl>" class="buttontext">${uiLabelMap.ProductActiveOnly}</a> + <a href="<@ofbizUrl>EditCategoryProducts?productCategoryId=${productCategoryId!}&activeOnly=true</@ofbizUrl>" class="buttontext">${uiLabelMap.ProductActiveOnly}</a> </#if> <div class="screenlet"> <div class="screenlet-title-bar"> <#if (listSize > 0)> <div class="boxhead-right"> <#if (viewIndex > 1)> - <a href="<@ofbizUrl>EditCategoryProducts?productCategoryId=${productCategoryId?if_exists}&VIEW_SIZE=${viewSize}&VIEW_INDEX=${viewIndex-1}&activeOnly=${activeOnly.toString()}</@ofbizUrl>" class="submenutext">${uiLabelMap.CommonPrevious}</a> | + <a href="<@ofbizUrl>EditCategoryProducts?productCategoryId=${productCategoryId!}&VIEW_SIZE=${viewSize}&VIEW_INDEX=${viewIndex-1}&activeOnly=${activeOnly.toString()}</@ofbizUrl>" class="submenutext">${uiLabelMap.CommonPrevious}</a> | </#if> <span class="submenutextinfo">${lowIndex} - ${highIndex} ${uiLabelMap.CommonOf} ${listSize}</span> <#if (listSize > highIndex)> - | <a class="lightbuttontext" href="<@ofbizUrl>EditCategoryProducts?productCategoryId=${productCategoryId?if_exists}&VIEW_SIZE=${viewSize}&VIEW_INDEX=${viewIndex+1}&activeOnly=${activeOnly.toString()}</@ofbizUrl>" class="submenutextright">${uiLabelMap.CommonNext}</a> + | <a class="lightbuttontext" href="<@ofbizUrl>EditCategoryProducts?productCategoryId=${productCategoryId!}&VIEW_SIZE=${viewSize}&VIEW_INDEX=${viewIndex+1}&activeOnly=${activeOnly.toString()}</@ofbizUrl>" class="submenutextright">${uiLabelMap.CommonNext}</a> </#if> </div> @@ -55,7 +55,7 @@ under the License. <input type="hidden" name="VIEW_SIZE" value="${viewSize}"/> <input type="hidden" name="VIEW_INDEX" value="${viewIndex}"/> <input type="hidden" name="activeOnly" value="${activeOnly.toString()}" /> - <input type="hidden" name="productCategoryId" value="${productCategoryId?if_exists}" /> + <input type="hidden" name="productCategoryId" value="${productCategoryId!}" /> <table cellspacing="0" class="basic-table"> <tr class="header-row"> <td>${uiLabelMap.ProductProductNameId}</td> @@ -69,27 +69,27 @@ under the License. <#assign suffix = "_o_" + productCategoryMember_index> <#assign product = productCategoryMember.getRelatedOne("Product", false)> <#assign hasntStarted = false> - <#if productCategoryMember.fromDate?exists && nowTimestamp.before(productCategoryMember.getTimestamp("fromDate"))><#assign hasntStarted = true></#if> + <#if productCategoryMember.fromDate?? && nowTimestamp.before(productCategoryMember.getTimestamp("fromDate"))><#assign hasntStarted = true></#if> <#assign hasExpired = false> - <#if productCategoryMember.thruDate?exists && nowTimestamp.after(productCategoryMember.getTimestamp("thruDate"))><#assign hasExpired = true></#if> + <#if productCategoryMember.thruDate?? && nowTimestamp.after(productCategoryMember.getTimestamp("thruDate"))><#assign hasExpired = true></#if> <tr valign="middle"<#if rowClass == "1"> class="alternate-row"</#if>> <td> - <#if (product.smallImageUrl)?exists> - <a href="<@ofbizUrl>EditProduct?productId=${(productCategoryMember.productId)?if_exists}</@ofbizUrl>"><img alt="Small Image" src="<@ofbizContentUrl>${product.smallImageUrl}</@ofbizContentUrl>" class="cssImgSmall" align="middle" /></a> + <#if (product.smallImageUrl)??> + <a href="<@ofbizUrl>EditProduct?productId=${(productCategoryMember.productId)!}</@ofbizUrl>"><img alt="Small Image" src="<@ofbizContentUrl>${product.smallImageUrl}</@ofbizContentUrl>" class="cssImgSmall" align="middle" /></a> </#if> - <a href="<@ofbizUrl>EditProduct?productId=${(productCategoryMember.productId)?if_exists}</@ofbizUrl>" class="buttontext"><#if product?exists>${(product.internalName)?if_exists}</#if> [${(productCategoryMember.productId)?if_exists}]</a> + <a href="<@ofbizUrl>EditProduct?productId=${(productCategoryMember.productId)!}</@ofbizUrl>" class="buttontext"><#if product??>${(product.internalName)!}</#if> [${(productCategoryMember.productId)!}]</a> </td> - <td <#if hasntStarted> style="color: red;"</#if>>${(productCategoryMember.fromDate)?if_exists}</td> + <td <#if hasntStarted> style="color: red;"</#if>>${(productCategoryMember.fromDate)!}</td> <td align="center"> - <input type="hidden" name="productId${suffix}" value="${(productCategoryMember.productId)?if_exists}" /> - <input type="hidden" name="productCategoryId${suffix}" value="${(productCategoryMember.productCategoryId)?if_exists}" /> - <input type="hidden" name="fromDate${suffix}" value="${(productCategoryMember.fromDate)?if_exists}" /> + <input type="hidden" name="productId${suffix}" value="${(productCategoryMember.productId)!}" /> + <input type="hidden" name="productCategoryId${suffix}" value="${(productCategoryMember.productCategoryId)!}" /> + <input type="hidden" name="fromDate${suffix}" value="${(productCategoryMember.fromDate)!}" /> <#if hasExpired><#assign class="alert"></#if> - <@htmlTemplate.renderDateTimeField name="thruDate${suffix}" event="" action="" className="${class!''}" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" value="${(productCategoryMember.thruDate)?if_exists}" size="25" maxlength="30" id="thruDate${suffix}" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/> - <input type="text" size="5" name="sequenceNum${suffix}" value="${(productCategoryMember.sequenceNum)?if_exists}" /> - <input type="text" size="5" name="quantity${suffix}" value="${(productCategoryMember.quantity)?if_exists}" /> + <@htmlTemplate.renderDateTimeField name="thruDate${suffix}" event="" action="" className="${class!''}" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" value="${(productCategoryMember.thruDate)!}" size="25" maxlength="30" id="thruDate${suffix}" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/> + <input type="text" size="5" name="sequenceNum${suffix}" value="${(productCategoryMember.sequenceNum)!}" /> + <input type="text" size="5" name="quantity${suffix}" value="${(productCategoryMember.quantity)!}" /> <br /> - <textarea name="comments${suffix}" rows="2" cols="40">${(productCategoryMember.comments)?if_exists}</textarea> + <textarea name="comments${suffix}" rows="2" cols="40">${(productCategoryMember.comments)!}</textarea> </td> <td align="center"> <a href="javascript:document.deleteProductFromCategory_o_${rowCount}.submit()" class="buttontext">${uiLabelMap.CommonDelete}</a> @@ -116,9 +116,9 @@ under the License. <form name="deleteProductFromCategory_o_${rowCount}" method="post" action="<@ofbizUrl>removeCategoryProductMember</@ofbizUrl>"> <input type="hidden" name="VIEW_SIZE" value="${viewSize}"/> <input type="hidden" name="VIEW_INDEX" value="${viewIndex}"/> - <input type="hidden" name="productId" value="${(productCategoryMember.productId)?if_exists}" /> - <input type="hidden" name="productCategoryId" value="${(productCategoryMember.productCategoryId)?if_exists}"/> - <input type="hidden" name="fromDate" value="${(productCategoryMember.fromDate)?if_exists}"/> + <input type="hidden" name="productId" value="${(productCategoryMember.productId)!}" /> + <input type="hidden" name="productCategoryId" value="${(productCategoryMember.productCategoryId)!}"/> + <input type="hidden" name="fromDate" value="${(productCategoryMember.fromDate)!}"/> <input type="hidden" name="activeOnly" value="${activeOnly.toString()}"/> </form> <#assign rowCount = rowCount + 1> @@ -129,11 +129,11 @@ under the License. <#if (listSize > 0)> <div class="boxhead-right"> <#if (viewIndex > 1)> - <a href="<@ofbizUrl>EditCategoryProducts?productCategoryId=${productCategoryId?if_exists}&VIEW_SIZE=${viewSize}&VIEW_INDEX=${viewIndex-1}&activeOnly=${activeOnly.toString()}</@ofbizUrl>" class="submenutext">${uiLabelMap.CommonPrevious}</a> | + <a href="<@ofbizUrl>EditCategoryProducts?productCategoryId=${productCategoryId!}&VIEW_SIZE=${viewSize}&VIEW_INDEX=${viewIndex-1}&activeOnly=${activeOnly.toString()}</@ofbizUrl>" class="submenutext">${uiLabelMap.CommonPrevious}</a> | </#if> <span class="submenutextinfo">${lowIndex} - ${highIndex} ${uiLabelMap.CommonOf} ${listSize}</span> <#if (listSize > highIndex)> - | <a class="lightbuttontext" href="<@ofbizUrl>EditCategoryProducts?productCategoryId=${productCategoryId?if_exists}&VIEW_SIZE=${viewSize}&VIEW_INDEX=${viewIndex+1}&activeOnly=${activeOnly.toString()}</@ofbizUrl>" class="submenutextright">${uiLabelMap.CommonNext}</a> + | <a class="lightbuttontext" href="<@ofbizUrl>EditCategoryProducts?productCategoryId=${productCategoryId!}&VIEW_SIZE=${viewSize}&VIEW_INDEX=${viewIndex+1}&activeOnly=${activeOnly.toString()}</@ofbizUrl>" class="submenutextright">${uiLabelMap.CommonNext}</a> </#if> </div> @@ -152,7 +152,7 @@ under the License. <table cellspacing="0" class="basic-table"> <tr><td> <form method="post" action="<@ofbizUrl>addCategoryProductMember</@ofbizUrl>" style="margin: 0;" name="addProductCategoryMemberForm"> - <input type="hidden" name="productCategoryId" value="${productCategoryId?if_exists}" /> + <input type="hidden" name="productCategoryId" value="${productCategoryId!}" /> <input type="hidden" name="activeOnly" value="${activeOnly.toString()}" /> <div> <span class="label">${uiLabelMap.ProductProductId}</span> @@ -178,7 +178,7 @@ under the License. <table cellspacing="0" class="basic-table"> <tr><td> <form method="post" action="<@ofbizUrl>copyCategoryProductMembers</@ofbizUrl>" style="margin: 0;" name="copyCategoryProductMembersForm"> - <input type="hidden" name="productCategoryId" value="${productCategoryId?if_exists}" /> + <input type="hidden" name="productCategoryId" value="${productCategoryId!}" /> <input type="hidden" name="activeOnly" value="${activeOnly.toString()}" /> <div> <span class="label">${uiLabelMap.ProductTargetProductCategory}</span> @@ -207,7 +207,7 @@ under the License. <table cellspacing="0" class="basic-table"> <tr><td> <form method="post" action="<@ofbizUrl>expireAllCategoryProductMembers</@ofbizUrl>" style="margin: 0;" name="expireAllCategoryProductMembersForm"> - <input type="hidden" name="productCategoryId" value="${productCategoryId?if_exists}" /> + <input type="hidden" name="productCategoryId" value="${productCategoryId!}" /> <input type="hidden" name="activeOnly" value="${activeOnly.toString()}" /> <div> <span class="label">${uiLabelMap.ProductOptionalExpirationDate}</span> @@ -227,7 +227,7 @@ under the License. <table cellspacing="0" class="basic-table"> <tr><td> <form method="post" action="<@ofbizUrl>removeExpiredCategoryProductMembers</@ofbizUrl>" style="margin: 0;" name="removeExpiredCategoryProductMembersForm"> - <input type="hidden" name="productCategoryId" value="${productCategoryId?if_exists}" /> + <input type="hidden" name="productCategoryId" value="${productCategoryId!}" /> <input type="hidden" name="activeOnly" value="${activeOnly.toString()}" /> <div> <span class="label">${uiLabelMap.ProductOptionalExpiredBeforeDate}</span> Modified: ofbiz/trunk/applications/product/webapp/catalog/category/EditCategoryRollup.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/category/EditCategoryRollup.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/catalog/category/EditCategoryRollup.ftl (original) +++ ofbiz/trunk/applications/product/webapp/catalog/category/EditCategoryRollup.ftl Sat Aug 16 11:34:57 2014 @@ -50,13 +50,13 @@ under the License. <#assign suffix = "_o_" + productCategoryRollup_index> <#assign curCategory = productCategoryRollup.getRelatedOne("ParentProductCategory", false)> <#assign hasntStarted = false> - <#if productCategoryRollup.fromDate?exists && nowTimestamp.before(productCategoryRollup.getTimestamp("fromDate"))><#assign hasntStarted = true></#if> + <#if productCategoryRollup.fromDate?? && nowTimestamp.before(productCategoryRollup.getTimestamp("fromDate"))><#assign hasntStarted = true></#if> <#assign hasExpired = false> - <#if productCategoryRollup.thruDate?exists && nowTimestamp.after(productCategoryRollup.getTimestamp("thruDate"))><#assign hasExpired = true></#if> + <#if productCategoryRollup.thruDate?? && nowTimestamp.after(productCategoryRollup.getTimestamp("thruDate"))><#assign hasExpired = true></#if> <tr valign="middle"<#if rowClass == "1"> class="alternate-row"</#if>> <td><#if curCategory?has_content> <a href="<@ofbizUrl>EditCategory?productCategoryId=${curCategory.productCategoryId}</@ofbizUrl>" > - <#assign catContentWrapper = Static["org.ofbiz.product.category.CategoryContentWrapper"].makeCategoryContentWrapper(curCategory, request)?if_exists> + <#assign catContentWrapper = Static["org.ofbiz.product.category.CategoryContentWrapper"].makeCategoryContentWrapper(curCategory, request)!> <#if catContentWrapper?has_content> ${catContentWrapper.get("CATEGORY_NAME")!catContentWrapper.get("DESCRIPTION")!curCategory.categoryName!curCategory.description!} <#else> @@ -73,7 +73,7 @@ under the License. <input type="hidden" name="parentProductCategoryId${suffix}" value="${productCategoryRollup.parentProductCategoryId}" /> <input type="hidden" name="fromDate${suffix}" value="${productCategoryRollup.fromDate}" /> <@htmlTemplate.renderDateTimeField name="thruDate${suffix}" event="" action="" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" value="${productCategoryRollup.thruDate!''}" size="25" maxlength="30" id="thruDate_1" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/> - <input type="text" size="5" name="sequenceNum${suffix}" value="${productCategoryRollup.sequenceNum?if_exists}" /> + <input type="text" size="5" name="sequenceNum${suffix}" value="${productCategoryRollup.sequenceNum!}" /> </td> <td> <a href="javascript:document.removeProductCategoryFromCategory_${productCategoryRollup_index}.submit();" class="buttontext">${uiLabelMap.CommonDelete}</a> @@ -115,7 +115,7 @@ under the License. <form method="post" action="<@ofbizUrl>addProductCategoryToCategory</@ofbizUrl>" style="margin: 0;" name="addParentForm"> <input type="hidden" name="productCategoryId" value="${productCategoryId}" /> <input type="hidden" name="showProductCategoryId" value="${productCategoryId}" /> - <@htmlTemplate.lookupField value="${requestParameters.SEARCH_CATEGORY_ID?if_exists}" formName="addParentForm" name="parentProductCategoryId" id="parentProductCategoryId" fieldFormName="LookupProductCategory"/> + <@htmlTemplate.lookupField value="${requestParameters.SEARCH_CATEGORY_ID!}" formName="addParentForm" name="parentProductCategoryId" id="parentProductCategoryId" fieldFormName="LookupProductCategory"/> <@htmlTemplate.renderDateTimeField name="fromDate" event="" action="" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" value="" size="25" maxlength="30" id="fromDate_1" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/> <input type="submit" value="${uiLabelMap.CommonAdd}" /> @@ -158,13 +158,13 @@ under the License. <#assign lineChild = lineChild + 1> <#assign curCategory = productCategoryRollup.getRelatedOne("CurrentProductCategory", false)> <#assign hasntStarted = false> - <#if productCategoryRollup.fromDate?exists && nowTimestamp.before(productCategoryRollup.getTimestamp("fromDate"))><#assign hasntStarted = true></#if> + <#if productCategoryRollup.fromDate?? && nowTimestamp.before(productCategoryRollup.getTimestamp("fromDate"))><#assign hasntStarted = true></#if> <#assign hasExpired = false> - <#if productCategoryRollup.thruDate?exists && nowTimestamp.after(productCategoryRollup.getTimestamp("thruDate"))><#assign hasExpired = true></#if> + <#if productCategoryRollup.thruDate?? && nowTimestamp.after(productCategoryRollup.getTimestamp("thruDate"))><#assign hasExpired = true></#if> <tr valign="middle"<#if rowClass == "1"> class="alternate-row"</#if>> <td><#if curCategory?has_content> <a href="<@ofbizUrl>EditCategory?productCategoryId=${curCategory.productCategoryId}</@ofbizUrl>" > - <#assign catContentWrapper = Static["org.ofbiz.product.category.CategoryContentWrapper"].makeCategoryContentWrapper(curCategory, request)?if_exists> + <#assign catContentWrapper = Static["org.ofbiz.product.category.CategoryContentWrapper"].makeCategoryContentWrapper(curCategory, request)!> <#if catContentWrapper?has_content> ${catContentWrapper.get("CATEGORY_NAME")!catContentWrapper.get("DESCRIPTION")!curCategory.categoryName!curCategory.description!} <#else> @@ -181,7 +181,7 @@ under the License. <input type="hidden" name="fromDate${suffix}" value="${productCategoryRollup.fromDate}" /> <@htmlTemplate.renderDateTimeField name="thruDate${suffix}" event="" action="" className="" alert="" title="Thru Date" value="${productCategoryRollup.thruDate!''}" size="25" maxlength="50" id="thruDatefromDate${suffix}" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/> - <input type="text" size="5" name="sequenceNum${suffix}" value="${productCategoryRollup.sequenceNum?if_exists}" /> + <input type="text" size="5" name="sequenceNum${suffix}" value="${productCategoryRollup.sequenceNum!}" /> </td> <td> <a href="javascript:document.removeProductCategoryFromCategory_1_${productCategoryRollup_index}.submit();" class="buttontext">${uiLabelMap.CommonDelete}</a> @@ -223,7 +223,7 @@ under the License. <form method="post" action="<@ofbizUrl>addProductCategoryToCategory</@ofbizUrl>" style="margin: 0;" name="addChildForm"> <input type="hidden" name="showProductCategoryId" value="${productCategoryId}" /> <input type="hidden" name="parentProductCategoryId" value="${productCategoryId}" /> - <@htmlTemplate.lookupField value="${requestParameters.SEARCH_CATEGORY_ID?if_exists}" formName="addChildForm" name="productCategoryId" id="productCategoryId" fieldFormName="LookupProductCategory"/> + <@htmlTemplate.lookupField value="${requestParameters.SEARCH_CATEGORY_ID!}" formName="addChildForm" name="productCategoryId" id="productCategoryId" fieldFormName="LookupProductCategory"/> <@htmlTemplate.renderDateTimeField name="fromDate" event="" action="" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" value="" size="25" maxlength="30" id="fromDate_2" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/> <input type="submit" value="${uiLabelMap.CommonAdd}" /> </form> Modified: ofbiz/trunk/applications/product/webapp/catalog/category/createProductInCategoryCheckExisting.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/category/createProductInCategoryCheckExisting.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/catalog/category/createProductInCategoryCheckExisting.ftl (original) +++ ofbiz/trunk/applications/product/webapp/catalog/category/createProductInCategoryCheckExisting.ftl Sat Aug 16 11:34:57 2014 @@ -23,7 +23,7 @@ under the License. <div class="screenlet"> <div class="screenlet-title-bar"> <h3> - <b>${uiLabelMap.ProductCheckingForExistingProductInCategory} <#if (productCategory.description)?has_content>"${productCategory.description}"</#if> [${uiLabelMap.CommonId}:${productCategoryId?if_exists}]</b> + <b>${uiLabelMap.ProductCheckingForExistingProductInCategory} <#if (productCategory.description)?has_content>"${productCategory.description}"</#if> [${uiLabelMap.CommonId}:${productCategoryId!}]</b> <#if productFeatureAndTypeDatas?has_content> ${uiLabelMap.CommonWhere} <#list productFeatureAndTypeDatas as productFeatureAndTypeData> @@ -60,7 +60,7 @@ under the License. <form name="createProductInCategoryForm" method="post" action="<@ofbizUrl>createProductInCategory</@ofbizUrl>" style="margin: 0;"> <input type="hidden" name="productCategoryId" value="${productCategoryId}" /> <table cellspacing="0" class="basic-table"> - <#list productFeatureAndTypeDatas?if_exists as productFeatureAndTypeData> + <#list productFeatureAndTypeDatas! as productFeatureAndTypeData> <#assign productFeatureType = productFeatureAndTypeData.productFeatureType> <#assign productFeature = productFeatureAndTypeData.productFeature> <#assign productFeatureTypeId = productFeatureType.productFeatureTypeId> @@ -70,7 +70,7 @@ under the License. <td> <div> ${productFeature.description} - <#if requestParameters["pftsel_" + productFeatureTypeId]?exists> + <#if requestParameters["pftsel_" + productFeatureTypeId]??> <input type="hidden" name="pftsel_${productFeatureTypeId}" value="Y"/> [${uiLabelMap.ProductSelectable}] <#else> @@ -84,36 +84,36 @@ under the License. <tr> <td width="15%">${uiLabelMap.ProductInternalName}:</td> <td> - <input type="hidden" name="internalName" value="${requestParameters.internalName?if_exists}"/> + <input type="hidden" name="internalName" value="${requestParameters.internalName!}"/> <div> ${requestParameters.internalName?default(" ")}</div> </td> </tr> <tr> <td width="15%">${uiLabelMap.ProductProductName}:</td> <td> - <input type="hidden" name="productName" value="${requestParameters.productName?if_exists}"/> + <input type="hidden" name="productName" value="${requestParameters.productName!}"/> <div> ${requestParameters.productName?default(" ")}</div> </td> </tr> <tr> <td width="15%">${uiLabelMap.ProductShortDescription}:</td> <td> - <input type="hidden" name="description" value="${requestParameters.description?if_exists}"/> + <input type="hidden" name="description" value="${requestParameters.description!}"/> <div> ${requestParameters.description?default(" ")}</div> </td> </tr> <tr> <td width="15%">${uiLabelMap.ProductDefaultPrice}:</td> <td> - <input type="hidden" name="defaultPrice" value="${requestParameters.defaultPrice?if_exists}"/> - <input type="hidden" name="currencyUomId" value="${requestParameters.currencyUomId?if_exists}"/> + <input type="hidden" name="defaultPrice" value="${requestParameters.defaultPrice!}"/> + <input type="hidden" name="currencyUomId" value="${requestParameters.currencyUomId!}"/> <div> ${requestParameters.defaultPrice?default(" ")} ${requestParameters.currencyUomId?default(" ")}</div> </td> </tr> <tr> <td width="15%">${uiLabelMap.ProductAverageCost}:</td> <td> - <input type="hidden" name="averageCost" value="${requestParameters.averageCost?if_exists}"/> + <input type="hidden" name="averageCost" value="${requestParameters.averageCost!}"/> <div> ${requestParameters.averageCost?default(" ")}</div> </td> </tr> Modified: ofbiz/trunk/applications/product/webapp/catalog/config/EditProductConfigItemContent.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/config/EditProductConfigItemContent.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/catalog/config/EditProductConfigItemContent.ftl (original) +++ ofbiz/trunk/applications/product/webapp/catalog/config/EditProductConfigItemContent.ftl Sat Aug 16 11:34:57 2014 @@ -30,15 +30,15 @@ function insertImageName(size,nameValue) <#if !(clientFileName?has_content)> <div>${uiLabelMap.ProductNoFileSpecifiedForUpload}.</div> <#else> - <div>${uiLabelMap.ProductTheFileOnYourComputer}: <b>${clientFileName?if_exists}</b></div> - <div>${uiLabelMap.ProductServerFileName}: <b>${fileNameToUse?if_exists}</b></div> - <div>${uiLabelMap.ProductServerDirectory}: <b>${imageServerPath?if_exists}</b></div> - <div>${uiLabelMap.ProductTheUrlOfYourUploadedFile}: <b><a href="<@ofbizContentUrl>${imageUrl?if_exists}</@ofbizContentUrl>">${imageUrl?if_exists}</a></b></div> + <div>${uiLabelMap.ProductTheFileOnYourComputer}: <b>${clientFileName!}</b></div> + <div>${uiLabelMap.ProductServerFileName}: <b>${fileNameToUse!}</b></div> + <div>${uiLabelMap.ProductServerDirectory}: <b>${imageServerPath!}</b></div> + <div>${uiLabelMap.ProductTheUrlOfYourUploadedFile}: <b><a href="<@ofbizContentUrl>${imageUrl!}</@ofbizContentUrl>">${imageUrl!}</a></b></div> </#if> <br /> </#if> -<#if !(configItem?exists)> +<#if !(configItem??)> <h3>${uiLabelMap.ProductCouldNotFindProductConfigItem} "${configItemId}".</h3> <#else> <table cellspacing="0" class="basic-table"> @@ -60,7 +60,7 @@ function insertImageName(size,nameValue) <td>${productContent.fromDate?default("N/A")}</td> <td>${productContent.thruDate?default("N/A")}</td> <td><a href="<@ofbizUrl>removeContentFromProductConfigItem?configItemId=${productContent.configItemId}&contentId=${productContent.contentId}&confItemContentTypeId=${productContent.confItemContentTypeId}&fromDate=${productContent.fromDate}</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonDelete}</a></td> - <td><a href="/content/control/EditContent?contentId=${productContent.contentId}&externalLoginKey=${requestAttributes.externalLoginKey?if_exists}" class="buttontext">${uiLabelMap.ProductEditContent} ${entry.content.contentId}</td> + <td><a href="/content/control/EditContent?contentId=${productContent.contentId}&externalLoginKey=${requestAttributes.externalLoginKey!}" class="buttontext">${uiLabelMap.ProductEditContent} ${entry.content.contentId}</td> </tr> <#-- toggle the row color --> <#if rowClass == "2"> @@ -95,26 +95,26 @@ function insertImageName(size,nameValue) </div> <div class="screenlet-body"> <form action="<@ofbizUrl>updateProductConfigItemContent</@ofbizUrl>" method="post" style="margin: 0;" name="productForm"> - <input type="hidden" name="configItemId" value="${configItemId?if_exists}" /> + <input type="hidden" name="configItemId" value="${configItemId!}" /> <table cellspacing="0" class="basic-table"> <tr> <td width="20%" align="right" valign="top" class="label">${uiLabelMap.CommonDescription}</td> <td> </td> <td width="80%" colspan="4" valign="top"> - <textarea name="description" cols="60" rows="2">${(configItem.description)?if_exists}</textarea> + <textarea name="description" cols="60" rows="2">${(configItem.description)!}</textarea> </td> </tr> <tr> <td width="20%" align="right" valign="top" class="label">${uiLabelMap.ProductLongDescription}</td> <td> </td> <td width="80%" colspan="4" valign="top"> - <textarea name="longDescription" cols="60" rows="7">${(configItem.longDescription)?if_exists}</textarea> + <textarea name="longDescription" cols="60" rows="7">${(configItem.longDescription)!}</textarea> </td> </tr> <tr> <td width="20%" align="right" valign="top" class="label"> ${uiLabelMap.ProductSmallImage} - <#if (configItem.imageUrl)?exists> + <#if (configItem.imageUrl)??> <a href="<@ofbizContentUrl>${configItem.imageUrl}</@ofbizContentUrl>" target="_blank"><img alt="Image" src="<@ofbizContentUrl>${configItem.imageUrl}</@ofbizContentUrl>" class="cssImgSmall" /></a> </#if> </td> Modified: ofbiz/trunk/applications/product/webapp/catalog/feature/BulkAddFeature.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/feature/BulkAddFeature.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/catalog/feature/BulkAddFeature.ftl (original) +++ ofbiz/trunk/applications/product/webapp/catalog/feature/BulkAddFeature.ftl Sat Aug 16 11:34:57 2014 @@ -39,7 +39,7 @@ under the License. <td><input type="text" size='15' name="description_o_${feature_index}" /></td> <td><select name='productFeatureTypeId_o_${feature_index}' size="1"> <#list productFeatureTypes as productFeatureType> - <option value='${productFeatureType.productFeatureTypeId}'>${productFeatureType.get("description",locale)?if_exists}</option> + <option value='${productFeatureType.productFeatureTypeId}'>${productFeatureType.get("description",locale)!}</option> </#list> </select> <input name='productFeatureCategoryId_o_${feature_index}' type="hidden" value="${productFeatureCategoryId}" /> Modified: ofbiz/trunk/applications/product/webapp/catalog/feature/EditFeatureCategoryFeatures.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/feature/EditFeatureCategoryFeatures.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/catalog/feature/EditFeatureCategoryFeatures.ftl (original) +++ ofbiz/trunk/applications/product/webapp/catalog/feature/EditFeatureCategoryFeatures.ftl Sat Aug 16 11:34:57 2014 @@ -18,11 +18,11 @@ under the License. --> <div class="screenlet"> <div class="screenlet-title-bar"> - <h3>${uiLabelMap.ProductEditFeaturesForFeatureCategory} "${(curProductFeatureCategory.description)?if_exists}"</h3> + <h3>${uiLabelMap.ProductEditFeaturesForFeatureCategory} "${(curProductFeatureCategory.description)!}"</h3> </div> <div class="screenlet-body"> <div class="button-bar"> - <a href="<@ofbizUrl>CreateFeature?productFeatureCategoryId=${productFeatureCategoryId?if_exists}</@ofbizUrl>" class="buttontext create">${uiLabelMap.ProductCreateNewFeature}</a> + <a href="<@ofbizUrl>CreateFeature?productFeatureCategoryId=${productFeatureCategoryId!}</@ofbizUrl>" class="buttontext create">${uiLabelMap.ProductCreateNewFeature}</a> </div> <br/> <form action="<@ofbizUrl>QuickAddProductFeatures</@ofbizUrl>" method="post"> @@ -52,11 +52,11 @@ under the License. <span class="label"> <b> <#if (viewIndex > 0)> - <a href="<@ofbizUrl>EditFeatureCategoryFeatures?productFeatureCategoryId=${productFeatureCategoryId?if_exists}&VIEW_SIZE=${viewSize}&VIEW_INDEX=${viewIndex-1}${productString?if_exists}</@ofbizUrl>" class="buttontext">[${uiLabelMap.CommonPrevious}]</a> | + <a href="<@ofbizUrl>EditFeatureCategoryFeatures?productFeatureCategoryId=${productFeatureCategoryId!}&VIEW_SIZE=${viewSize}&VIEW_INDEX=${viewIndex-1}${productString!}</@ofbizUrl>" class="buttontext">[${uiLabelMap.CommonPrevious}]</a> | </#if> ${lowIndex+1} - ${highIndex} ${uiLabelMap.CommonOf} ${listSize} <#if (listSize > highIndex)> - | <a href="<@ofbizUrl>EditFeatureCategoryFeatures?productFeatureCategoryId=${productFeatureCategoryId?if_exists}&VIEW_SIZE=${viewSize}&VIEW_INDEX=${viewIndex+1}${productString?if_exists}</@ofbizUrl>" class="buttontext">[${uiLabelMap.CommonNext}]</a> + | <a href="<@ofbizUrl>EditFeatureCategoryFeatures?productFeatureCategoryId=${productFeatureCategoryId!}&VIEW_SIZE=${viewSize}&VIEW_INDEX=${viewIndex+1}${productString!}</@ofbizUrl>" class="buttontext">[${uiLabelMap.CommonNext}]</a> </#if> </b> </span> @@ -94,29 +94,29 @@ under the License. <td><input type="text" size='15' name="description_o_${rowCount}" value="${productFeature.description}" /></td> <td><select name='productFeatureTypeId_o_${rowCount}' size="1"> <#if productFeature.productFeatureTypeId?has_content> - <option value='${productFeature.productFeatureTypeId}'><#if curProductFeatureType?exists>${curProductFeatureType.get("description",locale)?if_exists}<#else> [${productFeature.productFeatureTypeId}]</#if></option> + <option value='${productFeature.productFeatureTypeId}'><#if curProductFeatureType??>${curProductFeatureType.get("description",locale)!}<#else> [${productFeature.productFeatureTypeId}]</#if></option> <option value='${productFeature.productFeatureTypeId}'>---</option> </#if> <#list productFeatureTypes as productFeatureType> - <option value='${productFeatureType.productFeatureTypeId}'>${productFeatureType.get("description",locale)?if_exists}</option> + <option value='${productFeatureType.productFeatureTypeId}'>${productFeatureType.get("description",locale)!}</option> </#list> </select></td> <td><select name='productFeatureCategoryId_o_${rowCount}' size="1"> <#if productFeature.productFeatureCategoryId?has_content> <#assign curProdFeatCat = productFeature.getRelatedOne("ProductFeatureCategory", false)> - <option value='${productFeature.productFeatureCategoryId}'>${(curProdFeatCat.description)?if_exists} [${productFeature.productFeatureCategoryId}]</option> + <option value='${productFeature.productFeatureCategoryId}'>${(curProdFeatCat.description)!} [${productFeature.productFeatureCategoryId}]</option> <option value='${productFeature.productFeatureCategoryId}'>---</option> </#if> <#list productFeatureCategories as productFeatureCategory> - <option value='${productFeatureCategory.productFeatureCategoryId}'>${productFeatureCategory.get("description",locale)?if_exists} [${productFeatureCategory.productFeatureCategoryId}]</option> + <option value='${productFeatureCategory.productFeatureCategoryId}'>${productFeatureCategory.get("description",locale)!} [${productFeatureCategory.productFeatureCategoryId}]</option> </#list> </select></td> - <td><input type="text" size='10' name="uomId_o_${rowCount}" value="${productFeature.uomId?if_exists}" /></td> - <td><input type="text" size='5' name="numberSpecified_o_${rowCount}" value="${productFeature.numberSpecified?if_exists}" /></td> - <td><input type="text" size='5' name="defaultAmount_o_${rowCount}" value="${productFeature.defaultAmount?if_exists}" /></td> - <td><input type="text" size='5' name="defaultSequenceNum_o_${rowCount}" value="${productFeature.defaultSequenceNum?if_exists}" /></td> - <td><input type="text" size='5' name="idCode_o_${rowCount}" value="${productFeature.idCode?if_exists}" /></td> - <td><input type="text" size='5' name="abbrev_o_${rowCount}" value="${productFeature.abbrev?if_exists}" /></td> + <td><input type="text" size='10' name="uomId_o_${rowCount}" value="${productFeature.uomId!}" /></td> + <td><input type="text" size='5' name="numberSpecified_o_${rowCount}" value="${productFeature.numberSpecified!}" /></td> + <td><input type="text" size='5' name="defaultAmount_o_${rowCount}" value="${productFeature.defaultAmount!}" /></td> + <td><input type="text" size='5' name="defaultSequenceNum_o_${rowCount}" value="${productFeature.defaultSequenceNum!}" /></td> + <td><input type="text" size='5' name="idCode_o_${rowCount}" value="${productFeature.idCode!}" /></td> + <td><input type="text" size='5' name="abbrev_o_${rowCount}" value="${productFeature.abbrev!}" /></td> <td align="right"><input type="checkbox" name="_rowSubmit_o_${rowCount}" value="Y" onclick="javascript:checkToggle(this, 'selectAllForm');highlightRow(this,'productFeatureId_tableRow_${rowCount}');" /></td> </tr> <#assign rowCount = rowCount + 1> Modified: ofbiz/trunk/applications/product/webapp/catalog/feature/EditFeatureGroups.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/feature/EditFeatureGroups.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/catalog/feature/EditFeatureGroups.ftl (original) +++ ofbiz/trunk/applications/product/webapp/catalog/feature/EditFeatureGroups.ftl Sat Aug 16 11:34:57 2014 @@ -36,7 +36,7 @@ under the License. <td> <form method='post' action='<@ofbizUrl>UpdateProductFeatureGroup</@ofbizUrl>'> <input type='hidden' name="productFeatureGroupId" value="${productFeatureGroup.productFeatureGroupId}" /> - <input type='text' size='30' name="description" value="${productFeatureGroup.description?if_exists}" /> + <input type='text' size='30' name="description" value="${productFeatureGroup.description!}" /> <input type="submit" value="${uiLabelMap.CommonUpdate}" /> </form> </td> Modified: ofbiz/trunk/applications/product/webapp/catalog/find/FindProductById.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/find/FindProductById.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/catalog/find/FindProductById.ftl (original) +++ ofbiz/trunk/applications/product/webapp/catalog/find/FindProductById.ftl Sat Aug 16 11:34:57 2014 @@ -24,10 +24,10 @@ under the License. </div> <div class="screenlet-body"> <form name="idsearchform" method="post" action="<@ofbizUrl>FindProductById</@ofbizUrl>" style="margin: 0;"> - <span class="label">${uiLabelMap.CommonId} ${uiLabelMap.CommonValue}:</span> <input type="text" name="idValue" size="20" maxlength="50" value="${idValue?if_exists}" /> <a href="javascript:document.idsearchform.submit()" class="buttontext">${uiLabelMap.CommonFind}</a> + <span class="label">${uiLabelMap.CommonId} ${uiLabelMap.CommonValue}:</span> <input type="text" name="idValue" size="20" maxlength="50" value="${idValue!}" /> <a href="javascript:document.idsearchform.submit()" class="buttontext">${uiLabelMap.CommonFind}</a> </form> <br /> - <h1>${uiLabelMap.ProductSearchResultsWithIdValue}: ${idValue?if_exists}</h1> + <h1>${uiLabelMap.ProductSearchResultsWithIdValue}: ${idValue!}</h1> <#if !goodIdentifications?has_content && !idProduct?has_content> <br /> <h2> ${uiLabelMap.ProductNoResultsFound}.</h2> @@ -41,7 +41,7 @@ under the License. </td> <td> </td> <td> - <a href="<@ofbizUrl>EditProduct?productId=${idProduct.productId}</@ofbizUrl>" class="buttontext">${(idProduct.internalName)?if_exists}</a> + <a href="<@ofbizUrl>EditProduct?productId=${idProduct.productId}</@ofbizUrl>" class="buttontext">${(idProduct.internalName)!}</a> (${uiLabelMap.ProductSearchResultsFound}) </td> </tr> @@ -61,7 +61,7 @@ under the License. </td> <td> </td> <td> - <a href="<@ofbizUrl>EditProduct?productId=${product.productId}</@ofbizUrl>" class="buttontext">${(product.internalName)?if_exists}</a> + <a href="<@ofbizUrl>EditProduct?productId=${product.productId}</@ofbizUrl>" class="buttontext">${(product.internalName)!}</a> (${uiLabelMap.ProductSearchResultsFound} ${goodIdentificationType.get("description",locale)?default(goodIdentification.goodIdentificationTypeId)}.) </td> </tr> Modified: ofbiz/trunk/applications/product/webapp/catalog/find/advancedsearch.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/find/advancedsearch.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/catalog/find/advancedsearch.ftl (original) +++ ofbiz/trunk/applications/product/webapp/catalog/find/advancedsearch.ftl Sat Aug 16 11:34:57 2014 @@ -26,7 +26,7 @@ under the License. <input type="hidden" name="PAGING" value="Y"/> <input type="hidden" name="noConditionFind" value="Y"/> <#if searchCategory?has_content> - <input type="hidden" name="SEARCH_CATEGORY_ID" value="${searchCategoryId?if_exists}"/> + <input type="hidden" name="SEARCH_CATEGORY_ID" value="${searchCategoryId!}"/> </#if> <table cellspacing="0" class="basic-table"> <#if searchCategory?has_content> @@ -36,7 +36,7 @@ under the License. </td> <td valign="middle"> <div> - <b>"${(searchCategory.description)?if_exists}" [${(searchCategory.productCategoryId)?if_exists}]</b> ${uiLabelMap.ProductIncludeSubCategories} + <b>"${(searchCategory.description)!}" [${(searchCategory.productCategoryId)!}]</b> ${uiLabelMap.ProductIncludeSubCategories} ${uiLabelMap.CommonYes}<input type="radio" name="SEARCH_SUB_CATEGORIES" value="Y" checked="checked" /> ${uiLabelMap.CommonNo}<input type="radio" name="SEARCH_SUB_CATEGORIES" value="N"/> </div> @@ -68,7 +68,7 @@ under the License. </td> <td valign="middle"> <div> - <@htmlTemplate.lookupField value="${requestParameters.SEARCH_CATEGORY_ID?if_exists}" formName="advtokeywordsearchform" name="SEARCH_CATEGORY_ID" id="SEARCH_CATEGORY_ID" fieldFormName="LookupProductCategory"/> + <@htmlTemplate.lookupField value="${requestParameters.SEARCH_CATEGORY_ID!}" formName="advtokeywordsearchform" name="SEARCH_CATEGORY_ID" id="SEARCH_CATEGORY_ID" fieldFormName="LookupProductCategory"/> ${uiLabelMap.ProductIncludeSubCategories} ${uiLabelMap.CommonYes}<input type="radio" name="SEARCH_SUB_CATEGORIES" value="Y" checked="checked"/> ${uiLabelMap.CommonNo}<input type="radio" name="SEARCH_SUB_CATEGORIES" value="N"/> @@ -85,7 +85,7 @@ under the License. </td> <td valign="middle"> <div> - <input type="text" name="SEARCH_PRODUCT_NAME" size="20" value="${requestParameters.SEARCH_PRODUCT_NAME?if_exists}"/> + <input type="text" name="SEARCH_PRODUCT_NAME" size="20" value="${requestParameters.SEARCH_PRODUCT_NAME!}"/> </div> </td> </tr> @@ -95,7 +95,7 @@ under the License. </td> <td valign="middle"> <div> - <input type="text" name="SEARCH_INTERNAL_PROD_NAME" size="20" value="${requestParameters.SEARCH_INTERNAL_PROD_NAME?if_exists}"/> + <input type="text" name="SEARCH_INTERNAL_PROD_NAME" size="20" value="${requestParameters.SEARCH_INTERNAL_PROD_NAME!}"/> </div> </td> </tr> @@ -105,7 +105,7 @@ under the License. </td> <td valign="middle"> <div> - <input type="text" name="SEARCH_STRING" size="40" value="${requestParameters.SEARCH_STRING?if_exists}"/> + <input type="text" name="SEARCH_STRING" size="40" value="${requestParameters.SEARCH_STRING!}"/> ${uiLabelMap.CommonAny}<input type="radio" name="SEARCH_OPERATOR" value="OR" <#if searchOperator == "OR">checked="checked"</#if>/> ${uiLabelMap.CommonAll}<input type="radio" name="SEARCH_OPERATOR" value="AND" <#if searchOperator == "AND">checked="checked"</#if>/> </div> @@ -117,19 +117,19 @@ under the License. </td> <td valign="middle"> <div> - <input type="text" name="SEARCH_PROD_FEAT_CAT1" size="15" value="${requestParameters.SEARCH_PROD_FEAT_CAT1?if_exists}"/> + <input type="text" name="SEARCH_PROD_FEAT_CAT1" size="15" value="${requestParameters.SEARCH_PROD_FEAT_CAT1!}"/> ${uiLabelMap.CommonInclude}<input type="radio" name="SEARCH_PROD_FEAT_CAT_EXC1" value="" checked="checked"/> ${uiLabelMap.CommonExclude}<input type="radio" name="SEARCH_PROD_FEAT_CAT_EXC1" value="Y"/> ${uiLabelMap.CommonAlwaysInclude}<input type="radio" name="SEARCH_PROD_FEAT_CAT_EXC1" value="N"/> </div> <div> - <input type="text" name="SEARCH_PROD_FEAT_CAT2" size="15" value="${requestParameters.SEARCH_PROD_FEAT_CAT2?if_exists}"/> + <input type="text" name="SEARCH_PROD_FEAT_CAT2" size="15" value="${requestParameters.SEARCH_PROD_FEAT_CAT2!}"/> ${uiLabelMap.CommonInclude}<input type="radio" name="SEARCH_PROD_FEAT_CAT_EXC2" value="" checked="checked"/> ${uiLabelMap.CommonExclude}<input type="radio" name="SEARCH_PROD_FEAT_CAT_EXC2" value="Y"/> ${uiLabelMap.CommonAlwaysInclude}<input type="radio" name="SEARCH_PROD_FEAT_CAT_EXC2" value="N"/> </div> <div> - <input type="text" name="SEARCH_PROD_FEAT_CAT3" size="15" value="${requestParameters.SEARCH_PROD_FEAT_CAT3?if_exists}"/> + <input type="text" name="SEARCH_PROD_FEAT_CAT3" size="15" value="${requestParameters.SEARCH_PROD_FEAT_CAT3!}"/> ${uiLabelMap.CommonInclude}<input type="radio" name="SEARCH_PROD_FEAT_CAT_EXC3" value="" checked="checked"/> ${uiLabelMap.CommonExclude}<input type="radio" name="SEARCH_PROD_FEAT_CAT_EXC3" value="Y"/> ${uiLabelMap.CommonAlwaysInclude}<input type="radio" name="SEARCH_PROD_FEAT_CAT_EXC3" value="N"/> @@ -142,19 +142,19 @@ under the License. </td> <td valign="middle"> <div> - <input type="text" name="SEARCH_PROD_FEAT_GRP1" size="15" value="${requestParameters.SEARCH_PROD_FEAT_GRP1?if_exists}"/> + <input type="text" name="SEARCH_PROD_FEAT_GRP1" size="15" value="${requestParameters.SEARCH_PROD_FEAT_GRP1!}"/> ${uiLabelMap.CommonInclude}<input type="radio" name="SEARCH_PROD_FEAT_GRP_EXC1" value="" checked="checked"/> ${uiLabelMap.CommonExclude}<input type="radio" name="SEARCH_PROD_FEAT_GRP_EXC1" value="Y"/> ${uiLabelMap.CommonAlwaysInclude}<input type="radio" name="SEARCH_PROD_FEAT_GRP_EXC1" value="N"/> </div> <div> - <input type="text" name="SEARCH_PROD_FEAT_GRP2" size="15" value="${requestParameters.SEARCH_PROD_FEAT_GRP2?if_exists}"/> + <input type="text" name="SEARCH_PROD_FEAT_GRP2" size="15" value="${requestParameters.SEARCH_PROD_FEAT_GRP2!}"/> ${uiLabelMap.CommonInclude}<input type="radio" name="SEARCH_PROD_FEAT_GRP_EXC2" value="" checked="checked"/> ${uiLabelMap.CommonExclude}<input type="radio" name="SEARCH_PROD_FEAT_GRP_EXC2" value="Y"/> ${uiLabelMap.CommonAlwaysInclude}<input type="radio" name="SEARCH_PROD_FEAT_GRP_EXC2" value="N"/> </div> <div> - <input type="text" name="SEARCH_PROD_FEAT_GRP3" size="15" value="${requestParameters.SEARCH_PROD_FEAT_GRP3?if_exists}"/> + <input type="text" name="SEARCH_PROD_FEAT_GRP3" size="15" value="${requestParameters.SEARCH_PROD_FEAT_GRP3!}"/> ${uiLabelMap.CommonInclude}<input type="radio" name="SEARCH_PROD_FEAT_GRP_EXC3" value="" checked="checked"/> ${uiLabelMap.CommonExclude}<input type="radio" name="SEARCH_PROD_FEAT_GRP_EXC3" value="Y"/> ${uiLabelMap.CommonAlwaysInclude}<input type="radio" name="SEARCH_PROD_FEAT_GRP_EXC3" value="N"/> @@ -168,19 +168,19 @@ under the License. </td> <td valign="middle"> <div> - <input type="text" name="SEARCH_FEAT1" size="15" value="${requestParameters.SEARCH_FEAT1?if_exists}"/> + <input type="text" name="SEARCH_FEAT1" size="15" value="${requestParameters.SEARCH_FEAT1!}"/> ${uiLabelMap.CommonInclude}<input type="radio" name="SEARCH_FEAT_EXC1" value="" checked="checked"/> ${uiLabelMap.CommonExclude}<input type="radio" name="SEARCH_FEAT_EXC1" value="Y"/> ${uiLabelMap.CommonAlwaysInclude}<input type="radio" name="SEARCH_FEAT_EXC1" value="N"/> </div> <div> - <input type="text" name="SEARCH_FEAT2" size="15" value="${requestParameters.SEARCH_FEAT2?if_exists}"/> + <input type="text" name="SEARCH_FEAT2" size="15" value="${requestParameters.SEARCH_FEAT2!}"/> ${uiLabelMap.CommonInclude}<input type="radio" name="SEARCH_FEAT_EXC2" value="" checked="checked"/> ${uiLabelMap.CommonExclude}<input type="radio" name="SEARCH_FEAT_EXC2" value="Y"/> ${uiLabelMap.CommonAlwaysInclude}<input type="radio" name="SEARCH_FEAT_EXC2" value="N"/> </div> <div> - <input type="text" name="SEARCH_FEAT3" size="15" value="${requestParameters.SEARCH_FEAT3?if_exists}"/> + <input type="text" name="SEARCH_FEAT3" size="15" value="${requestParameters.SEARCH_FEAT3!}"/> ${uiLabelMap.CommonInclude}<input type="radio" name="SEARCH_FEAT_EXC3" value="" checked="checked"/> ${uiLabelMap.CommonExclude}<input type="radio" name="SEARCH_FEAT_EXC3" value="Y"/> ${uiLabelMap.CommonAlwaysInclude}<input type="radio" name="SEARCH_FEAT_EXC3" value="N"/> @@ -193,8 +193,8 @@ under the License. </td> <td valign="middle"> <div> - <input type="text" name="LIST_PRICE_LOW" size="8" value="${requestParameters.LIST_PRICE_LOW?if_exists}"/> - <input type="text" name="LIST_PRICE_HIGH" size="8" value="${requestParameters.LIST_PRICE_HIGH?if_exists}"/> + <input type="text" name="LIST_PRICE_LOW" size="8" value="${requestParameters.LIST_PRICE_LOW!}"/> + <input type="text" name="LIST_PRICE_HIGH" size="8" value="${requestParameters.LIST_PRICE_HIGH!}"/> </div> </td> </tr> @@ -204,7 +204,7 @@ under the License. <#assign productFeatures = productFeaturesByTypeMap[productFeatureTypeId]> <tr> <td class="label" align="right" valign="middle"> - ${(productFeatureType.get("description",locale))?if_exists}: + ${(productFeatureType.get("description",locale))!}: </td> <td valign="middle"> <div> @@ -227,7 +227,7 @@ under the License. <select name="SEARCH_SUPPLIER_ID"> <option value="">- ${uiLabelMap.CommonSelectAny} -</option> <#list supplerPartyRoleAndPartyDetails as supplerPartyRoleAndPartyDetail> - <option value="${supplerPartyRoleAndPartyDetail.partyId}">${supplerPartyRoleAndPartyDetail.groupName?if_exists} ${supplerPartyRoleAndPartyDetail.firstName?if_exists} ${supplerPartyRoleAndPartyDetail.lastName?if_exists} [${supplerPartyRoleAndPartyDetail.partyId}]</option> + <option value="${supplerPartyRoleAndPartyDetail.partyId}">${supplerPartyRoleAndPartyDetail.groupName!} ${supplerPartyRoleAndPartyDetail.firstName!} ${supplerPartyRoleAndPartyDetail.lastName!} [${supplerPartyRoleAndPartyDetail.partyId}]</option> </#list> </select> </div> @@ -262,7 +262,7 @@ under the License. ${uiLabelMap.ProductPrioritizeProductsInCategory}: </td> <td valign="middle"> - <@htmlTemplate.lookupField value="${requestParameters.PRIORITIZE_CATEGORY_ID?if_exists}" formName="advtokeywordsearchform" name="PRIORITIZE_CATEGORY_ID" id="PRIORITIZE_CATEGORY_ID" fieldFormName="LookupProductCategory"/> + <@htmlTemplate.lookupField value="${requestParameters.PRIORITIZE_CATEGORY_ID!}" formName="advtokeywordsearchform" name="PRIORITIZE_CATEGORY_ID" id="PRIORITIZE_CATEGORY_ID" fieldFormName="LookupProductCategory"/> </td> </tr> <tr> @@ -273,7 +273,7 @@ under the License. <select name="SEARCH_GOOD_IDENTIFICATION_TYPE"> <option value="">- ${uiLabelMap.CommonSelectAny} -</option> <#list goodIdentificationTypes as goodIdentificationType> - <option value="${goodIdentificationType.goodIdentificationTypeId}">${goodIdentificationType.get("description")?if_exists}</option> + <option value="${goodIdentificationType.goodIdentificationTypeId}">${goodIdentificationType.get("description")!}</option> </#list> </select> </td> @@ -283,7 +283,7 @@ under the License. ${uiLabelMap.ProductGoodIdentificationValue}: </td> <td> - <input type="text" name="SEARCH_GOOD_IDENTIFICATION_VALUE" size="60" maxlength="60" value="${requestParameters.SEARCH_GOOD_IDENTIFICATION_VALUE?if_exists}"/> + <input type="text" name="SEARCH_GOOD_IDENTIFICATION_VALUE" size="60" maxlength="60" value="${requestParameters.SEARCH_GOOD_IDENTIFICATION_VALUE!}"/> ${uiLabelMap.CommonInclude}<input type="radio" name="SEARCH_GOOD_IDENTIFICATION_INCL" value="Y" checked="checked"/> ${uiLabelMap.CommonExclude}<input type="radio" name="SEARCH_GOOD_IDENTIFICATION_INCL" value="N"/> </td> Modified: ofbiz/trunk/applications/product/webapp/catalog/find/exportproducts.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/find/exportproducts.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/catalog/find/exportproducts.ftl (original) +++ ofbiz/trunk/applications/product/webapp/catalog/find/exportproducts.ftl Sat Aug 16 11:34:57 2014 @@ -18,7 +18,7 @@ under the License. --> <#if productExportList?has_content> <#list productExportList as productExportMap><#assign productCategoryCount=0/><#assign productFeatureCount=0/> - ${productExportMap.productId} <#if productExportMap.productFeatureCustom?has_content>${productExportMap.productFeatureCustom.description?if_exists}</#if> <#list productExportMap.productCategories as productCategoryAndMember><#if productCategoryAndMember.categoryName?has_content><#if productCategoryCount > 0>,</#if>${productCategoryAndMember.categoryName}<#assign productCategoryCount=productCategoryCount + 1/></#if></#list> <#list productExportMap.productFeatures as productFeatureAndAppl><#if productFeatureAndAppl.description?has_content><#if productFeatureCount > 0>,</#if>${productFeatureAndAppl.description}<#assign productFeatureCount=productFeatureCount + 1/></#if></#list> + ${productExportMap.productId} <#if productExportMap.productFeatureCustom?has_content>${productExportMap.productFeatureCustom.description!}</#if> <#list productExportMap.productCategories as productCategoryAndMember><#if productCategoryAndMember.categoryName?has_content><#if productCategoryCount > 0>,</#if>${productCategoryAndMember.categoryName}<#assign productCategoryCount=productCategoryCount + 1/></#if></#list> <#list productExportMap.productFeatures as productFeatureAndAppl><#if productFeatureAndAppl.description?has_content><#if productFeatureCount > 0>,</#if>${productFeatureAndAppl.description}<#assign productFeatureCount=productFeatureCount + 1/></#if></#list> </#list> <#else> ${uiLabelMap.ProductErrorNothingToExport} Modified: ofbiz/trunk/applications/product/webapp/catalog/find/keywordsearch.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/find/keywordsearch.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/catalog/find/keywordsearch.ftl (original) +++ ofbiz/trunk/applications/product/webapp/catalog/find/keywordsearch.ftl Sat Aug 16 11:34:57 2014 @@ -25,7 +25,7 @@ under the License. <div> <a href="<@ofbizUrl>keywordsearch?removeConstraint=${searchConstraintString_index}&clearSearch=N</@ofbizUrl>" class="buttontext">X</a> ${searchConstraintString}</div> </#list> <span class="label">${uiLabelMap.CommonSortedBy}:</span>${searchSortOrderString} - <div><a href="<@ofbizUrl>advancedsearch?SEARCH_CATEGORY_ID=${(requestParameters.SEARCH_CATEGORY_ID)?if_exists}</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonRefineSearch}</a></div> + <div><a href="<@ofbizUrl>advancedsearch?SEARCH_CATEGORY_ID=${(requestParameters.SEARCH_CATEGORY_ID)!}</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonRefineSearch}</a></div> <#if !productIds?has_content> <br /><h2> ${uiLabelMap.ProductNoResultsFound}.</h2> @@ -109,7 +109,7 @@ under the License. </table> <form method="post" name="products"> - <input type="hidden" name="productStoreId" value="${parameters.productStoreId?if_exists}" /> + <input type="hidden" name="productStoreId" value="${parameters.productStoreId!}" /> <table cellspacing="0" class="basic-table"> <#assign listIndex = lowIndex> <#assign rowClass = "2"> @@ -118,7 +118,7 @@ under the License. <tr valign="middle"<#if rowClass == "1"> class="alternate-row"</#if>> <td> <input type="checkbox" name="selectResult" value="${productId}" onchange="checkProductToBagTextArea(this, '${productId}');"/> - <a href="<@ofbizUrl>EditProduct?productId=${productId}</@ofbizUrl>" class="buttontext">[${productId}] ${(product.internalName)?if_exists}</a> + <a href="<@ofbizUrl>EditProduct?productId=${productId}</@ofbizUrl>" class="buttontext">[${productId}] ${(product.internalName)!}</a> </td> </tr> <#-- toggle the row color --> Modified: ofbiz/trunk/applications/product/webapp/catalog/find/keywordsearchbox.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/find/keywordsearchbox.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/catalog/find/keywordsearchbox.ftl (original) +++ ofbiz/trunk/applications/product/webapp/catalog/find/keywordsearchbox.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 (requestAttributes.uiLabelMap)?exists><#assign uiLabelMap = requestAttributes.uiLabelMap></#if> +<#if (requestAttributes.uiLabelMap)??><#assign uiLabelMap = requestAttributes.uiLabelMap></#if> <script type="text/javascript"> //<![CDATA[ @@ -36,19 +36,19 @@ under the License. <fieldset> <div> <label for="keywordSearchString">${uiLabelMap.ProductKeywords}:</label> - <input type="text" name="SEARCH_STRING" id="keywordSearchString" size="20" maxlength="50" value="${requestParameters.SEARCH_STRING?if_exists}" /> + <input type="text" name="SEARCH_STRING" id="keywordSearchString" size="20" maxlength="50" value="${requestParameters.SEARCH_STRING!}" /> </div> <div> <label for="keywordSearchCategoryId">${uiLabelMap.ProductCategoryId}:</label> - <@htmlTemplate.lookupField value="${requestParameters.SEARCH_CATEGORY_ID?if_exists}" formName="keywordsearchform" name="SEARCH_CATEGORY_ID" id="keywordSearchCategoryId" fieldFormName="LookupProductCategory"/> + <@htmlTemplate.lookupField value="${requestParameters.SEARCH_CATEGORY_ID!}" formName="keywordsearchform" name="SEARCH_CATEGORY_ID" id="keywordSearchCategoryId" fieldFormName="LookupProductCategory"/> </div> <div> <label for="keywordSearchCointains">${uiLabelMap.CommonNoContains}</label> - <input type="checkbox" name="SEARCH_CONTAINS" id="keywordSearchCointains" value="N" <#if requestParameters.SEARCH_CONTAINS?if_exists == "N">checked="checked"</#if> /> + <input type="checkbox" name="SEARCH_CONTAINS" id="keywordSearchCointains" value="N" <#if requestParameters.SEARCH_CONTAINS! == "N">checked="checked"</#if> /> <label for="keywordSearchOperatorOr">${uiLabelMap.CommonAny}</label> - <input type="radio" name="SEARCH_OPERATOR" id="keywordSearchOperatorOr" value="OR" <#if requestParameters.SEARCH_OPERATOR?if_exists != "AND">checked="checked"</#if> /> + <input type="radio" name="SEARCH_OPERATOR" id="keywordSearchOperatorOr" value="OR" <#if requestParameters.SEARCH_OPERATOR! != "AND">checked="checked"</#if> /> <label for="keywordSearchOperatorAnd">${uiLabelMap.CommonAll}</label> - <input type="radio" name="SEARCH_OPERATOR" id="keywordSearchOperatorAnd" value="AND" <#if requestParameters.SEARCH_OPERATOR?if_exists == "AND">checked="checked"</#if> /> + <input type="radio" name="SEARCH_OPERATOR" id="keywordSearchOperatorAnd" value="AND" <#if requestParameters.SEARCH_OPERATOR! == "AND">checked="checked"</#if> /> </div> <div> <input type="submit" name="find" value="${uiLabelMap.CommonFind}" class="buttontext" /> @@ -59,7 +59,7 @@ under the License. <fieldset> <div> <label for="searchCategoryId">${uiLabelMap.ProductCategoryId}:</label> - <@htmlTemplate.lookupField value="${requestParameters.SEARCH_CATEGORY_ID?if_exists}" formName="advancedsearchform" name="SEARCH_CATEGORY_ID" id="searchCategoryId" fieldFormName="LookupProductCategory"/> + <@htmlTemplate.lookupField value="${requestParameters.SEARCH_CATEGORY_ID!}" formName="advancedsearchform" name="SEARCH_CATEGORY_ID" id="searchCategoryId" fieldFormName="LookupProductCategory"/> </div> <div> <a href="javascript:document.getElementById('advancedSearchForm').submit()" class="buttontext">${uiLabelMap.ProductAdvancedSearch}</a> @@ -70,7 +70,7 @@ under the License. <fieldset> <input type="hidden" name="viewSize" value="20" /> <input type="hidden" name="viewIndex" value="1" /> - <@htmlTemplate.lookupField value="${requestParameters.productId?if_exists}" formName="productjumpform" name="productId" id="productJumpFormProductId" fieldFormName="LookupProduct"/> + <@htmlTemplate.lookupField value="${requestParameters.productId!}" formName="productjumpform" name="productId" id="productJumpFormProductId" fieldFormName="LookupProduct"/> <select name="DUMMYPAGE" id="dummyPage" onchange="submitProductJump()"> <option value="<@ofbizUrl>EditProduct</@ofbizUrl>">-${uiLabelMap.ProductProductJump}-</option> <option value="<@ofbizUrl>EditProductQuickAdmin</@ofbizUrl>">${uiLabelMap.ProductQuickAdmin}</option> Modified: ofbiz/trunk/applications/product/webapp/catalog/find/miniproductlist.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/find/miniproductlist.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/catalog/find/miniproductlist.ftl (original) +++ ofbiz/trunk/applications/product/webapp/catalog/find/miniproductlist.ftl Sat Aug 16 11:34:57 2014 @@ -17,7 +17,7 @@ specific language governing permissions under the License. --> -<#if productCategory?exists> +<#if productCategory??> <#if productCategoryMembers?has_content> <#list productCategoryMembers as productCategoryMember> <#assign product = productCategoryMember.getRelatedOne("Product", true)> Modified: ofbiz/trunk/applications/product/webapp/catalog/find/sidecatalogs.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/find/sidecatalogs.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/catalog/find/sidecatalogs.ftl (original) +++ ofbiz/trunk/applications/product/webapp/catalog/find/sidecatalogs.ftl Sat Aug 16 11:34:57 2014 @@ -19,9 +19,9 @@ under the License. <div class="browsecategorylist"> <#assign sortList = Static["org.ofbiz.base.util.UtilMisc"].toList("prodCatalogCategoryTypeId", "sequenceNum", "productCategoryId")> <#list prodCatalogs as prodCatalog> - <#if curProdCatalogId?exists && curProdCatalogId == prodCatalog.prodCatalogId> + <#if curProdCatalogId?? && curProdCatalogId == prodCatalog.prodCatalogId> <#assign prodCatalogCategories = prodCatalog.getRelated("ProdCatalogCategory", null, sortList, true)> - <div class='browsecategorytext'><a href="<@ofbizUrl>EditProdCatalog?prodCatalogId=${prodCatalog.prodCatalogId}</@ofbizUrl>" class='browsecategorybutton'>${prodCatalog.catalogName?if_exists}</a></div> + <div class='browsecategorytext'><a href="<@ofbizUrl>EditProdCatalog?prodCatalogId=${prodCatalog.prodCatalogId}</@ofbizUrl>" class='browsecategorybutton'>${prodCatalog.catalogName!}</a></div> <div class="browsecategorylist"> <#list prodCatalogCategories as prodCatalogCategory> <#assign productCategory = prodCatalogCategory.getRelatedOne("ProductCategory", true)> @@ -29,7 +29,7 @@ under the License. </#list> </div> <#else> - <div class='browsecategorytext'><a href="<@ofbizUrl>EditProdCatalog?prodCatalogId=${prodCatalog.prodCatalogId}</@ofbizUrl>" class='browsecategorybutton'>${prodCatalog.catalogName?if_exists}</a></div> + <div class='browsecategorytext'><a href="<@ofbizUrl>EditProdCatalog?prodCatalogId=${prodCatalog.prodCatalogId}</@ofbizUrl>" class='browsecategorybutton'>${prodCatalog.catalogName!}</a></div> </#if> </#list> </div> Modified: ofbiz/trunk/applications/product/webapp/catalog/find/sidedeepcategory.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/find/sidedeepcategory.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/catalog/find/sidedeepcategory.ftl (original) +++ ofbiz/trunk/applications/product/webapp/catalog/find/sidedeepcategory.ftl Sat Aug 16 11:34:57 2014 @@ -22,31 +22,31 @@ under the License. <#if parentCategory.productCategoryId != category.productCategoryId> <#local pStr = "&pcategory=" + parentCategory.productCategoryId> </#if> - <#if curCategoryId?exists && curCategoryId == category.productCategoryId> + <#if curCategoryId?? && curCategoryId == category.productCategoryId> <div class="browsecategorytext"> - <#if catContentWrappers?exists && catContentWrappers[category.productCategoryId]?exists && catContentWrappers[category.productCategoryId].get("CATEGORY_NAME")?has_content> - <a href="<@ofbizUrl>EditCategory?productCategoryId=${category.productCategoryId}${pStr?if_exists}</@ofbizUrl>" class="browsecategorybuttondisabled">${catContentWrappers[category.productCategoryId].get("CATEGORY_NAME")} [${category.productCategoryId}]</a> - <#elseif catContentWrappers?exists && catContentWrappers[category.productCategoryId]?exists && catContentWrappers[category.productCategoryId].get("DESCRIPTION")?has_content> - <a href="<@ofbizUrl>EditCategory?productCategoryId=${category.productCategoryId}${pStr?if_exists}</@ofbizUrl>" class="browsecategorybuttondisabled">${catContentWrappers[category.productCategoryId].get("DESCRIPTION")} [${category.productCategoryId}]</a> + <#if catContentWrappers?? && catContentWrappers[category.productCategoryId]?? && catContentWrappers[category.productCategoryId].get("CATEGORY_NAME")?has_content> + <a href="<@ofbizUrl>EditCategory?productCategoryId=${category.productCategoryId}${pStr!}</@ofbizUrl>" class="browsecategorybuttondisabled">${catContentWrappers[category.productCategoryId].get("CATEGORY_NAME")} [${category.productCategoryId}]</a> + <#elseif catContentWrappers?? && catContentWrappers[category.productCategoryId]?? && catContentWrappers[category.productCategoryId].get("DESCRIPTION")?has_content> + <a href="<@ofbizUrl>EditCategory?productCategoryId=${category.productCategoryId}${pStr!}</@ofbizUrl>" class="browsecategorybuttondisabled">${catContentWrappers[category.productCategoryId].get("DESCRIPTION")} [${category.productCategoryId}]</a> <#else> - <a href="<@ofbizUrl>EditCategory?productCategoryId=${category.productCategoryId}${pStr?if_exists}</@ofbizUrl>" class="browsecategorybuttondisabled">${category.categoryName?default(category.description)?if_exists} [${category.productCategoryId}]</a> + <a href="<@ofbizUrl>EditCategory?productCategoryId=${category.productCategoryId}${pStr!}</@ofbizUrl>" class="browsecategorybuttondisabled">${category.categoryName?default(category.description)!} [${category.productCategoryId}]</a> </#if> </div> <#else> <div class="browsecategorytext"> - <#if catContentWrappers?exists && catContentWrappers[category.productCategoryId]?exists && catContentWrappers[category.productCategoryId].get("CATEGORY_NAME")?has_content> - <a href="<@ofbizUrl>EditCategory?productCategoryId=${category.productCategoryId}${pStr?if_exists}</@ofbizUrl>" class="browsecategorybutton">${catContentWrappers[category.productCategoryId].get("CATEGORY_NAME")} [${category.productCategoryId}]</a> - <#elseif catContentWrappers?exists && catContentWrappers[category.productCategoryId]?exists && catContentWrappers[category.productCategoryId].get("DESCRIPTION")?has_content> - <a href="<@ofbizUrl>EditCategory?productCategoryId=${category.productCategoryId}${pStr?if_exists}</@ofbizUrl>" class="browsecategorybutton">${catContentWrappers[category.productCategoryId].get("DESCRIPTION")} [${category.productCategoryId}]</a> + <#if catContentWrappers?? && catContentWrappers[category.productCategoryId]?? && catContentWrappers[category.productCategoryId].get("CATEGORY_NAME")?has_content> + <a href="<@ofbizUrl>EditCategory?productCategoryId=${category.productCategoryId}${pStr!}</@ofbizUrl>" class="browsecategorybutton">${catContentWrappers[category.productCategoryId].get("CATEGORY_NAME")} [${category.productCategoryId}]</a> + <#elseif catContentWrappers?? && catContentWrappers[category.productCategoryId]?? && catContentWrappers[category.productCategoryId].get("DESCRIPTION")?has_content> + <a href="<@ofbizUrl>EditCategory?productCategoryId=${category.productCategoryId}${pStr!}</@ofbizUrl>" class="browsecategorybutton">${catContentWrappers[category.productCategoryId].get("DESCRIPTION")} [${category.productCategoryId}]</a> <#else> - <a href="<@ofbizUrl>EditCategory?productCategoryId=${category.productCategoryId}${pStr?if_exists}</@ofbizUrl>" class="browsecategorybutton">${category.categoryName?default(category.description)?if_exists} [${category.productCategoryId}]</a> + <a href="<@ofbizUrl>EditCategory?productCategoryId=${category.productCategoryId}${pStr!}</@ofbizUrl>" class="browsecategorybutton">${category.categoryName?default(category.description)!} [${category.productCategoryId}]</a> </#if> </div> </#if> - <#if (Static["org.ofbiz.product.category.CategoryWorker"].checkTrailItem(request, category.getString("productCategoryId"))) || (curCategoryId?exists && curCategoryId == category.productCategoryId)> + <#if (Static["org.ofbiz.product.category.CategoryWorker"].checkTrailItem(request, category.getString("productCategoryId"))) || (curCategoryId?? && curCategoryId == category.productCategoryId)> <#local subCatList = Static["org.ofbiz.product.category.CategoryWorker"].getRelatedCategoriesRet(request, "subCatList", category.getString("productCategoryId"), true)> - <#if subCatList?exists> + <#if subCatList??> <#list subCatList as subCat> <div class="browsecategorylist"> <@categoryList parentCategory=category category=subCat/> @@ -58,15 +58,15 @@ under the License. <div><a href='<@ofbizUrl>ChooseTopCategory</@ofbizUrl>' class='buttontext'>${uiLabelMap.ProductChooseTopCategory}</a></div> <div class="browsecategorylist"> -<#if currentTopCategory?exists> - <#if curCategoryId?exists && curCategoryId == currentTopCategory.productCategoryId> +<#if currentTopCategory??> + <#if curCategoryId?? && curCategoryId == currentTopCategory.productCategoryId> <div style='text-indent: -10px;'><b>${currentTopCategory.categoryName?default("No Name")} [${currentTopCategory.productCategoryId}]</b></div> <#else> - <div class='browsecategorytext'><a href="<@ofbizUrl>EditCategory?productCategoryId=${currentTopCategory.productCategoryId}</@ofbizUrl>" class='browsecategorybutton'>${currentTopCategory.categoryName?default(currentTopCategory.description)?if_exists} [${currentTopCategory.productCategoryId}]</a></div> + <div class='browsecategorytext'><a href="<@ofbizUrl>EditCategory?productCategoryId=${currentTopCategory.productCategoryId}</@ofbizUrl>" class='browsecategorybutton'>${currentTopCategory.categoryName?default(currentTopCategory.description)!} [${currentTopCategory.productCategoryId}]</a></div> </#if> </#if> <div class="browsecategorylist"> - <#if topLevelList?exists> + <#if topLevelList??> <#list topLevelList as category> <@categoryList parentCategory=category category=category/> </#list> Modified: ofbiz/trunk/applications/product/webapp/catalog/imagemanagement/AddMultipleImages.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/imagemanagement/AddMultipleImages.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/catalog/imagemanagement/AddMultipleImages.ftl (original) +++ ofbiz/trunk/applications/product/webapp/catalog/imagemanagement/AddMultipleImages.ftl Sat Aug 16 11:34:57 2014 @@ -28,7 +28,7 @@ under the License. <td> <select name="imageResize" > <#list productFeatures as productFeature> - <option value="${productFeature.abbrev?if_exists}">${productFeature.description?if_exists}</option> + <option value="${productFeature.abbrev!}">${productFeature.description!}</option> </#list> <option selected="" value="">Do not resize</option> </select> Modified: ofbiz/trunk/applications/product/webapp/catalog/imagemanagement/ImageGallery.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/imagemanagement/ImageGallery.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/catalog/imagemanagement/ImageGallery.ftl (original) +++ ofbiz/trunk/applications/product/webapp/catalog/imagemanagement/ImageGallery.ftl Sat Aug 16 11:34:57 2014 @@ -32,8 +32,8 @@ under the License. <table> <tbody> <tr valign="middle"> - <#-- <td align="center"><a href="/catalog/images/${seoUrl}-${product.productId}/${seoUrl}-${contentName}" target="_blank"><img src="<@ofbizContentUrl>${(contentDataResourceView.drObjectInfo)?if_exists}</@ofbizContentUrl>" vspace="5" hspace="5" alt=""/></a></td> --> - <td align="center"><a href="<@ofbizContentUrl>${(productImage.productImage)?if_exists}</@ofbizContentUrl>" target="_blank"><img src="<@ofbizContentUrl>${(productImage.productImageThumb)?if_exists}</@ofbizContentUrl>" vspace="5" hspace="5" alt=""/></a></td> + <#-- <td align="center"><a href="/catalog/images/${seoUrl}-${product.productId}/${seoUrl}-${contentName}" target="_blank"><img src="<@ofbizContentUrl>${(contentDataResourceView.drObjectInfo)!}</@ofbizContentUrl>" vspace="5" hspace="5" alt=""/></a></td> --> + <td align="center"><a href="<@ofbizContentUrl>${(productImage.productImage)!}</@ofbizContentUrl>" target="_blank"><img src="<@ofbizContentUrl>${(productImage.productImageThumb)!}</@ofbizContentUrl>" vspace="5" hspace="5" alt=""/></a></td> </tr> <tr valign="middle"> <#-- <td align="center"><a href="javascript:lookup_popup2('ImageShare?contentId=${productContentAndInfo.contentId}&dataResourceId=${productContentAndInfo.dataResourceId}&seoUrl=/catalog/images/${seoUrl}-${product.productId}/${seoUrl}-${contentName}','' ,500,500);" class="buttontext">${uiLabelMap.ImageManagementShare}</a></td> --> @@ -51,8 +51,8 @@ under the License. <table> <tbody> <tr valign="middle"> - <#-- <td align="center"><a href="/catalog/images/${seoUrl}-${product.productId}/${seoUrl}-${contentName}" target="_blank"><img src="<@ofbizContentUrl>${(contentDataResourceView.drObjectInfo)?if_exists}</@ofbizContentUrl>" vspace="5" hspace="5" alt=""/></a></td> --> - <td align="center"><a href="<@ofbizContentUrl>${(productImage.productImage)?if_exists}</@ofbizContentUrl>" target="_blank"><img src="<@ofbizContentUrl>${(productImage.productImageThumb)?if_exists}</@ofbizContentUrl>" vspace="5" hspace="5" alt=""/></a></td> + <#-- <td align="center"><a href="/catalog/images/${seoUrl}-${product.productId}/${seoUrl}-${contentName}" target="_blank"><img src="<@ofbizContentUrl>${(contentDataResourceView.drObjectInfo)!}</@ofbizContentUrl>" vspace="5" hspace="5" alt=""/></a></td> --> + <td align="center"><a href="<@ofbizContentUrl>${(productImage.productImage)!}</@ofbizContentUrl>" target="_blank"><img src="<@ofbizContentUrl>${(productImage.productImageThumb)!}</@ofbizContentUrl>" vspace="5" hspace="5" alt=""/></a></td> </tr> <tr valign="middle"> <#-- <td align="center"><a href="javascript:lookup_popup2('ImageShare?contentId=${productContentAndInfo.contentId}&dataResourceId=${productContentAndInfo.dataResourceId}&seoUrl=/catalog/images/${seoUrl}-${product.productId}/${seoUrl}-${contentName}','' ,500,500);" class="buttontext">${uiLabelMap.ImageManagementShare}</a></td> --> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |