svn commit: r1618336 [15/21] - in /ofbiz/trunk/applications: accounting/webapp/accounting/a
Locked
svn commit: r1618336 [15/21] - in /ofbiz/trunk/applications: accounting/webapp/accounting/a
 
|
Modified: ofbiz/trunk/applications/product/webapp/catalog/imagemanagement/showPeopleApprove.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/imagemanagement/showPeopleApprove.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/catalog/imagemanagement/showPeopleApprove.ftl (original) +++ ofbiz/trunk/applications/product/webapp/catalog/imagemanagement/showPeopleApprove.ftl Sat Aug 16 11:34:57 2014 @@ -40,7 +40,7 @@ jQuery(document).ready(function(){ <table> <#assign userLoginApprovers = delegator.findByAnd("UserLogin",Static["org.ofbiz.base.util.UtilMisc"].toMap("partyId", partyRole.partyId))/> <#assign userLoginApprover = userLoginApprovers[0]> - <#assign userLoginAndPartyDetails = delegator.findOne("UserLoginAndPartyDetails", Static["org.ofbiz.base.util.UtilMisc"].toMap("partyId", userLoginApprover.partyId, "userLoginId", userLoginApprover.userLoginId), false)?if_exists> + <#assign userLoginAndPartyDetails = delegator.findOne("UserLoginAndPartyDetails", Static["org.ofbiz.base.util.UtilMisc"].toMap("partyId", userLoginApprover.partyId, "userLoginId", userLoginApprover.userLoginId), false)!> <#if userLoginAndPartyDetails?has_content> <#assign partyContentDetail = delegator.findByAnd("ContentApproval",Static["org.ofbiz.base.util.UtilMisc"].toMap("roleTypeId", "IMAGEAPPROVER", "approvalStatusId", "IM_PENDING", "partyId", userLoginAndPartyDetails.partyId))/> <#assign imageApproveSize = partyContentDetail.size()> @@ -48,13 +48,13 @@ jQuery(document).ready(function(){ <#if userMap.checkUser == userLoginAndPartyDetails.userLoginId> <td> <div> - <b>${userLoginAndPartyDetails.firstName?if_exists} ${userLoginAndPartyDetails.middleName?if_exists} ${userLoginAndPartyDetails.lastName?if_exists} (${imageApproveSize})</b> | + <b>${userLoginAndPartyDetails.firstName!} ${userLoginAndPartyDetails.middleName!} ${userLoginAndPartyDetails.lastName!} (${imageApproveSize})</b> | </div> </td> <#else> <td> <div> - <b><a href="<@ofbizUrl>ImageApprove</@ofbizUrl>" class="text">${userLoginAndPartyDetails.firstName?if_exists} ${userLoginAndPartyDetails.middleName?if_exists} ${userLoginAndPartyDetails.lastName?if_exists} (${imageApproveSize})</a></b> | + <b><a href="<@ofbizUrl>ImageApprove</@ofbizUrl>" class="text">${userLoginAndPartyDetails.firstName!} ${userLoginAndPartyDetails.middleName!} ${userLoginAndPartyDetails.lastName!} (${imageApproveSize})</a></b> | </div> </td> </#if> @@ -62,13 +62,13 @@ jQuery(document).ready(function(){ <#if userMap.checkUser == userLoginAndPartyDetails.userLoginId> <td> <div> - <b>${userLoginAndPartyDetails.firstName?if_exists} ${userLoginAndPartyDetails.middleName?if_exists} ${userLoginAndPartyDetails.lastName?if_exists} (${imageApproveSize})</b> | + <b>${userLoginAndPartyDetails.firstName!} ${userLoginAndPartyDetails.middleName!} ${userLoginAndPartyDetails.lastName!} (${imageApproveSize})</b> | </div> </td> <#else> <td> <div> - <b><a href="<@ofbizUrl>ListPeopleApproved?createdByUserLogin=${userLoginAndPartyDetails.userLoginId}</@ofbizUrl>" class="text">${userLoginAndPartyDetails.firstName?if_exists} ${userLoginAndPartyDetails.middleName?if_exists} ${userLoginAndPartyDetails.lastName?if_exists} (${imageApproveSize})</a></b> | + <b><a href="<@ofbizUrl>ListPeopleApproved?createdByUserLogin=${userLoginAndPartyDetails.userLoginId}</@ofbizUrl>" class="text">${userLoginAndPartyDetails.firstName!} ${userLoginAndPartyDetails.middleName!} ${userLoginAndPartyDetails.lastName!} (${imageApproveSize})</a></b> | </div> </td> </#if> Modified: ofbiz/trunk/applications/product/webapp/catalog/lookup/LookupVariantProduct.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/lookup/LookupVariantProduct.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/catalog/lookup/LookupVariantProduct.ftl (original) +++ ofbiz/trunk/applications/product/webapp/catalog/lookup/LookupVariantProduct.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> <br /> <div class="label">[${product.productId}] ${product.internalName}</div> <br /> @@ -51,7 +51,7 @@ under the License. </table> </#if> <br /> -<#if variantProducts?exists> +<#if variantProducts??> <table cellspacing="0" class="basic-table"> <tr class="header-row"> <td><b>${uiLabelMap.ProductProductId}</b></td> @@ -61,13 +61,13 @@ under the License. <#list variantProducts as variant> <tr> <td><a class="buttontext" href="javascript:set_value('${variant.productId}')">${variant.productId}</a></td> - <td>${variant.brandName?if_exists}</td> - <td>${variant.internalName?if_exists}</td> + <td>${variant.brandName!}</td> + <td>${variant.internalName!}</td> </tr> </#list> </table> </#if> -<#if productFeatureIds?exists> +<#if productFeatureIds??> <table cellspacing="0" class="basic-table"> <form method="post" action="<@ofbizUrl>LookupVariantProduct</@ofbizUrl>" name="createNewVariant"> <input type="hidden" name="productId" value="${product.productId}" /> Modified: ofbiz/trunk/applications/product/webapp/catalog/main.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/main.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/catalog/main.ftl (original) +++ ofbiz/trunk/applications/product/webapp/catalog/main.ftl Sat Aug 16 11:34:57 2014 @@ -17,7 +17,7 @@ specific language governing permissions under the License. --> -<#if !sessionAttributes.userLogin?exists> +<#if !sessionAttributes.userLogin??> <div class='label'> ${uiLabelMap.ProductGeneralMessage}.</div> </#if> <br /> Modified: ofbiz/trunk/applications/product/webapp/catalog/price/EditProductPriceRules.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/price/EditProductPriceRules.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/catalog/price/EditProductPriceRules.ftl (original) +++ ofbiz/trunk/applications/product/webapp/catalog/price/EditProductPriceRules.ftl Sat Aug 16 11:34:57 2014 @@ -28,7 +28,7 @@ under the License. <td width="80%"><b>${uiLabelMap.ProductRuleNameFromDateThruDate}</b></td> <td width="10%"><b> </b></td> </tr> - <#if productPriceRule?exists> + <#if productPriceRule??> <#assign productPriceConds = productPriceRule.getRelated("ProductPriceCond", null, null, false)> <#assign productPriceActions = productPriceRule.getRelated("ProductPriceAction", null, null, false)> <tr valign="middle"> @@ -37,11 +37,11 @@ under the License. <form method="post" action="<@ofbizUrl>updateProductPriceRule</@ofbizUrl>" name="updateProductPriceRule"> <input type="hidden" name="productPriceRuleId" value="${productPriceRule.productPriceRuleId}" /> <input type="text" size="15" name="ruleName" value="${productPriceRule.ruleName}" /> - <input type="text" size="15" name="description" value="${productPriceRule.description?if_exists}" /> - <@htmlTemplate.renderDateTimeField name="fromDate" event="" action="" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" value="${productPriceRule.fromDate?if_exists}" size="25" maxlength="30" id="fromDate1" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/> - <@htmlTemplate.renderDateTimeField name="thruDate" event="" action="" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" value="${productPriceRule.thruDate?if_exists}" size="25" maxlength="30" id="thruDate1" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/> + <input type="text" size="15" name="description" value="${productPriceRule.description!}" /> + <@htmlTemplate.renderDateTimeField name="fromDate" event="" action="" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" value="${productPriceRule.fromDate!}" size="25" maxlength="30" id="fromDate1" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/> + <@htmlTemplate.renderDateTimeField name="thruDate" event="" action="" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" value="${productPriceRule.thruDate!}" size="25" maxlength="30" id="thruDate1" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/> - <#assign saleRule = productPriceRule.isSale?exists && productPriceRule.isSale == "Y"> + <#assign saleRule = productPriceRule.isSale?? && productPriceRule.isSale == "Y"> <div> <span class="label"><b>${uiLabelMap.ProductNotifySale}</b></span> <input type="radio" name="isSale" value="Y" <#if saleRule>checked="checked"</#if> />${uiLabelMap.CommonYes} @@ -83,8 +83,8 @@ under the License. <input type="hidden" name="productPriceCondSeqId" value="${productPriceCond.productPriceCondSeqId}"/> <select name="inputParamEnumId" size="1"> <#if productPriceCond.inputParamEnumId?has_content> - <#assign inputParamEnum = productPriceCond.getRelatedOne("InputParamEnumeration", true)?if_exists> - <option value="${productPriceCond.inputParamEnumId}"><#if inputParamEnum?exists>${inputParamEnum.get("description",locale)}<#else>[${productPriceCond.inputParamEnumId}]</#if></option> + <#assign inputParamEnum = productPriceCond.getRelatedOne("InputParamEnumeration", true)!> + <option value="${productPriceCond.inputParamEnumId}"><#if inputParamEnum??>${inputParamEnum.get("description",locale)}<#else>[${productPriceCond.inputParamEnumId}]</#if></option> <option value="${productPriceCond.inputParamEnumId}"> </option> <#else> <option value=""> </option> @@ -95,8 +95,8 @@ under the License. </select> <select name="operatorEnumId" size="1"> <#if productPriceCond.operatorEnumId?has_content> - <#assign operatorEnum = productPriceCond.getRelatedOne("OperatorEnumeration", true)?if_exists> - <option value="${productPriceCond.operatorEnumId}"><#if operatorEnum?exists>${operatorEnum.get("description",locale)}<#else>[${productPriceCond.operatorEnumId}]</#if></option> + <#assign operatorEnum = productPriceCond.getRelatedOne("OperatorEnumeration", true)!> + <option value="${productPriceCond.operatorEnumId}"><#if operatorEnum??>${operatorEnum.get("description",locale)}<#else>[${productPriceCond.operatorEnumId}]</#if></option> <option value="${productPriceCond.operatorEnumId}"> </option> <#else> <option value=""> </option> @@ -105,7 +105,7 @@ under the License. <option value="${condOperEnum.enumId}">${condOperEnum.get("description",locale)}<#--[${condOperEnum.enumId}]--></option> </#list> </select> - <input type="text" size="20" name="condValue" value="${productPriceCond.condValue?if_exists}" /> + <input type="text" size="20" name="condValue" value="${productPriceCond.condValue!}" /> <input type="submit" value="${uiLabelMap.CommonUpdate}" /> </form> </td> @@ -167,7 +167,7 @@ under the License. <select name="productPriceActionTypeId" size="1"> <#if productPriceAction.productPriceActionTypeId?has_content> <#assign productPriceActionType = productPriceAction.getRelatedOne("ProductPriceActionType", true)> - <option value="${productPriceAction.productPriceActionTypeId}"><#if productPriceActionType?exists>${productPriceActionType.get("description",locale)}<#else>[${productPriceAction.productPriceActionTypeId}]</#if></option> + <option value="${productPriceAction.productPriceActionTypeId}"><#if productPriceActionType??>${productPriceActionType.get("description",locale)}<#else>[${productPriceAction.productPriceActionTypeId}]</#if></option> <option value="${productPriceAction.productPriceActionTypeId}"> </option> <#else> <option value=""> </option> @@ -176,7 +176,7 @@ under the License. <option value="${productPriceActionType.productPriceActionTypeId}">${productPriceActionType.get("description",locale)}<#--[${productPriceActionType.productPriceActionTypeId}]--></option> </#list> </select> - <input type="text" size="8" name="amount" value="${productPriceAction.amount?if_exists}" /> + <input type="text" size="8" name="amount" value="${productPriceAction.amount!}" /> <input type="submit" value="${uiLabelMap.CommonUpdate}" /> </form> </td> Modified: ofbiz/trunk/applications/product/webapp/catalog/product/AddAdditionalImages.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/product/AddAdditionalImages.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/catalog/product/AddAdditionalImages.ftl (original) +++ ofbiz/trunk/applications/product/webapp/catalog/product/AddAdditionalImages.ftl Sat Aug 16 11:34:57 2014 @@ -17,13 +17,13 @@ specific language governing permissions under the License. --> <#if product?has_content> - <#assign productAdditionalImage1 = (Static["org.ofbiz.product.product.ProductContentWrapper"].getProductContentAsText(product, "ADDITIONAL_IMAGE_1", locale, dispatcher))?if_exists /> - <#assign productAdditionalImage2 = (Static["org.ofbiz.product.product.ProductContentWrapper"].getProductContentAsText(product, "ADDITIONAL_IMAGE_2", locale, dispatcher))?if_exists /> - <#assign productAdditionalImage3 = (Static["org.ofbiz.product.product.ProductContentWrapper"].getProductContentAsText(product, "ADDITIONAL_IMAGE_3", locale, dispatcher))?if_exists /> - <#assign productAdditionalImage4 = (Static["org.ofbiz.product.product.ProductContentWrapper"].getProductContentAsText(product, "ADDITIONAL_IMAGE_4", locale, dispatcher))?if_exists /> + <#assign productAdditionalImage1 = (Static["org.ofbiz.product.product.ProductContentWrapper"].getProductContentAsText(product, "ADDITIONAL_IMAGE_1", locale, dispatcher))! /> + <#assign productAdditionalImage2 = (Static["org.ofbiz.product.product.ProductContentWrapper"].getProductContentAsText(product, "ADDITIONAL_IMAGE_2", locale, dispatcher))! /> + <#assign productAdditionalImage3 = (Static["org.ofbiz.product.product.ProductContentWrapper"].getProductContentAsText(product, "ADDITIONAL_IMAGE_3", locale, dispatcher))! /> + <#assign productAdditionalImage4 = (Static["org.ofbiz.product.product.ProductContentWrapper"].getProductContentAsText(product, "ADDITIONAL_IMAGE_4", locale, dispatcher))! /> </#if> <form id="addAdditionalImagesForm" method="post" action="<@ofbizUrl>addAdditionalImagesForProduct</@ofbizUrl>" enctype="multipart/form-data"> - <input id="additionalImageProductId" type="hidden" name="productId" value="${productId?if_exists}" /> + <input id="additionalImageProductId" type="hidden" name="productId" value="${productId!}" /> <table> <tbody> <tr> Modified: ofbiz/trunk/applications/product/webapp/catalog/product/ApplyFeaturesFromCategory.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/product/ApplyFeaturesFromCategory.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/catalog/product/ApplyFeaturesFromCategory.ftl (original) +++ ofbiz/trunk/applications/product/webapp/catalog/product/ApplyFeaturesFromCategory.ftl Sat Aug 16 11:34:57 2014 @@ -17,10 +17,10 @@ specific language governing permissions under the License. --> -<#if curProductFeatureCategory?exists> -<a href="<@ofbizUrl>EditFeature?productFeatureCategoryId=${productFeatureCategoryId?if_exists}</@ofbizUrl>" class="buttontext">${uiLabelMap.ProductCreateNewFeature}</a> -<#elseif productFeatureGroup?exists> -<a href="<@ofbizUrl>EditFeatureGroupAppls?productFeatureGroupId=${productFeatureGroup.productFeatureGroupId?if_exists}</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonEdit} ${productFeatureGroup.description?if_exists}</a> +<#if curProductFeatureCategory??> +<a href="<@ofbizUrl>EditFeature?productFeatureCategoryId=${productFeatureCategoryId!}</@ofbizUrl>" class="buttontext">${uiLabelMap.ProductCreateNewFeature}</a> +<#elseif productFeatureGroup??> +<a href="<@ofbizUrl>EditFeatureGroupAppls?productFeatureGroupId=${productFeatureGroup.productFeatureGroupId!}</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonEdit} ${productFeatureGroup.description!}</a> </#if> <#if productId?has_content> <a href="<@ofbizUrl>EditProduct?productId=${productId}</@ofbizUrl>" class="buttontext">${uiLabelMap.ProductReturnToEditProduct}</a> @@ -28,7 +28,7 @@ under the License. </#if> <#if (listSize > 0)> -<#assign selectedFeatureApplTypeId = selFeatureApplTypeId?if_exists> +<#assign selectedFeatureApplTypeId = selFeatureApplTypeId!> <#if productId?has_content> <#assign productString = "&productId=" + productId> @@ -39,11 +39,11 @@ under the License. <span> <b> <#if (viewIndex > 0)> - <a href="<@ofbizUrl>ApplyFeaturesFromCategory?productFeatureCategoryId=${productFeatureCategoryId?if_exists}&productFeatureApplTypeId=${selectedFeatureApplTypeId?if_exists}&VIEW_SIZE=${viewSize}&VIEW_INDEX=${viewIndex-1}${productString?if_exists}</@ofbizUrl>" class="buttontext">[${uiLabelMap.CommonPrevious}]</a> | + <a href="<@ofbizUrl>ApplyFeaturesFromCategory?productFeatureCategoryId=${productFeatureCategoryId!}&productFeatureApplTypeId=${selectedFeatureApplTypeId!}&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>ApplyFeaturesFromCategory?productFeatureCategoryId=${productFeatureCategoryId?if_exists}&productFeatureApplTypeId=${selectedFeatureApplTypeId?if_exists}&VIEW_SIZE=${viewSize}&VIEW_INDEX=${viewIndex+1}${productString?if_exists}</@ofbizUrl>" class="buttontext">[${uiLabelMap.CommonNext}]</a> + | <a href="<@ofbizUrl>ApplyFeaturesFromCategory?productFeatureCategoryId=${productFeatureCategoryId!}&productFeatureApplTypeId=${selectedFeatureApplTypeId!}&VIEW_SIZE=${viewSize}&VIEW_INDEX=${viewIndex+1}${productString!}</@ofbizUrl>" class="buttontext">[${uiLabelMap.CommonNext}]</a> </#if> </b> </span> @@ -76,7 +76,7 @@ under the License. <input type="hidden" name="productFeatureId_o_${rowCount}" value="${productFeature.productFeatureId}" /> <td><a href="<@ofbizUrl>EditFeature?productFeatureId=${productFeature.productFeatureId}</@ofbizUrl>" class="buttontext">${productFeature.productFeatureId}</a></td> <td>${productFeature.description!}</td> - <td><#if curProductFeatureType?exists>${curProductFeatureType.description!}<#else> [${productFeature.productFeatureTypeId}]</#if></td> + <td><#if curProductFeatureType??>${curProductFeatureType.description!}<#else> [${productFeature.productFeatureTypeId}]</#if></td> <td> <select name="productFeatureApplTypeId_o_${rowCount}" size="1"> <#list productFeatureApplTypes as productFeatureApplType> @@ -90,8 +90,8 @@ under the License. <td> <@htmlTemplate.renderDateTimeField name="thruDate_o_${rowCount}" event="" action="" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" value="" size="25" maxlength="30" id="thruDate_o_${rowCount}" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/> </td> - <td><input type="text" size="6" name="amount_o_${rowCount}" value="${productFeature.defaultAmount?if_exists}" /></td> - <td><input type="text" size="5" name="sequenceNum_o_${rowCount}" value="${productFeature.defaultSequenceNum?if_exists}" /></td> + <td><input type="text" size="6" name="amount_o_${rowCount}" value="${productFeature.defaultAmount!}" /></td> + <td><input type="text" size="5" name="sequenceNum_o_${rowCount}" value="${productFeature.defaultSequenceNum!}" /></td> <td align="right"> <input type="checkbox" name="_rowSubmit_o_${rowCount}" value="Y" onclick="javascript:checkToggle(this, 'selectAllForm');highlightRow(this,'productFeatureId_tableRow_${rowCount}');" /> </td> @@ -106,6 +106,6 @@ under the License. </#list> <tr><td colspan="9" align="center"><input type="submit" value="${uiLabelMap.CommonApply}" /></td></tr> </#if> -<input type="hidden" name="_rowCount" value="${rowCount?if_exists}"/> +<input type="hidden" name="_rowCount" value="${rowCount!}"/> </form> </table> Modified: ofbiz/trunk/applications/product/webapp/catalog/product/EditProductAssoc.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/product/EditProductAssoc.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/catalog/product/EditProductAssoc.ftl (original) +++ ofbiz/trunk/applications/product/webapp/catalog/product/EditProductAssoc.ftl Sat Aug 16 11:34:57 2014 @@ -22,22 +22,22 @@ under the License. </div> <div class="screenlet-body"> <form action="<@ofbizUrl>UpdateProductAssoc</@ofbizUrl>" method="post" style="margin: 0;" name="editProductAssocForm"> - <input type="hidden" name="productId" value="${productId?if_exists}" /> + <input type="hidden" name="productId" value="${productId!}" /> - <#if !(productAssoc?exists)> - <#if productId?exists && productIdTo?exists && productAssocTypeId?exists && fromDate?exists> + <#if !(productAssoc??)> + <#if productId?? && productIdTo?? && productAssocTypeId?? && fromDate??> <div><b><#assign uiLabelWithVar=uiLabelMap.ProductAssociationNotFound?interpret><@uiLabelWithVar/></b></div> <input type="hidden" name="UPDATE_MODE" value="CREATE" /> <table cellspacing="0" class="basic-table"> <tr> <td align="right" class="label">${uiLabelMap.ProductProductId}</td> <td> </td> - <td><input type="text" name="PRODUCT_ID" size="20" maxlength="40" value="${productId?if_exists}" /></td> + <td><input type="text" name="PRODUCT_ID" size="20" maxlength="40" value="${productId!}" /></td> </tr> <tr> <td align="right" class="label">${uiLabelMap.ProductProductIdTo}</td> <td> </td> - <td><input type="text" name="PRODUCT_ID_TO" size="20" maxlength="40" value="${productIdTo?if_exists}" /></td> + <td><input type="text" name="PRODUCT_ID_TO" size="20" maxlength="40" value="${productIdTo!}" /></td> </tr> <tr> <td align="right" class="label">${uiLabelMap.ProductAssociationTypeId}</td> @@ -46,13 +46,13 @@ under the License. <select name="PRODUCT_ASSOC_TYPE_ID" size="1"> <#if productAssocTypeId?has_content> <#assign curAssocType = delegator.findOne("ProductAssocType", Static["org.ofbiz.base.util.UtilMisc"].toMap("productAssocTypeId", productAssocTypeId), false)> - <#if curAssocType?exists> - <option selected="selected" value="${(curAssocType.productAssocTypeId)?if_exists}">${(curAssocType.get("description",locale))?if_exists}</option> - <option value="${(curAssocType.productAssocTypeId)?if_exists}"></option> + <#if curAssocType??> + <option selected="selected" value="${(curAssocType.productAssocTypeId)!}">${(curAssocType.get("description",locale))!}</option> + <option value="${(curAssocType.productAssocTypeId)!}"></option> </#if> </#if> <#list assocTypes as assocType> - <option value="${(assocType.productAssocTypeId)?if_exists}">${(assocType.get("description",locale))?if_exists}</option> + <option value="${(assocType.productAssocTypeId)!}">${(assocType.get("description",locale))!}</option> </#list> </select> </td> @@ -62,7 +62,7 @@ under the License. <td> </td> <td> <div> - <@htmlTemplate.renderDateTimeField name="FROM_DATE" event="" action="" value="${fromDate?if_exists}" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" size="25" maxlength="30" id="fromDate1" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/> + <@htmlTemplate.renderDateTimeField name="FROM_DATE" event="" action="" value="${fromDate!}" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" size="25" maxlength="30" id="fromDate1" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/> ${uiLabelMap.CommonSetNowEmpty} </div> </td> @@ -73,7 +73,7 @@ under the License. <tr> <td align="right" class="label">${uiLabelMap.ProductProductId}</td> <td> </td> - <td><input type="text" name="PRODUCT_ID" size="20" maxlength="40" value="${productId?if_exists}" /></td> + <td><input type="text" name="PRODUCT_ID" size="20" maxlength="40" value="${productId!}" /></td> </tr> <tr> <td align="right" class="label">${uiLabelMap.ProductProductIdTo}</td> @@ -89,7 +89,7 @@ under the License. <select name="PRODUCT_ASSOC_TYPE_ID" size="1"> <!-- <option value=""> </option> --> <#list assocTypes as assocType> - <option value="${(assocType.productAssocTypeId)?if_exists}">${(assocType.get("description",locale))?if_exists}</option> + <option value="${(assocType.productAssocTypeId)!}">${(assocType.get("description",locale))!}</option> </#list> </select> </td> @@ -99,8 +99,8 @@ under the License. <td> </td> <td> <div> - ${fromDate?if_exists} - <@htmlTemplate.renderDateTimeField name="FROM_DATE" event="" action="" value="${fromDate?if_exists}" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" size="25" maxlength="30" id="fromDate2" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/> + ${fromDate!} + <@htmlTemplate.renderDateTimeField name="FROM_DATE" event="" action="" value="${fromDate!}" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" size="25" maxlength="30" id="fromDate2" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/> ${uiLabelMap.CommonSetNowEmpty} </div> </td> @@ -110,30 +110,30 @@ under the License. <#assign isCreate = false> <#assign curProductAssocType = productAssoc.getRelatedOne("ProductAssocType", true)> <input type="hidden" name="UPDATE_MODE" value="UPDATE" /> - <input type="hidden" name="PRODUCT_ID" value="${productId?if_exists}" /> - <input type="hidden" name="PRODUCT_ID_TO" value="${productIdTo?if_exists}" /> - <input type="hidden" name="PRODUCT_ASSOC_TYPE_ID" value="${productAssocTypeId?if_exists}" /> - <input type="hidden" name="FROM_DATE" value="${fromDate?if_exists}" /> + <input type="hidden" name="PRODUCT_ID" value="${productId!}" /> + <input type="hidden" name="PRODUCT_ID_TO" value="${productIdTo!}" /> + <input type="hidden" name="PRODUCT_ASSOC_TYPE_ID" value="${productAssocTypeId!}" /> + <input type="hidden" name="FROM_DATE" value="${fromDate!}" /> <table cellspacing="0" class="basic-table"> <tr> <td align="right" class="label">${uiLabelMap.ProductProductId}</td> <td> </td> - <td><b>${productId?if_exists}</b> ${uiLabelMap.ProductRecreateAssociation}</td> + <td><b>${productId!}</b> ${uiLabelMap.ProductRecreateAssociation}</td> </tr> <tr> <td align="right" class="label">${uiLabelMap.ProductProductIdTo}</td> <td> </td> - <td><b>${productIdTo?if_exists}</b> ${uiLabelMap.ProductRecreateAssociation}</td> + <td><b>${productIdTo!}</b> ${uiLabelMap.ProductRecreateAssociation}</td> </tr> <tr> <td align="right" class="label">${uiLabelMap.ProductAssociationType}</td> <td> </td> - <td><b><#if curProductAssocType?exists>${(curProductAssocType.get("description",locale))?if_exists}<#else> ${productAssocTypeId?if_exists}</#if></b> ${uiLabelMap.ProductRecreateAssociation}</td> + <td><b><#if curProductAssocType??>${(curProductAssocType.get("description",locale))!}<#else> ${productAssocTypeId!}</#if></b> ${uiLabelMap.ProductRecreateAssociation}</td> </tr> <tr> <td align="right" class="label">${uiLabelMap.CommonFromDate}</td> <td> </td> - <td><b>${fromDate?if_exists}</b> ${uiLabelMap.ProductRecreateAssociation}</td> + <td><b>${fromDate!}</b> ${uiLabelMap.ProductRecreateAssociation}</td> </tr> </#if> <tr> @@ -142,9 +142,9 @@ under the License. <td width="74%"> <div> <#if useValues> - <#assign value = productAssoc.thruDate?if_exists> + <#assign value = productAssoc.thruDate!> <#else> - <#assign value = (request.getParameter("THRU_DATE"))?if_exists> + <#assign value = (request.getParameter("THRU_DATE"))!> </#if> <@htmlTemplate.renderDateTimeField name="THRU_DATE" event="" action="" value="${value}" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" size="25" maxlength="30" id="thruDate1" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/> </div> @@ -154,23 +154,23 @@ under the License. <tr> <td width="26%" align="right" class="label">${uiLabelMap.ProductSequenceNum}</td> <td> </td> - <td width="74%"><input type="text" name="SEQUENCE_NUM" <#if useValues>value="${(productAssoc.sequenceNum)?if_exists}"<#else>value="${(request.getParameter("SEQUENCE_NUM"))?if_exists}"</#if> size="5" maxlength="10" /></td> + <td width="74%"><input type="text" name="SEQUENCE_NUM" <#if useValues>value="${(productAssoc.sequenceNum)!}"<#else>value="${(request.getParameter("SEQUENCE_NUM"))!}"</#if> size="5" maxlength="10" /></td> </tr> <tr> <td width="26%" align="right" class="label">${uiLabelMap.ProductReason}</td> <td> </td> - <td width="74%"><input type="text" name="REASON" <#if useValues>value="${(productAssoc.reason)?if_exists}"<#else>value="${(request.getParameter("REASON"))?if_exists}"</#if> size="60" maxlength="255" /></td> + <td width="74%"><input type="text" name="REASON" <#if useValues>value="${(productAssoc.reason)!}"<#else>value="${(request.getParameter("REASON"))!}"</#if> size="60" maxlength="255" /></td> </tr> <tr> <td width="26%" align="right" class="label">${uiLabelMap.ProductInstruction}</td> <td> </td> - <td width="74%"><input type="text" name="INSTRUCTION" <#if useValues>value="${(productAssoc.instruction)?if_exists}"<#else>value="${(request.getParameter("INSTRUCTION"))?if_exists}"</#if> size="60" maxlength="255" /></td> + <td width="74%"><input type="text" name="INSTRUCTION" <#if useValues>value="${(productAssoc.instruction)!}"<#else>value="${(request.getParameter("INSTRUCTION"))!}"</#if> size="60" maxlength="255" /></td> </tr> <tr> <td width="26%" align="right" class="label">${uiLabelMap.ProductQuantity}</td> <td> </td> - <td width="74%"><input type="text" name="QUANTITY" <#if useValues>value="${(productAssoc.quantity)?if_exists}"<#else>value="${(request.getParameter("QUANTITY"))?if_exists}"</#if> size="10" maxlength="15" /></td> + <td width="74%"><input type="text" name="QUANTITY" <#if useValues>value="${(productAssoc.quantity)!}"<#else>value="${(request.getParameter("QUANTITY"))!}"</#if> size="10" maxlength="15" /></td> </tr> <tr> @@ -181,7 +181,7 @@ under the License. </form> </div> </div> -<#if productId?exists && product?exists> +<#if productId?? && product??> <div class="screenlet"> <div class="screenlet-title-bar"> <h3>${uiLabelMap.ProductAssociationsFromProduct}</h3> @@ -204,21 +204,21 @@ under the License. <#assign listToProduct = assocFromProduct.getRelatedOne("AssocProduct", true)> <#assign curProductAssocType = assocFromProduct.getRelatedOne("ProductAssocType", true)> <tr valign="middle"<#if rowClass == "1"> class="alternate-row"</#if>> - <td><a href="<@ofbizUrl>EditProduct?productId=${(assocFromProduct.productIdTo)?if_exists}</@ofbizUrl>" class="buttontext">${(assocFromProduct.productIdTo)?if_exists}</a></td> - <td><#if listToProduct?exists><a href="<@ofbizUrl>EditProduct?productId=${(assocFromProduct.productIdTo)?if_exists}</@ofbizUrl>" class="buttontext">${(listToProduct.internalName)?if_exists}</a></#if> </td> - <td <#if (assocFromProduct.getTimestamp("fromDate"))?exists && nowDate.before(assocFromProduct.getTimestamp("fromDate"))> style="color: red;"</#if>> - ${(assocFromProduct.fromDate)?if_exists} </td> - <td <#if (assocFromProduct.getTimestamp("thruDate"))?exists && nowDate.after(assocFromProduct.getTimestamp("thruDate"))> style="color: red;"</#if>> - ${(assocFromProduct.thruDate)?if_exists} </td> - <td> ${(assocFromProduct.sequenceNum)?if_exists}</td> - <td> ${(assocFromProduct.quantity)?if_exists}</td> - <td><#if curProductAssocType?exists> ${(curProductAssocType.get("description",locale))?if_exists}<#else>${(assocFromProduct.productAssocTypeId)?if_exists}</#if></td> + <td><a href="<@ofbizUrl>EditProduct?productId=${(assocFromProduct.productIdTo)!}</@ofbizUrl>" class="buttontext">${(assocFromProduct.productIdTo)!}</a></td> + <td><#if listToProduct??><a href="<@ofbizUrl>EditProduct?productId=${(assocFromProduct.productIdTo)!}</@ofbizUrl>" class="buttontext">${(listToProduct.internalName)!}</a></#if> </td> + <td <#if (assocFromProduct.getTimestamp("fromDate"))?? && nowDate.before(assocFromProduct.getTimestamp("fromDate"))> style="color: red;"</#if>> + ${(assocFromProduct.fromDate)!} </td> + <td <#if (assocFromProduct.getTimestamp("thruDate"))?? && nowDate.after(assocFromProduct.getTimestamp("thruDate"))> style="color: red;"</#if>> + ${(assocFromProduct.thruDate)!} </td> + <td> ${(assocFromProduct.sequenceNum)!}</td> + <td> ${(assocFromProduct.quantity)!}</td> + <td><#if curProductAssocType??> ${(curProductAssocType.get("description",locale))!}<#else>${(assocFromProduct.productAssocTypeId)!}</#if></td> <td> - <a href="<@ofbizUrl>UpdateProductAssoc?UPDATE_MODE=DELETE&productId=${productId}&PRODUCT_ID=${productId}&PRODUCT_ID_TO=${(assocFromProduct.productIdTo)?if_exists}&PRODUCT_ASSOC_TYPE_ID=${(assocFromProduct.productAssocTypeId)?if_exists}&FROM_DATE=${(assocFromProduct.fromDate)?if_exists}&useValues=true</@ofbizUrl>" class="buttontext"> + <a href="<@ofbizUrl>UpdateProductAssoc?UPDATE_MODE=DELETE&productId=${productId}&PRODUCT_ID=${productId}&PRODUCT_ID_TO=${(assocFromProduct.productIdTo)!}&PRODUCT_ASSOC_TYPE_ID=${(assocFromProduct.productAssocTypeId)!}&FROM_DATE=${(assocFromProduct.fromDate)!}&useValues=true</@ofbizUrl>" class="buttontext"> ${uiLabelMap.CommonDelete}</a> </td> <td> - <a href="<@ofbizUrl>EditProductAssoc?productId=${productId}&PRODUCT_ID=${productId}&PRODUCT_ID_TO=${(assocFromProduct.productIdTo)?if_exists}&PRODUCT_ASSOC_TYPE_ID=${(assocFromProduct.productAssocTypeId)?if_exists}&FROM_DATE=${(assocFromProduct.fromDate)?if_exists}&useValues=true</@ofbizUrl>" class="buttontext"> + <a href="<@ofbizUrl>EditProductAssoc?productId=${productId}&PRODUCT_ID=${productId}&PRODUCT_ID_TO=${(assocFromProduct.productIdTo)!}&PRODUCT_ASSOC_TYPE_ID=${(assocFromProduct.productAssocTypeId)!}&FROM_DATE=${(assocFromProduct.fromDate)!}&useValues=true</@ofbizUrl>" class="buttontext"> ${uiLabelMap.CommonEdit}</a> </td> </tr> @@ -251,13 +251,13 @@ under the License. <#assign listToProduct = assocToProduct.getRelatedOne("MainProduct", true)> <#assign curProductAssocType = assocToProduct.getRelatedOne("ProductAssocType", true)> <tr valign="middle"<#if rowClass == "1"> class="alternate-row"</#if>> - <td><a href="<@ofbizUrl>EditProduct?productId=${(assocToProduct.productId)?if_exists}</@ofbizUrl>" class="buttontext">${(assocToProduct.productId)?if_exists}</a></td> - <td><#if listToProduct?exists><a href="<@ofbizUrl>EditProduct?productId=${(assocToProduct.productId)?if_exists}</@ofbizUrl>" class="buttontext">${(listToProduct.internalName)?if_exists}</a></#if></td> - <td>${(assocToProduct.getTimestamp("fromDate"))?if_exists} </td> - <td>${(assocToProduct.getTimestamp("thruDate"))?if_exists} </td> - <td><#if curProductAssocType?exists> ${(curProductAssocType.get("description",locale))?if_exists}<#else> ${(assocToProduct.productAssocTypeId)?if_exists}</#if></td> + <td><a href="<@ofbizUrl>EditProduct?productId=${(assocToProduct.productId)!}</@ofbizUrl>" class="buttontext">${(assocToProduct.productId)!}</a></td> + <td><#if listToProduct??><a href="<@ofbizUrl>EditProduct?productId=${(assocToProduct.productId)!}</@ofbizUrl>" class="buttontext">${(listToProduct.internalName)!}</a></#if></td> + <td>${(assocToProduct.getTimestamp("fromDate"))!} </td> + <td>${(assocToProduct.getTimestamp("thruDate"))!} </td> + <td><#if curProductAssocType??> ${(curProductAssocType.get("description",locale))!}<#else> ${(assocToProduct.productAssocTypeId)!}</#if></td> <td> - <a href="<@ofbizUrl>UpdateProductAssoc?UPDATE_MODE=DELETE&productId=${(assocToProduct.productIdTo)?if_exists}&PRODUCT_ID=${(assocToProduct.productId)?if_exists}&PRODUCT_ID_TO=${(assocToProduct.productIdTo)?if_exists}&PRODUCT_ASSOC_TYPE_ID=${(assocToProduct.productAssocTypeId)?if_exists}&FROM_DATE=${(assocToProduct.fromDate)?if_exists}&useValues=true</@ofbizUrl>" class="buttontext"> + <a href="<@ofbizUrl>UpdateProductAssoc?UPDATE_MODE=DELETE&productId=${(assocToProduct.productIdTo)!}&PRODUCT_ID=${(assocToProduct.productId)!}&PRODUCT_ID_TO=${(assocToProduct.productIdTo)!}&PRODUCT_ASSOC_TYPE_ID=${(assocToProduct.productAssocTypeId)!}&FROM_DATE=${(assocToProduct.fromDate)!}&useValues=true</@ofbizUrl>" class="buttontext"> ${uiLabelMap.CommonDelete}</a> </td> </tr> Modified: ofbiz/trunk/applications/product/webapp/catalog/product/EditProductContent.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/product/EditProductContent.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/catalog/product/EditProductContent.ftl (original) +++ ofbiz/trunk/applications/product/webapp/catalog/product/EditProductContent.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 product?exists> +<#if product??> <script language="JavaScript" type="text/javascript"> function insertNowTimestamp(field) { eval('document.productForm.' + field + '.value="${nowTimestampString}";'); @@ -31,50 +31,50 @@ under the License. <#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> <form action="<@ofbizUrl>updateProductContent</@ofbizUrl>" method="post" style="margin: 0;" name="productForm"> - <input type="hidden" name="productId" value="${productId?if_exists}"/> + <input type="hidden" name="productId" value="${productId!}"/> <table cellspacing="0" class="basic-table"> <tr> <td width="20%" align="right" valign="top"><b>${uiLabelMap.ProductProductName}</b></td> <td> </td> <td width="80%" colspan="4" valign="top"> - <input type="text" name="productName" value="${(product.productName?html)?if_exists}" size="30" maxlength="60"/> + <input type="text" name="productName" value="${(product.productName?html)!}" size="30" maxlength="60"/> </td> </tr> <tr> <td width="20%" align="right" valign="top"><b>${uiLabelMap.ProductProductDescription}</b></td> <td> </td> <td width="80%" colspan="4" valign="top"> - <textarea name="description" cols="60" rows="2">${(product.description)?if_exists}</textarea> + <textarea name="description" cols="60" rows="2">${(product.description)!}</textarea> </td> </tr> <tr> <td width="20%" align="right" valign="top"><b>${uiLabelMap.ProductLongDescription}</b></td> <td> </td> <td width="80%" colspan="4" valign="top"> - <textarea class="dojo-ResizableTextArea" name="longDescription" cols="60" rows="7">${(product.longDescription)?if_exists}</textarea> + <textarea class="dojo-ResizableTextArea" name="longDescription" cols="60" rows="7">${(product.longDescription)!}</textarea> </td> </tr> <tr> <td width="20%" align="right" valign="top"><b>${uiLabelMap.ProductDetailScreen}</b></td> <td> </td> <td width="80%" colspan="4" valign="top"> - <input type="text" name="detailScreen" value="${(product.detailScreen)?if_exists}" size="60" maxlength="250"/> + <input type="text" name="detailScreen" value="${(product.detailScreen)!}" size="60" maxlength="250"/> <br /><span class="tooltip">${uiLabelMap.ProductIfNotSpecifiedDefaultsIsProductdetail} "productdetail", ${uiLabelMap.ProductDetailScreenMessage}: "component://ecommerce/widget/CatalogScreens.xml#productdetail"</span> </td> </tr> <tr> <td width="20%" align="right" valign="top"> <div><b>${uiLabelMap.ProductSmallImage}</b></div> - <#if (product.smallImageUrl)?exists> - <a href="<@ofbizContentUrl>${(product.smallImageUrl)?if_exists}</@ofbizContentUrl>" target="_blank"><img alt="Small Image" src="<@ofbizContentUrl>${(product.smallImageUrl)?if_exists}</@ofbizContentUrl>" class="cssImgSmall"/></a> + <#if (product.smallImageUrl)??> + <a href="<@ofbizContentUrl>${(product.smallImageUrl)!}</@ofbizContentUrl>" target="_blank"><img alt="Small Image" src="<@ofbizContentUrl>${(product.smallImageUrl)!}</@ofbizContentUrl>" class="cssImgSmall"/></a> </#if> </td> <td> </td> @@ -93,7 +93,7 @@ under the License. <tr> <td width="20%" align="right" valign="top"> <div><b>${uiLabelMap.ProductMediumImage}</b></div> - <#if (product.mediumImageUrl)?exists> + <#if (product.mediumImageUrl)??> <a href="<@ofbizContentUrl>${product.mediumImageUrl}</@ofbizContentUrl>" target="_blank"><img alt="Medium Image" src="<@ofbizContentUrl>${product.mediumImageUrl}</@ofbizContentUrl>" class="cssImgSmall"/></a> </#if> </td> @@ -113,7 +113,7 @@ under the License. <tr> <td width="20%" align="right" valign="top"> <div><b>${uiLabelMap.ProductLargeImage}</b></div> - <#if (product.largeImageUrl)?exists> + <#if (product.largeImageUrl)??> <a href="<@ofbizContentUrl>${product.largeImageUrl}</@ofbizContentUrl>" target="_blank"><img alt="Large Image" src="<@ofbizContentUrl>${product.largeImageUrl}</@ofbizContentUrl>" class="cssImgSmall"/></a> </#if> </td> @@ -133,7 +133,7 @@ under the License. <tr> <td width="20%" align="right" valign="top"> <div><b>${uiLabelMap.ProductDetailImage}</b></div> - <#if (product.detailImageUrl)?exists> + <#if (product.detailImageUrl)??> <a href="<@ofbizContentUrl>${product.detailImageUrl}</@ofbizContentUrl>" target="_blank"><img alt="Detail Image" src="<@ofbizContentUrl>${product.detailImageUrl}</@ofbizContentUrl>" class="cssImgSmall"/></a> </#if> </td> @@ -153,7 +153,7 @@ under the License. <tr> <td width="20%" align="right" valign="top"> <div><b>${uiLabelMap.ProductOriginalImage}</b></div> - <#if (product.originalImageUrl)?exists> + <#if (product.originalImageUrl)??> <a href="<@ofbizContentUrl>${product.originalImageUrl}</@ofbizContentUrl>" target="_blank"><img alt="Original Image" src="<@ofbizContentUrl>${product.originalImageUrl}</@ofbizContentUrl>" class="cssImgSmall"/></a> </#if> </td> Modified: ofbiz/trunk/applications/product/webapp/catalog/product/EditProductFeatures.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/product/EditProductFeatures.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/catalog/product/EditProductFeatures.ftl (original) +++ ofbiz/trunk/applications/product/webapp/catalog/product/EditProductFeatures.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 productId?exists> +<#if productId??> <div class="screenlet"> <div class="screenlet-title-bar"> <h3>${uiLabelMap.PageTitleEditProductFeatures}</h3> @@ -39,42 +39,42 @@ under the License. </tr> <#assign rowClass = "2"> <#list productFeatureAndAppls as productFeatureAndAppl> - <#if productFeatureAndAppl.uomId?exists> + <#if productFeatureAndAppl.uomId??> <#assign curProductFeatureUom = delegator.findOne("Uom",{"uomId",productFeatureAndAppl.uomId}, true)> </#if> <#assign curProductFeatureType = productFeatureAndAppl.getRelatedOne("ProductFeatureType", true)> <#assign curProductFeatureApplType = productFeatureAndAppl.getRelatedOne("ProductFeatureApplType", true)> - <#assign curProductFeatureCategory = (productFeatureAndAppl.getRelatedOne("ProductFeatureCategory", true)?if_exists)> + <#assign curProductFeatureCategory = (productFeatureAndAppl.getRelatedOne("ProductFeatureCategory", true)!)> <tr id="productFeatureId_tableRow_${productFeatureAndAppl_index}" valign="middle"<#if rowClass == "1"> class="alternate-row"</#if>> <td> - <input type="hidden" name="productId_o_${productFeatureAndAppl_index}" value="${(productFeatureAndAppl.productId)?if_exists}" /> - <input type="hidden" name="productFeatureId_o_${productFeatureAndAppl_index}" value="${(productFeatureAndAppl.productFeatureId)?if_exists}" /> - <input type="hidden" name="fromDate_o_${productFeatureAndAppl_index}" value="${(productFeatureAndAppl.fromDate)?if_exists}" /> - <a href="<@ofbizUrl>EditFeature?productFeatureId=${(productFeatureAndAppl.productFeatureId)?if_exists}</@ofbizUrl>" class="buttontext"> - ${(productFeatureAndAppl.productFeatureId)?if_exists}</a></td> - <td>${(productFeatureAndAppl.get("description",locale))?if_exists}</td> - <td><#if productFeatureAndAppl.uomId?exists>${curProductFeatureUom.abbreviation!}</#if></td> - <td>${(curProductFeatureType.get("description",locale))?default((productFeatureAndAppl.productFeatureTypeId)?if_exists)}</td> - <td><a href="<@ofbizUrl>EditFeatureCategoryFeatures?productFeatureCategoryId=${(productFeatureAndAppl.productFeatureCategoryId)?if_exists}&productId=${(productFeatureAndAppl.productId)?if_exists}</@ofbizUrl>" class="buttontext"> - ${(curProductFeatureCategory.description)?if_exists} - [${(productFeatureAndAppl.productFeatureCategoryId)?if_exists}]</a></td> + <input type="hidden" name="productId_o_${productFeatureAndAppl_index}" value="${(productFeatureAndAppl.productId)!}" /> + <input type="hidden" name="productFeatureId_o_${productFeatureAndAppl_index}" value="${(productFeatureAndAppl.productFeatureId)!}" /> + <input type="hidden" name="fromDate_o_${productFeatureAndAppl_index}" value="${(productFeatureAndAppl.fromDate)!}" /> + <a href="<@ofbizUrl>EditFeature?productFeatureId=${(productFeatureAndAppl.productFeatureId)!}</@ofbizUrl>" class="buttontext"> + ${(productFeatureAndAppl.productFeatureId)!}</a></td> + <td>${(productFeatureAndAppl.get("description",locale))!}</td> + <td><#if productFeatureAndAppl.uomId??>${curProductFeatureUom.abbreviation!}</#if></td> + <td>${(curProductFeatureType.get("description",locale))?default((productFeatureAndAppl.productFeatureTypeId)!)}</td> + <td><a href="<@ofbizUrl>EditFeatureCategoryFeatures?productFeatureCategoryId=${(productFeatureAndAppl.productFeatureCategoryId)!}&productId=${(productFeatureAndAppl.productId)!}</@ofbizUrl>" class="buttontext"> + ${(curProductFeatureCategory.description)!} + [${(productFeatureAndAppl.productFeatureCategoryId)!}]</a></td> <#assign hasntStarted = false> - <#if (productFeatureAndAppl.getTimestamp("fromDate"))?exists && Static["org.ofbiz.base.util.UtilDateTime"].nowTimestamp().before(productFeatureAndAppl.getTimestamp("fromDate"))> <#assign hasntStarted = true></#if> - <td <#if hasntStarted> style='color: red;'</#if>>${(productFeatureAndAppl.fromDate)?if_exists}</td> + <#if (productFeatureAndAppl.getTimestamp("fromDate"))?? && Static["org.ofbiz.base.util.UtilDateTime"].nowTimestamp().before(productFeatureAndAppl.getTimestamp("fromDate"))> <#assign hasntStarted = true></#if> + <td <#if hasntStarted> style='color: red;'</#if>>${(productFeatureAndAppl.fromDate)!}</td> <td> <#assign hasExpired = false> - <#if (productFeatureAndAppl.getTimestamp("thruDate"))?exists && Static["org.ofbiz.base.util.UtilDateTime"].nowTimestamp().after(productFeatureAndAppl.getTimestamp("thruDate"))> <#assign hasExpired = true></#if> + <#if (productFeatureAndAppl.getTimestamp("thruDate"))?? && Static["org.ofbiz.base.util.UtilDateTime"].nowTimestamp().after(productFeatureAndAppl.getTimestamp("thruDate"))> <#assign hasExpired = true></#if> <#if hasExpired><#assign class="alert"></#if> - <@htmlTemplate.renderDateTimeField name="thruDate_o_${productFeatureAndAppl_index}" event="" action="" className="${class!''}" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" value="${(productFeatureAndAppl.thruDate)?if_exists}" size="25" maxlength="30" id="thruDate_o_${productFeatureAndAppl_index}" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/> - <input type="text" size='6' name='amount_o_${productFeatureAndAppl_index}' value='${(productFeatureAndAppl.amount)?if_exists}' /> - <input type="text" size='5' name='sequenceNum_o_${productFeatureAndAppl_index}' value='${(productFeatureAndAppl.sequenceNum)?if_exists}' /> + <@htmlTemplate.renderDateTimeField name="thruDate_o_${productFeatureAndAppl_index}" event="" action="" className="${class!''}" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" value="${(productFeatureAndAppl.thruDate)!}" size="25" maxlength="30" id="thruDate_o_${productFeatureAndAppl_index}" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/> + <input type="text" size='6' name='amount_o_${productFeatureAndAppl_index}' value='${(productFeatureAndAppl.amount)!}' /> + <input type="text" size='5' name='sequenceNum_o_${productFeatureAndAppl_index}' value='${(productFeatureAndAppl.sequenceNum)!}' /> <select name='productFeatureApplTypeId_o_${productFeatureAndAppl_index}' size="1"> - <#if (productFeatureAndAppl.productFeatureApplTypeId)?exists> - <option value='${(productFeatureAndAppl.productFeatureApplTypeId)?if_exists}'><#if curProductFeatureApplType?exists> ${(curProductFeatureApplType.get("description",locale))?if_exists} <#else> [${productFeatureAndAppl.productFeatureApplTypeId}]</#if></option> + <#if (productFeatureAndAppl.productFeatureApplTypeId)??> + <option value='${(productFeatureAndAppl.productFeatureApplTypeId)!}'><#if curProductFeatureApplType??> ${(curProductFeatureApplType.get("description",locale))!} <#else> [${productFeatureAndAppl.productFeatureApplTypeId}]</#if></option> <option value='${productFeatureAndAppl.productFeatureApplTypeId}'> </option> </#if> <#list productFeatureApplTypes as productFeatureApplType> - <option value='${(productFeatureApplType.productFeatureApplTypeId)?if_exists}'>${(productFeatureApplType.get("description",locale))?if_exists} </option> + <option value='${(productFeatureApplType.productFeatureApplTypeId)!}'>${(productFeatureApplType.get("description",locale))!} </option> </#list> </select> </td> @@ -103,9 +103,9 @@ under the License. </form> <#list productFeatureAndAppls as productFeatureAndAppl> <form name= "RemoveFeatureFromProduct_o_${productFeatureAndAppl_index}" method= "post" action= "<@ofbizUrl>RemoveFeatureFromProduct</@ofbizUrl>"> - <input type= "hidden" name= "productId" value= "${(productFeatureAndAppl.productId)?if_exists}"/> - <input type= "hidden" name= "productFeatureId" value= "${(productFeatureAndAppl.productFeatureId)?if_exists}"/> - <input type= "hidden" name= "fromDate" value= "${(productFeatureAndAppl.fromDate)?if_exists}"/> + <input type= "hidden" name= "productId" value= "${(productFeatureAndAppl.productId)!}"/> + <input type= "hidden" name= "productFeatureId" value= "${(productFeatureAndAppl.productFeatureId)!}"/> + <input type= "hidden" name= "fromDate" value= "${(productFeatureAndAppl.fromDate)!}"/> </form> </#list> </div> @@ -120,22 +120,22 @@ under the License. <select name='productFeatureCategoryId' size="1"> <option value='' selected="selected">${uiLabelMap.ProductChooseFeatureCategory}</option> <#list productFeatureCategories as productFeatureCategory> - <option value='${(productFeatureCategory.productFeatureCategoryId)?if_exists}'>${(productFeatureCategory.description)?if_exists} [${(productFeatureCategory.productFeatureCategoryId)?if_exists}]</option> + <option value='${(productFeatureCategory.productFeatureCategoryId)!}'>${(productFeatureCategory.description)!} [${(productFeatureCategory.productFeatureCategoryId)!}]</option> </#list> </select> <select name='productFeatureGroupId' size="1"> <option value='' selected="selected">${uiLabelMap.ProductChooseFeatureGroup}</option> <#list productFeatureGroups as productFeatureGroup> - <option value='${(productFeatureGroup.productFeatureGroupId)?if_exists}'>${(productFeatureGroup.description)?if_exists} [${(productFeatureGroup.productFeatureGroupId)?if_exists}]</option> + <option value='${(productFeatureGroup.productFeatureGroupId)!}'>${(productFeatureGroup.description)!} [${(productFeatureGroup.productFeatureGroupId)!}]</option> </#list> </select> <span class='label'>${uiLabelMap.ProductFeatureApplicationType}: </span> <select name='productFeatureApplTypeId' size="1"> <#list productFeatureApplTypes as productFeatureApplType> - <option value='${(productFeatureApplType.productFeatureApplTypeId)?if_exists}' - <#if (productFeatureApplType.productFeatureApplTypeId?exists && product?exists && product.isVirtual == 'Y' && productFeatureApplType.productFeatureApplTypeId =="SELECTABLE_FEATURE")>selected="selected"</#if> - <#if (productFeatureApplType.productFeatureApplTypeId?exists && product?exists && product.isVirtual == 'N' && productFeatureApplType.productFeatureApplTypeId?if_exists =="STANDARD_FEATURE")>selected="selected"</#if> - >${(productFeatureApplType.get("description",locale))?if_exists} </option> + <option value='${(productFeatureApplType.productFeatureApplTypeId)!}' + <#if (productFeatureApplType.productFeatureApplTypeId?? && product?? && product.isVirtual == 'Y' && productFeatureApplType.productFeatureApplTypeId =="SELECTABLE_FEATURE")>selected="selected"</#if> + <#if (productFeatureApplType.productFeatureApplTypeId?? && product?? && product.isVirtual == 'N' && productFeatureApplType.productFeatureApplTypeId! =="STANDARD_FEATURE")>selected="selected"</#if> + >${(productFeatureApplType.get("description",locale))!} </option> </#list> </select> <input type="submit" value='${uiLabelMap.CommonAdd}'/> @@ -152,7 +152,7 @@ under the License. <span class='label'>${uiLabelMap.ProductFeatureType}: </span> <select name='productFeatureTypeId' size="1"> <#list productFeatureTypes as productFeatureType> - <option value='${(productFeatureType.productFeatureTypeId)?if_exists}'>${(productFeatureType.get("description",locale))?if_exists} </option> + <option value='${(productFeatureType.productFeatureTypeId)!}'>${(productFeatureType.get("description",locale))!} </option> </#list> </select> <span class='label'>${uiLabelMap.CommonIdCode}: </span><input type="text" size='10' name='idCode' value=''/> @@ -160,10 +160,10 @@ under the License. <span class='label'>${uiLabelMap.ProductFeatureApplicationType}: </span> <select name='productFeatureApplTypeId' size="1"> <#list productFeatureApplTypes as productFeatureApplType> - <option value='${(productFeatureApplType.productFeatureApplTypeId)?if_exists}' - <#if (productFeatureApplType.productFeatureApplTypeId?exists && product?exists && product.isVirtual == 'Y' && productFeatureApplType.productFeatureApplTypeId =="SELECTABLE_FEATURE")>selected="selected"</#if> - <#if (productFeatureApplType.productFeatureApplTypeId?exists && product?exists && product.isVirtual == 'N' && productFeatureApplType.productFeatureApplTypeId =="STANDARD_FEATURE")>selected="selected"</#if> - >${(productFeatureApplType.get("description",locale))?if_exists} </option> + <option value='${(productFeatureApplType.productFeatureApplTypeId)!}' + <#if (productFeatureApplType.productFeatureApplTypeId?? && product?? && product.isVirtual == 'Y' && productFeatureApplType.productFeatureApplTypeId =="SELECTABLE_FEATURE")>selected="selected"</#if> + <#if (productFeatureApplType.productFeatureApplTypeId?? && product?? && product.isVirtual == 'N' && productFeatureApplType.productFeatureApplTypeId =="STANDARD_FEATURE")>selected="selected"</#if> + >${(productFeatureApplType.get("description",locale))!} </option> </#list> </select> <br /> @@ -190,10 +190,10 @@ under the License. <span class="label">${uiLabelMap.ProductFeatureApplicationType}: </span> <select name="productFeatureApplTypeId" size="1"> <#list productFeatureApplTypes as productFeatureApplType> - <option value='${(productFeatureApplType.productFeatureApplTypeId)?if_exists}' - <#if (productFeatureApplType.productFeatureApplTypeId?exists && product?exists && product.isVirtual == 'Y' && productFeatureApplType.productFeatureApplTypeId =="SELECTABLE_FEATURE")>selected="selected"</#if> - <#if (productFeatureApplType.productFeatureApplTypeId?exists && product?exists && product.isVirtual == 'N' && productFeatureApplType.productFeatureApplTypeId =="STANDARD_FEATURE")>selected="selected"</#if> - >${(productFeatureApplType.get("description",locale))?if_exists} </option> + <option value='${(productFeatureApplType.productFeatureApplTypeId)!}' + <#if (productFeatureApplType.productFeatureApplTypeId?? && product?? && product.isVirtual == 'Y' && productFeatureApplType.productFeatureApplTypeId =="SELECTABLE_FEATURE")>selected="selected"</#if> + <#if (productFeatureApplType.productFeatureApplTypeId?? && product?? && product.isVirtual == 'N' && productFeatureApplType.productFeatureApplTypeId =="STANDARD_FEATURE")>selected="selected"</#if> + >${(productFeatureApplType.get("description",locale))!} </option> </#list> </select> <br /> Modified: ofbiz/trunk/applications/product/webapp/catalog/product/EditProductInventoryItems.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/product/EditProductInventoryItems.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/catalog/product/EditProductInventoryItems.ftl (original) +++ ofbiz/trunk/applications/product/webapp/catalog/product/EditProductInventoryItems.ftl Sat Aug 16 11:34:57 2014 @@ -16,11 +16,11 @@ KIND, either express or implied. See th specific language governing permissions and limitations under the License. --> -<#assign externalKeyParam = "&externalLoginKey=" + requestAttributes.externalLoginKey?if_exists> +<#assign externalKeyParam = "&externalLoginKey=" + requestAttributes.externalLoginKey!> <div class="screenlet"> - <#if product?exists> + <#if product??> <div class="screenlet-title-bar"> - <h3>${uiLabelMap.ProductInventoryItems} ${uiLabelMap.CommonFor} <#if product?exists>${(product.internalName)?if_exists} </#if> [${uiLabelMap.CommonId}:${productId?if_exists}]</h3> + <h3>${uiLabelMap.ProductInventoryItems} ${uiLabelMap.CommonFor} <#if product??>${(product.internalName)!} </#if> [${uiLabelMap.CommonId}:${productId!}]</h3> </div> <div class="screenlet-body"> <#if productId?has_content> @@ -32,7 +32,7 @@ under the License. </#if> </#if> <br /> - <#if productId?exists> + <#if productId??> <table cellspacing="0" class="basic-table"> <tr class="header-row"> <td><b>${uiLabelMap.ProductItemId}</b></td> @@ -52,21 +52,21 @@ under the License. <#assign rowClass = "2"> <#list productInventoryItems as inventoryItem> <#-- NOTE: Delivered for serialized inventory means shipped to customer so they should not be displayed here any more --> - <#if showEmpty || (inventoryItem.inventoryItemTypeId?if_exists == "SERIALIZED_INV_ITEM" && inventoryItem.statusId?if_exists != "INV_DELIVERED") - || (inventoryItem.inventoryItemTypeId?if_exists == "NON_SERIAL_INV_ITEM" && ((inventoryItem.availableToPromiseTotal?exists && inventoryItem.availableToPromiseTotal != 0) || (inventoryItem.quantityOnHandTotal?exists && inventoryItem.quantityOnHandTotal != 0)))> + <#if showEmpty || (inventoryItem.inventoryItemTypeId! == "SERIALIZED_INV_ITEM" && inventoryItem.statusId! != "INV_DELIVERED") + || (inventoryItem.inventoryItemTypeId! == "NON_SERIAL_INV_ITEM" && ((inventoryItem.availableToPromiseTotal?? && inventoryItem.availableToPromiseTotal != 0) || (inventoryItem.quantityOnHandTotal?? && inventoryItem.quantityOnHandTotal != 0)))> <#assign curInventoryItemType = inventoryItem.getRelatedOne("InventoryItemType", false)> - <#assign curStatusItem = inventoryItem.getRelatedOne("StatusItem", true)?if_exists> - <#assign facilityLocation = inventoryItem.getRelatedOne("FacilityLocation", false)?if_exists> - <#assign facilityLocationTypeEnum = (facilityLocation.getRelatedOne("TypeEnumeration", true))?if_exists> - <#assign inventoryItemDetailFirst = Static["org.ofbiz.entity.util.EntityUtil"].getFirst(inventoryItem.getRelated("InventoryItemDetail", null, Static["org.ofbiz.base.util.UtilMisc"].toList("effectiveDate"), false))?if_exists> - <#if curInventoryItemType?exists> + <#assign curStatusItem = inventoryItem.getRelatedOne("StatusItem", true)!> + <#assign facilityLocation = inventoryItem.getRelatedOne("FacilityLocation", false)!> + <#assign facilityLocationTypeEnum = (facilityLocation.getRelatedOne("TypeEnumeration", true))!> + <#assign inventoryItemDetailFirst = Static["org.ofbiz.entity.util.EntityUtil"].getFirst(inventoryItem.getRelated("InventoryItemDetail", null, Static["org.ofbiz.base.util.UtilMisc"].toList("effectiveDate"), false))!> + <#if curInventoryItemType??> <tr valign="middle"<#if rowClass == "1"> class="alternate-row"</#if>> - <td><a href="/facility/control/EditInventoryItem?inventoryItemId=${(inventoryItem.inventoryItemId)?if_exists}${StringUtil.wrapString(externalKeyParam)}" class="buttontext">${(inventoryItem.inventoryItemId)?if_exists}</a></td> - <td> ${(curInventoryItemType.get("description",locale))?if_exists}</td> + <td><a href="/facility/control/EditInventoryItem?inventoryItemId=${(inventoryItem.inventoryItemId)!}${StringUtil.wrapString(externalKeyParam)}" class="buttontext">${(inventoryItem.inventoryItemId)!}</a></td> + <td> ${(curInventoryItemType.get("description",locale))!}</td> <td> <div> <#if curStatusItem?has_content> - ${(curStatusItem.get("description",locale))?if_exists} + ${(curStatusItem.get("description",locale))!} <#elseif inventoryItem.statusId?has_content> [${inventoryItem.statusId}] <#else> @@ -74,40 +74,40 @@ under the License. </#if> </div> </td> - <td> ${(inventoryItem.datetimeReceived)?if_exists}</td> - <td> ${(inventoryItem.expireDate)?if_exists}</td> - <#if inventoryItem.facilityId?exists && inventoryItem.containerId?exists> + <td> ${(inventoryItem.datetimeReceived)!}</td> + <td> ${(inventoryItem.expireDate)!}</td> + <#if inventoryItem.facilityId?? && inventoryItem.containerId??> <td style="color: red;">${uiLabelMap.ProductErrorFacility} (${inventoryItem.facilityId}) ${uiLabelMap.ProductAndContainer} (${inventoryItem.containerId}) ${uiLabelMap.CommonSpecified}</td> - <#elseif inventoryItem.facilityId?exists> + <#elseif inventoryItem.facilityId??> <td>${uiLabelMap.ProductFacilityLetter}: <a href="/facility/control/EditFacility?facilityId=${inventoryItem.facilityId}${StringUtil.wrapString(externalKeyParam)}" class="linktext">${inventoryItem.facilityId}</a></td> - <#elseif (inventoryItem.containerId)?exists> + <#elseif (inventoryItem.containerId)??> <td>${uiLabelMap.ProductContainerLetter}: <a href="<@ofbizUrl>EditContainer?containerId=${inventoryItem.containerId }</@ofbizUrl>" class="linktext">${inventoryItem.containerId}</a></td> <#else> <td> </td> </#if> - <td><a href="/facility/control/EditFacilityLocation?facilityId=${(inventoryItem.facilityId)?if_exists}&locationSeqId=${(inventoryItem.locationSeqId)?if_exists}${StringUtil.wrapString(externalKeyParam)}" class="linktext"><#if facilityLocation?exists>${facilityLocation.areaId?if_exists}:${facilityLocation.aisleId?if_exists}:${facilityLocation.sectionId?if_exists}:${facilityLocation.levelId?if_exists}:${facilityLocation.positionId?if_exists}</#if><#if facilityLocationTypeEnum?has_content> (${facilityLocationTypeEnum.get("description",locale)})</#if> [${(inventoryItem.locationSeqId)?if_exists}]</a></td> - <td> ${(inventoryItem.lotId)?if_exists}</td> - <td> ${(inventoryItem.binNumber)?if_exists}</td> + <td><a href="/facility/control/EditFacilityLocation?facilityId=${(inventoryItem.facilityId)!}&locationSeqId=${(inventoryItem.locationSeqId)!}${StringUtil.wrapString(externalKeyParam)}" class="linktext"><#if facilityLocation??>${facilityLocation.areaId!}:${facilityLocation.aisleId!}:${facilityLocation.sectionId!}:${facilityLocation.levelId!}:${facilityLocation.positionId!}</#if><#if facilityLocationTypeEnum?has_content> (${facilityLocationTypeEnum.get("description",locale)})</#if> [${(inventoryItem.locationSeqId)!}]</a></td> + <td> ${(inventoryItem.lotId)!}</td> + <td> ${(inventoryItem.binNumber)!}</td> <td align="right"><@ofbizCurrency amount=inventoryItem.unitCost isoCode=inventoryItem.currencyUomId/></td> <td> - <#if inventoryItemDetailFirst?exists && inventoryItemDetailFirst.workEffortId?exists> + <#if inventoryItemDetailFirst?? && inventoryItemDetailFirst.workEffortId??> <b>${uiLabelMap.ProductionRunId}</b> ${inventoryItemDetailFirst.workEffortId} - <#elseif inventoryItemDetailFirst?exists && inventoryItemDetailFirst.orderId?exists> + <#elseif inventoryItemDetailFirst?? && inventoryItemDetailFirst.orderId??> <b>${uiLabelMap.OrderId}</b> ${inventoryItemDetailFirst.orderId} </#if> </td> - <td align="right">${inventoryItemDetailFirst?if_exists.quantityOnHandDiff?if_exists}</td> - <#if inventoryItem.inventoryItemTypeId?if_exists == "NON_SERIAL_INV_ITEM"> + <td align="right">${(inventoryItemDetailFirst.quantityOnHandDiff)!}</td> + <#if inventoryItem.inventoryItemTypeId! == "NON_SERIAL_INV_ITEM"> <td align="right"> <div>${(inventoryItem.availableToPromiseTotal)?default("NA")} / ${(inventoryItem.quantityOnHandTotal)?default("NA")}</div> </td> - <#elseif inventoryItem.inventoryItemTypeId?if_exists == "SERIALIZED_INV_ITEM"> - <td align="right"> ${(inventoryItem.serialNumber)?if_exists}</td> + <#elseif inventoryItem.inventoryItemTypeId! == "SERIALIZED_INV_ITEM"> + <td align="right"> ${(inventoryItem.serialNumber)!}</td> <#else> - <td align="right" style="color: red;">${uiLabelMap.ProductErrorType} ${(inventoryItem.inventoryItemTypeId)?if_exists} ${uiLabelMap.ProductUnknownSerialNumber} (${(inventoryItem.serialNumber)?if_exists}) - ${uiLabelMap.ProductAndQuantityOnHand} (${(inventoryItem.quantityOnHandTotal)?if_exists} ${uiLabelMap.CommonSpecified}</td> + <td align="right" style="color: red;">${uiLabelMap.ProductErrorType} ${(inventoryItem.inventoryItemTypeId)!} ${uiLabelMap.ProductUnknownSerialNumber} (${(inventoryItem.serialNumber)!}) + ${uiLabelMap.ProductAndQuantityOnHand} (${(inventoryItem.quantityOnHandTotal)!} ${uiLabelMap.CommonSpecified}</td> </#if> </tr> </#if> @@ -123,6 +123,6 @@ under the License. </#if> </div> <#else> - <h2>${uiLabelMap.ProductProductNotFound} ${productId?if_exists}!</h2> + <h2>${uiLabelMap.ProductProductNotFound} ${productId!}!</h2> </#if> </div> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |