svn commit: r1618554 [19/38] - in /ofbiz/branches/OFBIZ-5312-ofb
Locked
svn commit: r1618554 [19/38] - in /ofbiz/branches/OFBIZ-5312-ofb
 
|
Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/catalog/promo/EditProductPromoRules.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/catalog/promo/EditProductPromoRules.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/catalog/promo/EditProductPromoRules.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/catalog/promo/EditProductPromoRules.ftl Mon Aug 18 07:42:27 2014 @@ -16,7 +16,7 @@ KIND, either express or implied. See th specific language governing permissions and limitations under the License. --> -<#if productPromoId?exists && productPromo?exists> +<#if productPromoId?? && productPromo??> <div class="screenlet"> <div class="screenlet-title-bar"> <h3>${uiLabelMap.PageTitleEditProductPromoRules}</h3> @@ -37,20 +37,20 @@ under the License. <tr><td colspan="3"><hr /></td></tr> </#if> <tr valign="middle" class="row-level-one<#if ruleClass == "1"> alternate-row</#if>"> - <td class="label"><b> ${uiLabelMap.ProductRule} ${(productPromoRule.productPromoRuleId)?if_exists}</b></td> + <td class="label"><b> ${uiLabelMap.ProductRule} ${(productPromoRule.productPromoRuleId)!}</b></td> <td> <form method="post" action="<@ofbizUrl>updateProductPromoRule</@ofbizUrl>"> - <input type="hidden" name="productPromoId" value="${(productPromoRule.productPromoId)?if_exists}" /> - <input type="hidden" name="productPromoRuleId" value="${(productPromoRule.productPromoRuleId)?if_exists}" /> - <input type="text" size="30" name="ruleName" value="${(productPromoRule.ruleName)?if_exists}" /> + <input type="hidden" name="productPromoId" value="${(productPromoRule.productPromoId)!}" /> + <input type="hidden" name="productPromoRuleId" value="${(productPromoRule.productPromoRuleId)!}" /> + <input type="text" size="30" name="ruleName" value="${(productPromoRule.ruleName)!}" /> <input type="submit" value="${uiLabelMap.CommonUpdate}" /> </form> </td> <td align="center"> <#if (productPromoConds.size() == 0 && productPromoActions.size() == 0)> <form name="deleteProductPromoRule_${productPromoRule_index}" method="post" action="<@ofbizUrl>deleteProductPromoRule</@ofbizUrl>"> - <input type="hidden" name="productPromoId" value="${(productPromoRule.productPromoId)?if_exists}" /> - <input type="hidden" name="productPromoRuleId" value="${(productPromoRule.productPromoRuleId)?if_exists}" /> + <input type="hidden" name="productPromoId" value="${(productPromoRule.productPromoId)!}" /> + <input type="hidden" name="productPromoRuleId" value="${(productPromoRule.productPromoRuleId)!}" /> <a href="javascript:document.deleteProductPromoRule_${productPromoRule_index}.submit()" class="buttontext">${uiLabelMap.CommonDelete}</a> </form> </#if> @@ -58,7 +58,7 @@ under the License. </tr> <tr><td><hr /></td><td colspan="2"></td></tr> <tr valign="top" class="row-level-one<#if ruleClass == "1"> alternate-row</#if>"> - <td align="right" class="label">${uiLabelMap.ProductConditionsForRule} ${(productPromoRule.productPromoRuleId)?if_exists} :</td> + <td align="right" class="label">${uiLabelMap.ProductConditionsForRule} ${(productPromoRule.productPromoRuleId)!} :</td> <td colspan="2"> <table cellspacing="0" class="basic-table"> <#assign maxCondSeqId = 1> @@ -66,7 +66,7 @@ under the License. <#list productPromoConds as productPromoCond> <tr class="row-level-two<#if condClass == "1"> alternate-row</#if>"> <!-- if cur seq id is a number and is greater than max, set new max for input box prefill below --> - <#if (productPromoCond.productPromoCondSeqId)?exists> + <#if (productPromoCond.productPromoCondSeqId)??> <#assign curCondSeqId = Static["java.lang.Integer"].valueOf(productPromoCond.getString("productPromoCondSeqId"))> <#if (curCondSeqId >= maxCondSeqId)> <#assign maxCondSeqId = curCondSeqId + 1> @@ -74,41 +74,41 @@ under the License. </#if> <td></td> <td> - <b>${uiLabelMap.ProductCondition} ${(productPromoCond.productPromoCondSeqId)?if_exists}</b> + <b>${uiLabelMap.ProductCondition} ${(productPromoCond.productPromoCondSeqId)!}</b> <form method="post" action="<@ofbizUrl>updateProductPromoCond</@ofbizUrl>"> - <input type="hidden" name="productPromoId" value="${(productPromoCond.productPromoId)?if_exists}"/> - <input type="hidden" name="productPromoRuleId" value="${(productPromoCond.productPromoRuleId)?if_exists}"/> - <input type="hidden" name="productPromoCondSeqId" value="${(productPromoCond.productPromoCondSeqId)?if_exists}"/> + <input type="hidden" name="productPromoId" value="${(productPromoCond.productPromoId)!}"/> + <input type="hidden" name="productPromoRuleId" value="${(productPromoCond.productPromoRuleId)!}"/> + <input type="hidden" name="productPromoCondSeqId" value="${(productPromoCond.productPromoCondSeqId)!}"/> <select name="inputParamEnumId" size="1"> - <#if (productPromoCond.inputParamEnumId)?exists> + <#if (productPromoCond.inputParamEnumId)??> <#assign inputParamEnum = productPromoCond.getRelatedOne("InputParamEnumeration", true)> - <option value="${productPromoCond.inputParamEnumId}"><#if inputParamEnum?exists>${(inputParamEnum.get("description",locale))?if_exists}<#else>[${(productPromoCond.inputParamEnumId)?if_exists}]</#if></option> - <option value="${(productPromoCond.inputParamEnumId)?if_exists}"> </option> + <option value="${productPromoCond.inputParamEnumId}"><#if inputParamEnum??>${(inputParamEnum.get("description",locale))!}<#else>[${(productPromoCond.inputParamEnumId)!}]</#if></option> + <option value="${(productPromoCond.inputParamEnumId)!}"> </option> <#else> <option value=""> </option> </#if> <#list inputParamEnums as inputParamEnum> - <option value="${(inputParamEnum.enumId)?if_exists}">${(inputParamEnum.get("description",locale))?if_exists}</option> + <option value="${(inputParamEnum.enumId)!}">${(inputParamEnum.get("description",locale))!}</option> </#list> </select> <select name="operatorEnumId" size="1"> - <#if (productPromoCond.operatorEnumId)?exists> + <#if (productPromoCond.operatorEnumId)??> <#assign operatorEnum = productPromoCond.getRelatedOne("OperatorEnumeration", true)> - <option value="${(productPromoCond.operatorEnumId)?if_exists}"><#if operatorEnum?exists>${(operatorEnum.get("description",locale))?if_exists}<#else>[${(productPromoCond.operatorEnumId)?if_exists}]</#if></option> - <option value="${(productPromoCond.operatorEnumId)?if_exists}"> </option> + <option value="${(productPromoCond.operatorEnumId)!}"><#if operatorEnum??>${(operatorEnum.get("description",locale))!}<#else>[${(productPromoCond.operatorEnumId)!}]</#if></option> + <option value="${(productPromoCond.operatorEnumId)!}"> </option> <#else> <option value=""> </option> </#if> <#list condOperEnums as condOperEnum> - <option value="${(condOperEnum.enumId)?if_exists}">${(condOperEnum.get("description",locale))?if_exists}</option> + <option value="${(condOperEnum.enumId)!}">${(condOperEnum.get("description",locale))!}</option> </#list> </select> <label>${uiLabelMap.ProductConditionValue}:</label> - <input type="text" size="25" name="condValue" value="${(productPromoCond.condValue)?if_exists}" /> - <#assign otherValue = productPromoCond.otherValue?if_exists> - <label>${uiLabelMap.CommonOther}:</label><input type="text" size="10" name="otherValue" <#if otherValue?has_content && !otherValue.contains("@")> value="${(productPromoCond.otherValue)?if_exists}"</#if> /> + <input type="text" size="25" name="condValue" value="${(productPromoCond.condValue)!}" /> + <#assign otherValue = productPromoCond.otherValue!> + <label>${uiLabelMap.CommonOther}:</label><input type="text" size="10" name="otherValue" <#if otherValue?has_content && !otherValue.contains("@")> value="${(productPromoCond.otherValue)!}"</#if> /> <#if otherValue?has_content && otherValue.contains("@")> - <#assign carrierShippingMethod = productPromoCond.otherValue?if_exists> + <#assign carrierShippingMethod = productPromoCond.otherValue!> </#if> <#if carrierShippingMethod?has_content> <#assign carrierParty = carrierShippingMethod.substring(0, carrierShippingMethod.indexOf("@"))> @@ -119,40 +119,40 @@ under the License. </#if> <label>${uiLabelMap.OrderSelectShippingMethod}:</label> <select name = "carrierShipmentMethod"> - <option value = "${carrierShippingMethod?if_exists}">${carrierParty?if_exists} ${description}</option> + <option value = "${carrierShippingMethod!}">${carrierParty!} ${description}</option> <option value = ""> </option> <#list carrierShipmentMethods as carrierShipmentMethod> <#assign shipmentMethodType = carrierShipmentMethod.getRelatedOne("ShipmentMethodType", true)> - <option value = "${carrierShipmentMethod.partyId?if_exists}@${carrierShipmentMethod.shipmentMethodTypeId?if_exists}">${carrierShipmentMethod.partyId?if_exists} ${shipmentMethodType.get("description")?if_exists}</option> + <option value = "${carrierShipmentMethod.partyId!}@${carrierShipmentMethod.shipmentMethodTypeId!}">${carrierShipmentMethod.partyId!} ${shipmentMethodType.get("description")!}</option> </#list> </select> <input type="submit" value="${uiLabelMap.CommonUpdate}" /> </form> <form name="deleteProductPromoCondition_${productPromoRule_index}_${productPromoCond_index}" method="post" action="<@ofbizUrl>deleteProductPromoCond</@ofbizUrl>"> - <input type="hidden" name="productPromoId" value="${(productPromoCond.productPromoId)?if_exists}" /> - <input type="hidden" name="productPromoRuleId" value="${(productPromoCond.productPromoRuleId)?if_exists}" /> - <input type="hidden" name="productPromoCondSeqId" value="${(productPromoCond.productPromoCondSeqId)?if_exists}" /> + <input type="hidden" name="productPromoId" value="${(productPromoCond.productPromoId)!}" /> + <input type="hidden" name="productPromoRuleId" value="${(productPromoCond.productPromoRuleId)!}" /> + <input type="hidden" name="productPromoCondSeqId" value="${(productPromoCond.productPromoCondSeqId)!}" /> <a href="javascript:document.deleteProductPromoCondition_${productPromoRule_index}_${productPromoCond_index}.submit()" class="buttontext">${uiLabelMap.CommonDelete}</a> </form> <#-- ======================= Categories ======================== --> - <div class="label">${uiLabelMap.ProductConditionsCategoriesForCondition} ${(productPromoCond.productPromoCondSeqId)?if_exists}:</div> + <div class="label">${uiLabelMap.ProductConditionsCategoriesForCondition} ${(productPromoCond.productPromoCondSeqId)!}:</div> <#assign condProductPromoCategories = productPromoCond.getRelated("ProductPromoCategory", null, null, false)> <#if condProductPromoCategories?has_content> <#list condProductPromoCategories as condProductPromoCategory> <#assign condProductCategory = condProductPromoCategory.getRelatedOne("ProductCategory", true)> <#assign condApplEnumeration = condProductPromoCategory.getRelatedOne("ApplEnumeration", true)> <div> - ${(condProductCategory.get("description",locale))?if_exists} [${condProductPromoCategory.productCategoryId}] + ${(condProductCategory.get("description",locale))!} [${condProductPromoCategory.productCategoryId}] - ${(condApplEnumeration.get("description",locale))?default(condProductPromoCategory.productPromoApplEnumId)} - ${uiLabelMap.ProductSubCats}? ${condProductPromoCategory.includeSubCategories?default("N")} - ${uiLabelMap.CommonAnd} ${uiLabelMap.CommonGroup}: ${condProductPromoCategory.andGroupId} <form name="deleteProductPromoCategoryCondition_${productPromoRule_index}_${condProductPromoCategory_index}_${productPromoCond_index}" method="post" action="<@ofbizUrl>deleteProductPromoCategory</@ofbizUrl>"> - <input type="hidden" name="productPromoId" value="${(condProductPromoCategory.productPromoId)?if_exists}" /> - <input type="hidden" name="productPromoRuleId" value="${(condProductPromoCategory.productPromoRuleId)?if_exists}" /> - <input type="hidden" name="productPromoActionSeqId" value="${(condProductPromoCategory.productPromoActionSeqId)?if_exists}" /> - <input type="hidden" name="productPromoCondSeqId" value="${(condProductPromoCategory.productPromoCondSeqId)?if_exists}" /> - <input type="hidden" name="productCategoryId" value="${(condProductPromoCategory.productCategoryId)?if_exists}" /> - <input type="hidden" name="andGroupId" value="${(condProductPromoCategory.andGroupId)?if_exists}" /> + <input type="hidden" name="productPromoId" value="${(condProductPromoCategory.productPromoId)!}" /> + <input type="hidden" name="productPromoRuleId" value="${(condProductPromoCategory.productPromoRuleId)!}" /> + <input type="hidden" name="productPromoActionSeqId" value="${(condProductPromoCategory.productPromoActionSeqId)!}" /> + <input type="hidden" name="productPromoCondSeqId" value="${(condProductPromoCategory.productPromoCondSeqId)!}" /> + <input type="hidden" name="productCategoryId" value="${(condProductPromoCategory.productCategoryId)!}" /> + <input type="hidden" name="andGroupId" value="${(condProductPromoCategory.andGroupId)!}" /> <a href="javascript:document.deleteProductPromoCategoryCondition_${productPromoRule_index}_${condProductPromoCategory_index}_${productPromoCond_index}.submit()" class="buttontext">${uiLabelMap.CommonDelete}</a> </form> </div> @@ -181,21 +181,21 @@ under the License. </form> </div> <#-- ======================= Products ======================== --> - <div class="label">${uiLabelMap.ProductConditionsProductsForCondition} ${(productPromoCond.productPromoCondSeqId)?if_exists}:</div> + <div class="label">${uiLabelMap.ProductConditionsProductsForCondition} ${(productPromoCond.productPromoCondSeqId)!}:</div> <#assign condProductPromoProducts = productPromoCond.getRelated("ProductPromoProduct", null, null, false)> <#if condProductPromoProducts?has_content> <#list condProductPromoProducts as condProductPromoProduct> - <#assign condProduct = condProductPromoProduct.getRelatedOne("Product", true)?if_exists> + <#assign condProduct = condProductPromoProduct.getRelatedOne("Product", true)!> <#assign condApplEnumeration = condProductPromoProduct.getRelatedOne("ApplEnumeration", true)> <div> - ${(condProduct.internalName)?if_exists} [${condProductPromoProduct.productId}] + ${(condProduct.internalName)!} [${condProductPromoProduct.productId}] - ${(condApplEnumeration.get("description",locale))?default(condProductPromoProduct.productPromoApplEnumId)} <form name="deleteProductPromoProductCondition_${productPromoRule_index}_${productPromoCond_index}_${condProductPromoProduct_index}" method="post" action="<@ofbizUrl>deleteProductPromoProduct</@ofbizUrl>"> - <input type="hidden" name="productPromoId" value="${(condProductPromoProduct.productPromoId)?if_exists}" /> - <input type="hidden" name="productPromoRuleId" value="${(condProductPromoProduct.productPromoRuleId)?if_exists}" /> - <input type="hidden" name="productPromoActionSeqId" value="${(condProductPromoProduct.productPromoActionSeqId)?if_exists}" /> - <input type="hidden" name="productPromoCondSeqId" value="${(condProductPromoProduct.productPromoCondSeqId)?if_exists}" /> - <input type="hidden" name="productId" value="${(condProductPromoProduct.productId)?if_exists}" /> + <input type="hidden" name="productPromoId" value="${(condProductPromoProduct.productPromoId)!}" /> + <input type="hidden" name="productPromoRuleId" value="${(condProductPromoProduct.productPromoRuleId)!}" /> + <input type="hidden" name="productPromoActionSeqId" value="${(condProductPromoProduct.productPromoActionSeqId)!}" /> + <input type="hidden" name="productPromoCondSeqId" value="${(condProductPromoProduct.productPromoCondSeqId)!}" /> + <input type="hidden" name="productId" value="${(condProductPromoProduct.productId)!}" /> <a href="javascript:document.deleteProductPromoProductCondition_${productPromoRule_index}_${productPromoCond_index}_${condProductPromoProduct_index}.submit()" class="buttontext">${uiLabelMap.CommonDelete}</a> </form> </div> @@ -231,17 +231,17 @@ under the License. <tr> <td colspan="3"> <form method="post" action="<@ofbizUrl>createProductPromoCond</@ofbizUrl>"> - <input type="hidden" name="productPromoId" value="${(productPromoRule.productPromoId)?if_exists}" /> - <input type="hidden" name="productPromoRuleId" value="${(productPromoRule.productPromoRuleId)?if_exists}" /> + <input type="hidden" name="productPromoId" value="${(productPromoRule.productPromoId)!}" /> + <input type="hidden" name="productPromoRuleId" value="${(productPromoRule.productPromoRuleId)!}" /> <span class="label"><b>${uiLabelMap.CommonNew}</b> </span> <select name="inputParamEnumId" size="1"> <#list inputParamEnums as inputParamEnum> - <option value="${(inputParamEnum.enumId)?if_exists}">${(inputParamEnum.get("description",locale))?if_exists}</option> + <option value="${(inputParamEnum.enumId)!}">${(inputParamEnum.get("description",locale))!}</option> </#list> </select> <select name="operatorEnumId" size="1"> <#list condOperEnums as condOperEnum> - <option value="${(condOperEnum.enumId)?if_exists}">${(condOperEnum.get("description",locale))?if_exists}</option> + <option value="${(condOperEnum.enumId)!}">${(condOperEnum.get("description",locale))!}</option> </#list> </select> <label>${uiLabelMap.ProductConditionValue}:</label> @@ -252,7 +252,7 @@ under the License. <option value = "">--${uiLabelMap.OrderSelectShippingMethod}--</option> <#list carrierShipmentMethods as carrierShipmentMethod> <#assign shipmentMethodType = carrierShipmentMethod.getRelatedOne("ShipmentMethodType", true)> - <option value = "${carrierShipmentMethod.partyId?if_exists}@${carrierShipmentMethod.shipmentMethodTypeId?if_exists}">${carrierShipmentMethod.partyId?if_exists} ${shipmentMethodType.get("description")?if_exists}</option> + <option value = "${carrierShipmentMethod.partyId!}@${carrierShipmentMethod.shipmentMethodTypeId!}">${carrierShipmentMethod.partyId!} ${shipmentMethodType.get("description")!}</option> </#list> </select> <input type="submit" value="${uiLabelMap.ProductCreateCondition}" /> @@ -264,7 +264,7 @@ under the License. </tr> <tr><td><hr /></td><td colspan="2"></td></tr> <tr valign="top" class="row-level-one<#if ruleClass == "1"> alternate-row</#if>"> - <td align="right" class="label">${uiLabelMap.ProductActionForRule} ${(productPromoRule.productPromoRuleId)?if_exists} :</td> + <td align="right" class="label">${uiLabelMap.ProductActionForRule} ${(productPromoRule.productPromoRuleId)!} :</td> <td colspan="2"> <table cellspacing="0" class="basic-table"> <#assign actionClass = "2"> @@ -273,35 +273,35 @@ under the License. <td></td> <td> <div> - <b> ${uiLabelMap.ProductAction} ${(productPromoAction.productPromoActionSeqId)?if_exists}</b> + <b> ${uiLabelMap.ProductAction} ${(productPromoAction.productPromoActionSeqId)!}</b> <form method="post" action="<@ofbizUrl>updateProductPromoAction</@ofbizUrl>"> - <input type="hidden" name="productPromoId" value="${(productPromoAction.productPromoId)?if_exists}" /> - <input type="hidden" name="productPromoRuleId" value="${(productPromoAction.productPromoRuleId)?if_exists}" /> - <input type="hidden" name="productPromoActionSeqId" value="${(productPromoAction.productPromoActionSeqId)?if_exists}" /> + <input type="hidden" name="productPromoId" value="${(productPromoAction.productPromoId)!}" /> + <input type="hidden" name="productPromoRuleId" value="${(productPromoAction.productPromoRuleId)!}" /> + <input type="hidden" name="productPromoActionSeqId" value="${(productPromoAction.productPromoActionSeqId)!}" /> <select name="productPromoActionEnumId" size="1"> - <#if (productPromoAction.productPromoActionEnumId)?exists> + <#if (productPromoAction.productPromoActionEnumId)??> <#assign productPromoActionCurEnum = productPromoAction.getRelatedOne("ActionEnumeration", true)> - <option value="${(productPromoAction.productPromoActionEnumId)?if_exists}"><#if productPromoActionCurEnum?exists>${(productPromoActionCurEnum.get("description",locale))?if_exists}<#else>[${(productPromoAction.productPromoActionEnumId)?if_exists}]</#if></option> - <option value="${(productPromoAction.productPromoActionEnumId)?if_exists}"> </option> + <option value="${(productPromoAction.productPromoActionEnumId)!}"><#if productPromoActionCurEnum??>${(productPromoActionCurEnum.get("description",locale))!}<#else>[${(productPromoAction.productPromoActionEnumId)!}]</#if></option> + <option value="${(productPromoAction.productPromoActionEnumId)!}"> </option> <#else> <option value=""> </option> </#if> <#list productPromoActionEnums as productPromoActionEnum> - <option value="${(productPromoActionEnum.enumId)?if_exists}">${(productPromoActionEnum.get("description",locale))?if_exists}</option> + <option value="${(productPromoActionEnum.enumId)!}">${(productPromoActionEnum.get("description",locale))!}</option> </#list> </select> - <input type="hidden" name="orderAdjustmentTypeId" value="${(productPromoAction.orderAdjustmentTypeId)?if_exists}" /> - ${uiLabelMap.ProductQuantity}: <input type="text" size="5" name="quantity" value="${(productPromoAction.quantity)?if_exists}" /> - ${uiLabelMap.ProductAmount}: <input type="text" size="5" name="amount" value="${(productPromoAction.amount)?if_exists}" /> - ${uiLabelMap.ProductItemId}: <input type="text" size="15" name="productId" value="${(productPromoAction.productId)?if_exists}" /> - ${uiLabelMap.PartyParty}: <input type="text" size="10" name="partyId" value="${(productPromoAction.partyId)?if_exists}" /><br /> - ${uiLabelMap.ProductServiceName}: <input type="text" size="20" name="serviceName" value="${(productPromoAction.serviceName)?if_exists}" /> + <input type="hidden" name="orderAdjustmentTypeId" value="${(productPromoAction.orderAdjustmentTypeId)!}" /> + ${uiLabelMap.ProductQuantity}: <input type="text" size="5" name="quantity" value="${(productPromoAction.quantity)!}" /> + ${uiLabelMap.ProductAmount}: <input type="text" size="5" name="amount" value="${(productPromoAction.amount)!}" /> + ${uiLabelMap.ProductItemId}: <input type="text" size="15" name="productId" value="${(productPromoAction.productId)!}" /> + ${uiLabelMap.PartyParty}: <input type="text" size="10" name="partyId" value="${(productPromoAction.partyId)!}" /><br /> + ${uiLabelMap.ProductServiceName}: <input type="text" size="20" name="serviceName" value="${(productPromoAction.serviceName)!}" /> ${uiLabelMap.UseCartQuantity}: <select name="useCartQuantity"> - <#if (productPromoAction.useCartQuantity)?exists> + <#if (productPromoAction.useCartQuantity)??> <#assign productPromoActionCurEnum = productPromoAction.getRelatedOne("ActionEnumeration", true)> - <option value="${(productPromoAction.useCartQuantity)?if_exists}"><#if (productPromoAction.useCartQuantity.equals("Y"))>${uiLabelMap.CommonY}<#else>${uiLabelMap.CommonN}</#if></option> - <option value="${(productPromoAction.useCartQuantity)?if_exists}"> </option> + <option value="${(productPromoAction.useCartQuantity)!}"><#if (productPromoAction.useCartQuantity.equals("Y"))>${uiLabelMap.CommonY}<#else>${uiLabelMap.CommonN}</#if></option> + <option value="${(productPromoAction.useCartQuantity)!}"> </option> <#else> <option value=""> </option> </#if> @@ -311,31 +311,31 @@ under the License. <input type="submit" value="${uiLabelMap.CommonUpdate}" /> </form> <form name="deleteProductPromoAction_${productPromoRule_index}_${productPromoAction_index}" method="post" action="<@ofbizUrl>deleteProductPromoAction</@ofbizUrl>"> - <input type="hidden" name="productPromoId" value="${(productPromoAction.productPromoId)?if_exists}" /> - <input type="hidden" name="productPromoRuleId" value="${(productPromoAction.productPromoRuleId)?if_exists}" /> - <input type="hidden" name="productPromoActionSeqId" value="${(productPromoAction.productPromoActionSeqId)?if_exists}" /> + <input type="hidden" name="productPromoId" value="${(productPromoAction.productPromoId)!}" /> + <input type="hidden" name="productPromoRuleId" value="${(productPromoAction.productPromoRuleId)!}" /> + <input type="hidden" name="productPromoActionSeqId" value="${(productPromoAction.productPromoActionSeqId)!}" /> <a href="javascript:document.deleteProductPromoAction_${productPromoRule_index}_${productPromoAction_index}.submit()" class="buttontext">${uiLabelMap.CommonDelete}</a> </form> </div> <#-- ======================= Categories ======================== --> - <div class="label">${uiLabelMap.ProductActionsCategoriesForAction} ${(productPromoAction.productPromoActionSeqId)?if_exists}:</div> + <div class="label">${uiLabelMap.ProductActionsCategoriesForAction} ${(productPromoAction.productPromoActionSeqId)!}:</div> <#assign actionProductPromoCategories = productPromoAction.getRelated("ProductPromoCategory", null, null, false)> <#if actionProductPromoCategories?has_content> <#list actionProductPromoCategories as actionProductPromoCategory> <#assign actionProductCategory = actionProductPromoCategory.getRelatedOne("ProductCategory", true)> <#assign actionApplEnumeration = actionProductPromoCategory.getRelatedOne("ApplEnumeration", true)> <div> - ${(actionProductCategory.description)?if_exists} [${actionProductPromoCategory.productCategoryId}] + ${(actionProductCategory.description)!} [${actionProductPromoCategory.productCategoryId}] - ${(actionApplEnumeration.get("description",locale))?default(actionProductPromoCategory.productPromoApplEnumId)} - ${uiLabelMap.ProductSubCats}? ${actionProductPromoCategory.includeSubCategories?default("N")} - ${uiLabelMap.CommonAnd} ${uiLabelMap.CommonGroup}: ${actionProductPromoCategory.andGroupId} <form name="deleteProductPromoCategoryAction_${productPromoRule_index}_${productPromoAction_index}_${actionProductPromoCategory_index}" action="<@ofbizUrl>deleteProductPromoCategory</@ofbizUrl>" method="post"> - <input type="hidden" name="productPromoId" value="${(actionProductPromoCategory.productPromoId)?if_exists}" /> - <input type="hidden" name="productPromoRuleId" value="${(actionProductPromoCategory.productPromoRuleId)?if_exists}" /> - <input type="hidden" name="productPromoCondSeqId" value="${(actionProductPromoCategory.productPromoCondSeqId)?if_exists}" /> - <input type="hidden" name="productPromoActionSeqId" value="${(actionProductPromoCategory.productPromoActionSeqId)?if_exists}" /> - <input type="hidden" name="productCategoryId" value="${(actionProductPromoCategory.productCategoryId)?if_exists}" /> - <input type="hidden" name="andGroupId" value="${(actionProductPromoCategory.andGroupId)?if_exists}" /> + <input type="hidden" name="productPromoId" value="${(actionProductPromoCategory.productPromoId)!}" /> + <input type="hidden" name="productPromoRuleId" value="${(actionProductPromoCategory.productPromoRuleId)!}" /> + <input type="hidden" name="productPromoCondSeqId" value="${(actionProductPromoCategory.productPromoCondSeqId)!}" /> + <input type="hidden" name="productPromoActionSeqId" value="${(actionProductPromoCategory.productPromoActionSeqId)!}" /> + <input type="hidden" name="productCategoryId" value="${(actionProductPromoCategory.productCategoryId)!}" /> + <input type="hidden" name="andGroupId" value="${(actionProductPromoCategory.andGroupId)!}" /> <a href="javascript:document.deleteProductPromoCategoryAction_${productPromoRule_index}_${productPromoAction_index}_${actionProductPromoCategory_index}.submit()" class="buttontext">${uiLabelMap.CommonDelete}</a> </form> </div> @@ -365,21 +365,21 @@ under the License. </form> </div> <#-- ======================= Products ======================== --> - <div class="label">${uiLabelMap.ProductActionsProductsForAction} ${(productPromoAction.productPromoActionSeqId)?if_exists}:</div> + <div class="label">${uiLabelMap.ProductActionsProductsForAction} ${(productPromoAction.productPromoActionSeqId)!}:</div> <#assign actionProductPromoProducts = productPromoAction.getRelated("ProductPromoProduct", null, null, false)> <#if actionProductPromoProducts?has_content> <#list actionProductPromoProducts as actionProductPromoProduct> - <#assign actionProduct = actionProductPromoProduct.getRelatedOne("Product", true)?if_exists> + <#assign actionProduct = actionProductPromoProduct.getRelatedOne("Product", true)!> <#assign actionApplEnumeration = actionProductPromoProduct.getRelatedOne("ApplEnumeration", true)> <div> - ${(actionProduct.internalName)?if_exists} [${actionProductPromoProduct.productId}] + ${(actionProduct.internalName)!} [${actionProductPromoProduct.productId}] - ${(actionApplEnumeration.get("description",locale))?default(actionProductPromoProduct.productPromoApplEnumId)} <form name="deleteProductPromoProductAction_${productPromoRule_index}_${productPromoAction_index}_${actionProductPromoProduct_index}" method="post" action="<@ofbizUrl>deleteProductPromoProduct</@ofbizUrl>"> - <input type="hidden" name="productPromoId" value="${(actionProductPromoProduct.productPromoId)?if_exists}" /> - <input type="hidden" name="productPromoRuleId" value="${(actionProductPromoProduct.productPromoRuleId)?if_exists}" /> - <input type="hidden" name="productPromoCondSeqId" value="${(actionProductPromoProduct.productPromoCondSeqId)?if_exists}" /> - <input type="hidden" name="productPromoActionSeqId" value="${(actionProductPromoProduct.productPromoActionSeqId)?if_exists}" /> - <input type="hidden" name="productId" value="${(actionProductPromoProduct.productId)?if_exists}" /> + <input type="hidden" name="productPromoId" value="${(actionProductPromoProduct.productPromoId)!}" /> + <input type="hidden" name="productPromoRuleId" value="${(actionProductPromoProduct.productPromoRuleId)!}" /> + <input type="hidden" name="productPromoCondSeqId" value="${(actionProductPromoProduct.productPromoCondSeqId)!}" /> + <input type="hidden" name="productPromoActionSeqId" value="${(actionProductPromoProduct.productPromoActionSeqId)!}" /> + <input type="hidden" name="productId" value="${(actionProductPromoProduct.productId)!}" /> <a href="javascript:document.deleteProductPromoProductAction_${productPromoRule_index}_${productPromoAction_index}_${actionProductPromoProduct_index}.submit()" class="buttontext">${uiLabelMap.CommonDelete}</a> </form> </div> @@ -416,12 +416,12 @@ under the License. <td colspan="3"> <div> <form method="post" action="<@ofbizUrl>createProductPromoAction</@ofbizUrl>"> - <input type="hidden" name="productPromoId" value="${(productPromoRule.productPromoId)?if_exists}" /> - <input type="hidden" name="productPromoRuleId" value="${(productPromoRule.productPromoRuleId)?if_exists}" /> + <input type="hidden" name="productPromoId" value="${(productPromoRule.productPromoId)!}" /> + <input type="hidden" name="productPromoRuleId" value="${(productPromoRule.productPromoRuleId)!}" /> <span class="label"><b>${uiLabelMap.CommonNew}:</b> </span> <select name="productPromoActionEnumId" size="1"> <#list productPromoActionEnums as productPromoActionEnum> - <option value="${(productPromoActionEnum.enumId)?if_exists}">${(productPromoActionEnum.get("description",locale))?if_exists}</option> + <option value="${(productPromoActionEnum.enumId)!}">${(productPromoActionEnum.get("description",locale))!}</option> </#list> </select> <input type="hidden" name="orderAdjustmentTypeId" value="PROMOTION_ADJUSTMENT" /> @@ -463,7 +463,7 @@ under the License. </div> <div class="screenlet-body"> <form method="post" action="<@ofbizUrl>createProductPromoRule</@ofbizUrl>"> - <input type="hidden" name="productPromoId" value="${productPromoId?if_exists}" /> + <input type="hidden" name="productPromoId" value="${productPromoId!}" /> <span class="label">${uiLabelMap.ProductName}</span><input type="text" size="30" name="ruleName" /> <input type="submit" value="${uiLabelMap.CommonAdd}" /> </form> @@ -479,17 +479,17 @@ under the License. <#assign promoProductCategory = promoProductPromoCategory.getRelatedOne("ProductCategory", true)> <#assign promoApplEnumeration = promoProductPromoCategory.getRelatedOne("ApplEnumeration", true)> <div> - ${(promoProductCategory.description)?if_exists} [${promoProductPromoCategory.productCategoryId}] + ${(promoProductCategory.description)!} [${promoProductPromoCategory.productCategoryId}] - ${(promoApplEnumeration.get("description",locale))?default(promoProductPromoCategory.productPromoApplEnumId)} - ${uiLabelMap.ProductSubCats}? ${promoProductPromoCategory.includeSubCategories?default("N")} - ${uiLabelMap.CommonAnd} ${uiLabelMap.CommonGroup}: ${promoProductPromoCategory.andGroupId} <form name="deleteProductPromoCategoryAction_${promoProductPromoCategory_index}" method="post" action="<@ofbizUrl>deleteProductPromoCategory</@ofbizUrl>"> - <input type="hidden" name="productPromoId" value="${(promoProductPromoCategory.productPromoId)?if_exists}" /> - <input type="hidden" name="productPromoRuleId" value="${(promoProductPromoCategory.productPromoRuleId)?if_exists}" /> - <input type="hidden" name="productPromoActionSeqId" value="${(promoProductPromoCategory.productPromoActionSeqId)?if_exists}" /> - <input type="hidden" name="productPromoCondSeqId" value="${(promoProductPromoCategory.productPromoCondSeqId)?if_exists}" /> - <input type="hidden" name="productCategoryId" value="${(promoProductPromoCategory.productCategoryId)?if_exists}" /> - <input type="hidden" name="andGroupId" value="${(promoProductPromoCategory.andGroupId)?if_exists}" /> + <input type="hidden" name="productPromoId" value="${(promoProductPromoCategory.productPromoId)!}" /> + <input type="hidden" name="productPromoRuleId" value="${(promoProductPromoCategory.productPromoRuleId)!}" /> + <input type="hidden" name="productPromoActionSeqId" value="${(promoProductPromoCategory.productPromoActionSeqId)!}" /> + <input type="hidden" name="productPromoCondSeqId" value="${(promoProductPromoCategory.productPromoCondSeqId)!}" /> + <input type="hidden" name="productCategoryId" value="${(promoProductPromoCategory.productCategoryId)!}" /> + <input type="hidden" name="andGroupId" value="${(promoProductPromoCategory.andGroupId)!}" /> <a href="javascript:document.deleteProductPromoCategoryAction_${promoProductPromoCategory_index}.submit()" class="buttontext">${uiLabelMap.CommonDelete}</a> </form> </div> @@ -523,17 +523,17 @@ under the License. <#-- ======================= Products ======================== --> <div class="screenlet-body"> <#list promoProductPromoProducts as promoProductPromoProduct> - <#assign promoProduct = promoProductPromoProduct.getRelatedOne("Product", true)?if_exists> + <#assign promoProduct = promoProductPromoProduct.getRelatedOne("Product", true)!> <#assign promoApplEnumeration = promoProductPromoProduct.getRelatedOne("ApplEnumeration", true)> <div> - ${(promoProduct.internalName)?if_exists} [${promoProductPromoProduct.productId}] + ${(promoProduct.internalName)!} [${promoProductPromoProduct.productId}] - ${(promoApplEnumeration.get("description",locale))?default(promoProductPromoProduct.productPromoApplEnumId)} <form name="deleteProductPromoProductAction_${promoProductPromoProduct_index}" action="<@ofbizUrl>deleteProductPromoProduct</@ofbizUrl>" method="post"> - <input type="hidden" name="productPromoId" value="${(promoProductPromoProduct.productPromoId)?if_exists}" /> - <input type="hidden" name="productPromoRuleId" value="${(promoProductPromoProduct.productPromoRuleId)?if_exists}" /> - <input type="hidden" name="productPromoActionSeqId" value="${(promoProductPromoProduct.productPromoActionSeqId)?if_exists}" /> - <input type="hidden" name="productPromoCondSeqId" value="${(promoProductPromoProduct.productPromoCondSeqId)?if_exists}" /> - <input type="hidden" name="productId" value="${(promoProductPromoProduct.productId)?if_exists}" /> + <input type="hidden" name="productPromoId" value="${(promoProductPromoProduct.productPromoId)!}" /> + <input type="hidden" name="productPromoRuleId" value="${(promoProductPromoProduct.productPromoRuleId)!}" /> + <input type="hidden" name="productPromoActionSeqId" value="${(promoProductPromoProduct.productPromoActionSeqId)!}" /> + <input type="hidden" name="productPromoCondSeqId" value="${(promoProductPromoProduct.productPromoCondSeqId)!}" /> + <input type="hidden" name="productId" value="${(promoProductPromoProduct.productId)!}" /> <a href="javascript:document.deleteProductPromoProductAction_${promoProductPromoProduct_index}.submit()" class="buttontext">${uiLabelMap.CommonDelete}</a> </form> </div> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/catalog/promo/EditProductPromoStores.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/catalog/promo/EditProductPromoStores.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/catalog/promo/EditProductPromoStores.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/catalog/promo/EditProductPromoStores.ftl Mon Aug 18 07:42:27 2014 @@ -16,7 +16,7 @@ KIND, either express or implied. See th specific language governing permissions and limitations under the License. --> -<#if productPromoId?exists && productPromo?exists> +<#if productPromoId?? && productPromo??> <div class="screenlet"> <div class="screenlet-title-bar"> <h3>${uiLabelMap.PageTitleEditProductPromoStores}</h3> @@ -35,20 +35,20 @@ under the License. <#assign line = line + 1> <#assign productStore = productStorePromoAppl.getRelatedOne("ProductStore", false)> <tr valign="middle"<#if rowClass == "1"> class="alternate-row"</#if>> - <td><a href="<@ofbizUrl>EditProductStore?productStoreId=${productStorePromoAppl.productStoreId}</@ofbizUrl>" class="buttontext"><#if productStore?exists>${(productStore.storeName)?if_exists}</#if>[${productStorePromoAppl.productStoreId}]</a></td> + <td><a href="<@ofbizUrl>EditProductStore?productStoreId=${productStorePromoAppl.productStoreId}</@ofbizUrl>" class="buttontext"><#if productStore??>${(productStore.storeName)!}</#if>[${productStorePromoAppl.productStoreId}]</a></td> <#assign hasntStarted = false> - <#if (productStorePromoAppl.getTimestamp("fromDate"))?exists && nowTimestamp.before(productStorePromoAppl.getTimestamp("fromDate"))> <#assign hasntStarted = true></#if> - <td <#if hasntStarted>style="color: red;"</#if>>${productStorePromoAppl.fromDate?if_exists}</td> + <#if (productStorePromoAppl.getTimestamp("fromDate"))?? && nowTimestamp.before(productStorePromoAppl.getTimestamp("fromDate"))> <#assign hasntStarted = true></#if> + <td <#if hasntStarted>style="color: red;"</#if>>${productStorePromoAppl.fromDate!}</td> <td align="center"> <#assign hasExpired = false> - <#if (productStorePromoAppl.getTimestamp("thruDate"))?exists && nowTimestamp.after(productStorePromoAppl.getTimestamp("thruDate"))> <#assign hasExpired = true></#if> + <#if (productStorePromoAppl.getTimestamp("thruDate"))?? && nowTimestamp.after(productStorePromoAppl.getTimestamp("thruDate"))> <#assign hasExpired = true></#if> <form method="post" action="<@ofbizUrl>promo_updateProductStorePromoAppl</@ofbizUrl>" name="lineForm${line}"> <input type="hidden" name="productStoreId" value="${productStorePromoAppl.productStoreId}" /> <input type="hidden" name="productPromoId" value="${productStorePromoAppl.productPromoId}" /> <input type="hidden" name="fromDate" value="${productStorePromoAppl.fromDate}" /> <#if hasExpired><#assign class="alert"></#if> - <@htmlTemplate.renderDateTimeField name="thruDate" event="" action="" className="${class!''}" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" value="${(productStorePromoAppl.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="5" name="sequenceNum" value="${(productStorePromoAppl.sequenceNum)?if_exists}" /> + <@htmlTemplate.renderDateTimeField name="thruDate" event="" action="" className="${class!''}" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" value="${(productStorePromoAppl.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=""/> + <input type="text" size="5" name="sequenceNum" value="${(productStorePromoAppl.sequenceNum)!}" /> <input type="submit" value="${uiLabelMap.CommonUpdate}" /> </form> </td> @@ -81,7 +81,7 @@ under the License. <input type="hidden" name="tryEntity" value="true"/> <select name="productStoreId"> <#list productStores as productStore> - <option value="${(productStore.productStoreId)?if_exists}">${(productStore.storeName)?if_exists} [${(productStore.productStoreId)?if_exists}]</option> + <option value="${(productStore.productStoreId)!}">${(productStore.storeName)!} [${(productStore.productStoreId)!}]</option> </#list> </select> <@htmlTemplate.renderDateTimeField name="fromDate" event="" action="" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" value="" 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=""/> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/catalog/promo/FindProductPromoCode.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/catalog/promo/FindProductPromoCode.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/catalog/promo/FindProductPromoCode.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/catalog/promo/FindProductPromoCode.ftl Mon Aug 18 07:42:27 2014 @@ -16,7 +16,7 @@ KIND, either express or implied. See th specific language governing permissions and limitations under the License. --> -<#if productPromoId?exists> +<#if productPromoId??> <div class="screenlet"> <div class="screenlet-title-bar"> <h3>${uiLabelMap.ProductPromotionUploadSetOfPromotionCodes}</h3> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/catalog/store/EditProductStoreShipSetup.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/catalog/store/EditProductStoreShipSetup.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/catalog/store/EditProductStoreShipSetup.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/catalog/store/EditProductStoreShipSetup.ftl Mon Aug 18 07:42:27 2014 @@ -18,7 +18,7 @@ under the License. --> <form name="addscarr" method="post" action="<@ofbizUrl>prepareCreateShipMeth</@ofbizUrl>"> <input type="hidden" name="newShipMethod" value="Y"/> - <input type="hidden" name="productStoreId" value="${productStoreId?if_exists}"/> + <input type="hidden" name="productStoreId" value="${productStoreId!}"/> <table cellspacing="0" class="basic-table"> <tr> <td align="right" class="label">${uiLabelMap.ProductCarrierShipmentMethod}</td> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/catalog/store/EditProductStoreSurveys.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/catalog/store/EditProductStoreSurveys.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/catalog/store/EditProductStoreSurveys.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/catalog/store/EditProductStoreSurveys.ftl Mon Aug 18 07:42:27 2014 @@ -38,12 +38,12 @@ under the License. <#assign survey = storeSurvey.getRelatedOne("Survey", false)> <tr valign="middle"<#if alt_row>class="alternate-row"</#if>> <td>${surveyType.get("description",locale)}</td> - <td>${storeSurvey.groupName?if_exists}</td> + <td>${storeSurvey.groupName!}</td> <td><a href="/content/control/EditSurvey?surveyId=${storeSurvey.surveyId}" class="buttontext">${survey.description?default("[" + survey.surveyId + "]")}</a></td> <td>${storeSurvey.productId?default("${uiLabelMap.CommonNA}")}</td> <td>${storeSurvey.productCategoryId?default("${uiLabelMap.CommonNA}")}</td> - <td>${storeSurvey.fromDate?if_exists?string}</td> - <td>${storeSurvey.sequenceNum?if_exists}</td> + <td>${storeSurvey.fromDate!?string}</td> + <td>${storeSurvey.sequenceNum!}</td> <td> <form name="deleteProductStoreSurveyAppl_${storeSurvey_index}" method="post" action="<@ofbizUrl>deleteProductStoreSurveyAppl</@ofbizUrl>"> <input type="hidden" name="productStoreId" value="${productStoreId}" /> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/catalog/store/EditProductStoreWebSites.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/catalog/store/EditProductStoreWebSites.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/catalog/store/EditProductStoreWebSites.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/catalog/store/EditProductStoreWebSites.ftl Mon Aug 18 07:42:27 2014 @@ -33,7 +33,7 @@ under the License. <#assign rowClass = "2"> <#list storeWebSites as webSite> <tr valign="middle"<#if rowClass == "1"> class="alternate-row"</#if>> - <td><a href="/content/control/EditWebSite?webSiteId=${webSite.webSiteId}&externalLoginKey=${requestAttributes.externalLoginKey}" class="buttontext">${webSite.siteName?if_exists} [${webSite.webSiteId}]</a></td> + <td><a href="/content/control/EditWebSite?webSiteId=${webSite.webSiteId}&externalLoginKey=${requestAttributes.externalLoginKey}" class="buttontext">${webSite.siteName!} [${webSite.webSiteId}]</a></td> <td>${webSite.httpHost?default(' ')}</td> <td>${webSite.httpPort?default(' ')}</td> <td align="center"> @@ -66,7 +66,7 @@ under the License. <input type="hidden" name="productStoreId" value="${productStoreId}" /> <select name="webSiteId"> <#list webSites as webSite> - <option value="${webSite.webSiteId}">${webSite.siteName?if_exists} [${webSite.webSiteId}]</option> + <option value="${webSite.webSiteId}">${webSite.siteName!} [${webSite.webSiteId}]</option> </#list> </select> <input type="submit" class="smallSubmit" value="${uiLabelMap.CommonUpdate}" /> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/catalog/store/ProductStoreGroupTree.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/catalog/store/ProductStoreGroupTree.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/catalog/store/ProductStoreGroupTree.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/catalog/store/ProductStoreGroupTree.ftl Mon Aug 18 07:42:27 2014 @@ -34,7 +34,7 @@ jQuery(window).load(createTree()); var rawdata = [ <#list parentGroupList as parentGroup> { - "data": {"title" : unescapeHtmlText("<#if parentGroup.productStoreGroupName?exists>${parentGroup.productStoreGroupName?js_string} [${parentGroup.productStoreGroupId}]</#if>"), + "data": {"title" : unescapeHtmlText("<#if parentGroup.productStoreGroupName??>${parentGroup.productStoreGroupName?js_string} [${parentGroup.productStoreGroupId}]</#if>"), "attr": {"href" : "<@ofbizUrl>/EditProductStoreGroupAndAssoc</@ofbizUrl>","onClick" : "callDocument('${parentGroup.productStoreGroupId}');"}}, "attr": {"parentGroupId" : "${parentGroup.productStoreGroupId}"}, "state" : "closed" Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/catalog/thesaurus/EditKeywordThesaurus.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/catalog/thesaurus/EditKeywordThesaurus.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/catalog/thesaurus/EditKeywordThesaurus.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/catalog/thesaurus/EditKeywordThesaurus.ftl Mon Aug 18 07:42:27 2014 @@ -79,7 +79,7 @@ under the License. <input type="hidden" name="alternateKeyword" value="${keyword.alternateKeyword}" /> <input type="submit" value="X" /> </form> - ${keyword.alternateKeyword} (${uiLabelMap.ProductRelationship}:${(relationship.get("description",locale))?default(keyword.relationshipEnumId?if_exists)}) + ${keyword.alternateKeyword} (${uiLabelMap.ProductRelationship}:${(relationship.get("description",locale))?default(keyword.relationshipEnumId!)}) </div> <#-- toggle the row color --> <#if rowClass == "2"> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/facility/facility/EditContactMech.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/facility/facility/EditContactMech.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/facility/facility/EditContactMech.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/facility/facility/EditContactMech.ftl Mon Aug 18 07:42:27 2014 @@ -17,11 +17,11 @@ specific language governing permissions under the License. --> -<#if !mechMap.facilityContactMech?exists && mechMap.contactMech?exists> +<#if !mechMap.facilityContactMech?? && mechMap.contactMech??> <p><h3>${uiLabelMap.PartyContactInfoNotBelongToYou}.</h3></p> <a href="<@ofbizUrl>authview/${donePage}?facilityId=${facilityId}</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonGoBack}</a> <#else> - <#if !mechMap.contactMech?exists> + <#if !mechMap.contactMech??> <#-- When creating a new contact mech, first select the type, then actually create --> <#if !preContactMechTypeId?has_content> <h1>${title}</h1> @@ -30,7 +30,7 @@ under the License. </div> <form method="post" action='<@ofbizUrl>EditContactMech</@ofbizUrl>' name="createcontactmechform"> <input type='hidden' name='facilityId' value='${facilityId}' /> - <input type='hidden' name='DONE_PAGE' value='${donePage?if_exists}' /> + <input type='hidden' name='DONE_PAGE' value='${donePage!}' /> <table width="50%" class="basic-table" cellspacing="0"> <tr> <td class="label">${uiLabelMap.PartySelectContactType}</td> @@ -53,18 +53,18 @@ under the License. <div class="button-bar"> <a href='<@ofbizUrl>authview/${donePage}?facilityId=${facilityId}</@ofbizUrl>' class='buttontext'>${uiLabelMap.CommonGoBack}</a> </div> - <#if contactMechPurposeType?exists> - <div><span class="label">(${uiLabelMap.PartyMsgContactHavePurpose}</span>"${contactMechPurposeType.get("description",locale)?if_exists}")</div> + <#if contactMechPurposeType??> + <div><span class="label">(${uiLabelMap.PartyMsgContactHavePurpose}</span>"${contactMechPurposeType.get("description",locale)!}")</div> </#if> <table width="90%" class="basic-table" cellspacing="0"> <form method="post" action='<@ofbizUrl>${mechMap.requestName}</@ofbizUrl>' name="editcontactmechform" id="editcontactmechform"> <input type='hidden' name='DONE_PAGE' value='${donePage}' /> <input type='hidden' name='contactMechTypeId' value='${mechMap.contactMechTypeId}' /> <input type='hidden' name='facilityId' value='${facilityId}' /> - <#if preContactMechTypeId?exists><input type='hidden' name='preContactMechTypeId' value='${preContactMechTypeId}' /></#if> - <#if contactMechPurposeTypeId?exists><input type='hidden' name='contactMechPurposeTypeId' value='${contactMechPurposeTypeId?if_exists}' /></#if> + <#if preContactMechTypeId??><input type='hidden' name='preContactMechTypeId' value='${preContactMechTypeId}' /></#if> + <#if contactMechPurposeTypeId??><input type='hidden' name='contactMechPurposeTypeId' value='${contactMechPurposeTypeId!}' /></#if> - <#if paymentMethodId?exists><input type='hidden' name='paymentMethodId' value='${paymentMethodId}' /></#if> + <#if paymentMethodId??><input type='hidden' name='paymentMethodId' value='${paymentMethodId}' /></#if> <tr> <td class="label">${uiLabelMap.PartyContactPurposes}</td> @@ -108,11 +108,11 @@ under the License. <#-- toggle the row color --> <#assign alt_row = !alt_row> <form id="deleteFacilityContactMechPurpose_${facilityContactMechPurpose_index}" method="post" action="<@ofbizUrl>deleteFacilityContactMechPurpose</@ofbizUrl>"> - <input type="hidden" name="facilityId" value="${facilityId?if_exists}" /> - <input type="hidden" name="contactMechId" value="${contactMechId?if_exists}" /> - <input type="hidden" name="contactMechPurposeTypeId" value="${(facilityContactMechPurpose.contactMechPurposeTypeId)?if_exists}" /> - <input type="hidden" name="fromDate" value="${(facilityContactMechPurpose.fromDate)?if_exists}" /> - <input type="hidden" name="DONE_PAGE" value="${donePage?if_exists}" /> + <input type="hidden" name="facilityId" value="${facilityId!}" /> + <input type="hidden" name="contactMechId" value="${contactMechId!}" /> + <input type="hidden" name="contactMechPurposeTypeId" value="${(facilityContactMechPurpose.contactMechPurposeTypeId)!}" /> + <input type="hidden" name="fromDate" value="${(facilityContactMechPurpose.fromDate)!}" /> + <input type="hidden" name="DONE_PAGE" value="${donePage!}" /> <input type="hidden" name="useValues" value="true" /> </form> </#list> @@ -121,7 +121,7 @@ under the License. <td> <form method="post" action='<@ofbizUrl>createFacilityContactMechPurpose?DONE_PAGE=${donePage}&useValues=true</@ofbizUrl>' name='newpurposeform'> <input type="hidden" name='facilityId' value='${facilityId}' /> - <input type="hidden" name='contactMechId' value='${contactMechId?if_exists}' /> + <input type="hidden" name='contactMechId' value='${contactMechId!}' /> <select name='contactMechPurposeTypeId'> <option></option> <#list mechMap.purposeTypes as contactMechPurposeType> @@ -142,35 +142,35 @@ under the License. <input type="hidden" name='facilityId' value='${facilityId}' /> </#if> - <#if "POSTAL_ADDRESS" = mechMap.contactMechTypeId?if_exists> + <#if "POSTAL_ADDRESS" = mechMap.contactMechTypeId!> <tr> <td class="label">${uiLabelMap.PartyToName}</td> <td> - <input type="text" size="30" maxlength="60" name="toName" value="${(mechMap.postalAddress.toName)?default(request.getParameter('toName')?if_exists)}" /> + <input type="text" size="30" maxlength="60" name="toName" value="${(mechMap.postalAddress.toName)?default(request.getParameter('toName')!)}" /> </td> </tr> <tr> <td class="label">${uiLabelMap.PartyAttentionName}</td> <td> - <input type="text" size="30" maxlength="60" name="attnName" value="${(mechMap.postalAddress.attnName)?default(request.getParameter('attnName')?if_exists)}" /> + <input type="text" size="30" maxlength="60" name="attnName" value="${(mechMap.postalAddress.attnName)?default(request.getParameter('attnName')!)}" /> </td> </tr> <tr> <td class="label">${uiLabelMap.PartyAddressLine1}</td> <td> - <input type="text" class="required" size="30" maxlength="30" name="address1" value="${(mechMap.postalAddress.address1)?default(request.getParameter('address1')?if_exists)}" /> + <input type="text" class="required" size="30" maxlength="30" name="address1" value="${(mechMap.postalAddress.address1)?default(request.getParameter('address1')!)}" /> *</td> </tr> <tr> <td class="label">${uiLabelMap.PartyAddressLine2}</td> <td> - <input type="text" size="30" maxlength="30" name="address2" value="${(mechMap.postalAddress.address2)?default(request.getParameter('address2')?if_exists)}" /> + <input type="text" size="30" maxlength="30" name="address2" value="${(mechMap.postalAddress.address2)?default(request.getParameter('address2')!)}" /> </td> </tr> <tr> <td class="label">${uiLabelMap.PartyCity}</td> <td> - <input type="text" class="required" size="30" maxlength="30" name="city" value="${(mechMap.postalAddress.city)?default(request.getParameter('city')?if_exists)}" /> + <input type="text" class="required" size="30" maxlength="30" name="city" value="${(mechMap.postalAddress.city)?default(request.getParameter('city')!)}" /> *</td> </tr> <tr> @@ -183,7 +183,7 @@ under the License. <tr> <td class="label">${uiLabelMap.PartyZipCode}</td> <td> - <input type="text" class="required" size="12" maxlength="10" name="postalCode" value="${(mechMap.postalAddress.postalCode)?default(request.getParameter('postalCode')?if_exists)}" /> + <input type="text" class="required" size="12" maxlength="10" name="postalCode" value="${(mechMap.postalAddress.postalCode)?default(request.getParameter('postalCode')!)}" /> *</td> </tr> <tr> @@ -191,7 +191,7 @@ under the License. <td> <select name="countryGeoId" id="editcontactmechform_countryGeoId"> ${screens.render("component://common/widget/CommonScreens.xml#countries")} - <#if (mechMap.postalAddress?exists) && (mechMap.postalAddress.countryGeoId?exists)> + <#if (mechMap.postalAddress??) && (mechMap.postalAddress.countryGeoId??)> <#assign defaultCountryGeoId = mechMap.postalAddress.countryGeoId> <#else> <#assign defaultCountryGeoId = Static["org.ofbiz.base.util.UtilProperties"].getPropertyValue("general.properties", "country.geo.id.default")> @@ -203,32 +203,32 @@ under the License. </select> </td> </tr> - <#elseif "TELECOM_NUMBER" = mechMap.contactMechTypeId?if_exists> + <#elseif "TELECOM_NUMBER" = mechMap.contactMechTypeId!> <tr> <td class="label">${uiLabelMap.PartyPhoneNumber}</td> <td> - <input type="text" size="4" maxlength="10" name="countryCode" value="${(mechMap.telecomNumber.countryCode)?default(request.getParameter('countryCode')?if_exists)}" /> - - <input type="text" size="4" maxlength="10" name="areaCode" value="${(mechMap.telecomNumber.areaCode)?default(request.getParameter('areaCode')?if_exists)}" /> - - <input type="text" size="15" maxlength="15" name="contactNumber" value="${(mechMap.telecomNumber.contactNumber)?default(request.getParameter('contactNumber')?if_exists)}" /> - ext <input type="text" size="6" maxlength="10" name="extension" value="${(mechMap.facilityContactMech.extension)?default(request.getParameter('extension')?if_exists)}" /> + <input type="text" size="4" maxlength="10" name="countryCode" value="${(mechMap.telecomNumber.countryCode)?default(request.getParameter('countryCode')!)}" /> + - <input type="text" size="4" maxlength="10" name="areaCode" value="${(mechMap.telecomNumber.areaCode)?default(request.getParameter('areaCode')!)}" /> + - <input type="text" size="15" maxlength="15" name="contactNumber" value="${(mechMap.telecomNumber.contactNumber)?default(request.getParameter('contactNumber')!)}" /> + ext <input type="text" size="6" maxlength="10" name="extension" value="${(mechMap.facilityContactMech.extension)?default(request.getParameter('extension')!)}" /> </td> </tr> <tr> <td> </td> <td>[${uiLabelMap.CommonCountryCode}] [${uiLabelMap.PartyAreaCode}] [${uiLabelMap.PartyContactNumber}] [${uiLabelMap.PartyExtension}]</td> </tr> - <#elseif "EMAIL_ADDRESS" = mechMap.contactMechTypeId?if_exists> + <#elseif "EMAIL_ADDRESS" = mechMap.contactMechTypeId!> <tr> <td class="label">${uiLabelMap.PartyEmailAddress}</td> <td> - <input type="text" class="required" size="60" maxlength="255" name="emailAddress" value="${(mechMap.contactMech.infoString)?default(request.getParameter('emailAddress')?if_exists)}" /> + <input type="text" class="required" size="60" maxlength="255" name="emailAddress" value="${(mechMap.contactMech.infoString)?default(request.getParameter('emailAddress')!)}" /> *</td> </tr> <#else> <tr> <td class="label">${mechMap.contactMechType.get("description",locale)}</td> <td> - <input type="text" class="required" size="60" maxlength="255" name="infoString" value="${(mechMap.contactMech.infoString)?if_exists}" /> + <input type="text" class="required" size="60" maxlength="255" name="infoString" value="${(mechMap.contactMech.infoString)!}" /> *</td> </tr> </#if> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/facility/facility/EditFacility.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/facility/facility/EditFacility.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/facility/facility/EditFacility.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/facility/facility/EditFacility.ftl Mon Aug 18 07:42:27 2014 @@ -17,20 +17,20 @@ specific language governing permissions under the License. --> -<#if facility?exists && facilityId?has_content> +<#if facility?? && facilityId?has_content> <form action="<@ofbizUrl>UpdateFacility</@ofbizUrl>" name="EditFacilityForm" method="post" class="basic-form"> - <input type="hidden" name="facilityId" value="${facilityId?if_exists}" /> + <input type="hidden" name="facilityId" value="${facilityId!}" /> <table class="basic-table" cellspacing='0'> <tr> <td class="label">${uiLabelMap.ProductFacilityId}</td> <td> - ${facilityId?if_exists} <span class="tooltip">${uiLabelMap.ProductNotModificationRecrationFacility}</span> + ${facilityId!} <span class="tooltip">${uiLabelMap.ProductNotModificationRecrationFacility}</span> </td> </tr> <#else> <form action="<@ofbizUrl>CreateFacility</@ofbizUrl>" name="EditFacilityForm" method="post" class="basic-form"> - <#if facilityId?exists> - <h3>${uiLabelMap.ProductCouldNotFindFacilityWithId} "${facilityId?if_exists}".</h3> + <#if facilityId??> + <h3>${uiLabelMap.ProductCouldNotFindFacilityWithId} "${facilityId!}".</h3> </#if> <table class="basic-table" cellspacing='0'> </#if> @@ -38,10 +38,10 @@ under the License. <td class="label">${uiLabelMap.ProductFacilityTypeId}</td> <td> <select name="facilityTypeId"> - <option selected="selected" value='${facilityType.facilityTypeId?if_exists}'>${facilityType.get("description",locale)?if_exists}</option> - <option value='${facilityType.facilityTypeId?if_exists}'>----</option> + <option selected="selected" value='${facilityType.facilityTypeId!}'>${facilityType.get("description",locale)!}</option> + <option value='${facilityType.facilityTypeId!}'>----</option> <#list facilityTypes as nextFacilityType> - <option value='${nextFacilityType.facilityTypeId?if_exists}'>${nextFacilityType.get("description",locale)?if_exists}</option> + <option value='${nextFacilityType.facilityTypeId!}'>${nextFacilityType.get("description",locale)!}</option> </#list> </select> </td> @@ -49,13 +49,13 @@ under the License. <tr> <td class="label">${uiLabelMap.FormFieldTitle_parentFacilityId}</td> <td> - <@htmlTemplate.lookupField value="${facility.parentFacilityId?if_exists}" formName="EditFacilityForm" name="parentFacilityId" id="parentFacilityId" fieldFormName="LookupFacility"/> + <@htmlTemplate.lookupField value="${facility.parentFacilityId!}" formName="EditFacilityForm" name="parentFacilityId" id="parentFacilityId" fieldFormName="LookupFacility"/> </td> </tr> <tr> <td class="label">${uiLabelMap.ProductFacilityOwner}</td> <td> - <@htmlTemplate.lookupField value="${facility.ownerPartyId?if_exists}" formName="EditFacilityForm" name="ownerPartyId" id="ownerPartyId" fieldFormName="LookupPartyName"/> + <@htmlTemplate.lookupField value="${facility.ownerPartyId!}" formName="EditFacilityForm" name="ownerPartyId" id="ownerPartyId" fieldFormName="LookupPartyName"/> <span class="tooltip">${uiLabelMap.CommonRequired}</span> </td> </tr> @@ -91,13 +91,13 @@ under the License. <tr> <td class="label">${uiLabelMap.ProductName}</td> <td> - <input type="text" name="facilityName" value="${facility.facilityName?if_exists}" size="30" maxlength="60" /> + <input type="text" name="facilityName" value="${facility.facilityName!}" size="30" maxlength="60" /> <span class="tooltip">${uiLabelMap.CommonRequired}</span> </td> </tr> <tr> <td class="label">${uiLabelMap.ProductFacilitySize}</td> - <td><input type="text" name="facilitySize" value="${facility.facilitySize?if_exists}" size="10" maxlength="20" /></td> + <td><input type="text" name="facilitySize" value="${facility.facilitySize!}" size="10" maxlength="20" /></td> </tr> <tr> <td class="label">${uiLabelMap.ProductFacilityDefaultAreaUnit}</td> @@ -116,11 +116,11 @@ under the License. </tr> <tr> <td class="label">${uiLabelMap.ProductProductDescription}</td> - <td ><input type="text" name="description" value="${facility.description?if_exists}" size="60" maxlength="250" /></td> + <td ><input type="text" name="description" value="${facility.description!}" size="60" maxlength="250" /></td> </tr> <tr> <td class="label">${uiLabelMap.ProductDefaultDaysToShip}</td> - <td><input type="text" name="defaultDaysToShip" value="${facility.defaultDaysToShip?if_exists}" size="10" maxlength="20" /></td> + <td><input type="text" name="defaultDaysToShip" value="${facility.defaultDaysToShip!}" size="10" maxlength="20" /></td> </tr> <tr> <td> </td> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/facility/facility/EditFacilityLocation.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/facility/facility/EditFacilityLocation.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/facility/facility/EditFacilityLocation.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/facility/facility/EditFacilityLocation.ftl Mon Aug 18 07:42:27 2014 @@ -17,30 +17,30 @@ specific language governing permissions under the License. --> <h1>${title}</h1> -<#if facilityId?exists && locationSeqId?exists> +<#if facilityId?? && locationSeqId??> <div class="button-bar"> <a href="<@ofbizUrl>EditFacility</@ofbizUrl>" class="buttontext">${uiLabelMap.ProductNewFacility}</a> - <a href="<@ofbizUrl>EditFacilityLocation?facilityId=${facilityId?if_exists}</@ofbizUrl>" class="buttontext">${uiLabelMap.ProductNewFacilityLocation}</a> + <a href="<@ofbizUrl>EditFacilityLocation?facilityId=${facilityId!}</@ofbizUrl>" class="buttontext">${uiLabelMap.ProductNewFacilityLocation}</a> <a href="<@ofbizUrl>EditInventoryItem?facilityId=${facilityId}&locationSeqId=${locationSeqId}</@ofbizUrl>" class="buttontext">${uiLabelMap.ProductNewInventoryItem}</a> - <#assign latestGeoPoint= Static["org.ofbiz.common.geo.GeoWorker"].findLatestGeoPoint(delegator, "FacilityLocationAndGeoPoint", "facilityId", facilityId, "locationSeqId", locationSeqId)?if_exists/> + <#assign latestGeoPoint= Static["org.ofbiz.common.geo.GeoWorker"].findLatestGeoPoint(delegator, "FacilityLocationAndGeoPoint", "facilityId", facilityId, "locationSeqId", locationSeqId)!/> <#if latestGeoPoint?has_content> <a href="<@ofbizUrl>FacilityLocationGeoLocation?facilityId=${facilityId}&locationSeqId=${locationSeqId}</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonGeoLocation}</a> </#if> </div> </#if> -<#if facilityId?exists && !(facilityLocation?exists)> +<#if facilityId?? && !(facilityLocation??)> <form action="<@ofbizUrl>CreateFacilityLocation</@ofbizUrl>" method="post"> <input type="hidden" name="facilityId" value="${facilityId}" /> <table class="basic-table" cellspacing="0"> -<#elseif facilityLocation?exists> +<#elseif facilityLocation??> <form action="<@ofbizUrl>UpdateFacilityLocation</@ofbizUrl>" method="post"> - <input type="hidden" name="facilityId" value="${facilityId?if_exists}" /> + <input type="hidden" name="facilityId" value="${facilityId!}" /> <input type="hidden" name="locationSeqId" value="${locationSeqId}" /> <table class="basic-table" cellspacing="0"> <tr> <td class="label">${uiLabelMap.ProductFacilityId}</td> - <td>${facilityId?if_exists}</td> + <td>${facilityId!}</td> </tr> <tr> <td class="label">${uiLabelMap.ProductLocationSeqId}</td> @@ -50,13 +50,13 @@ under the License. <h1>${uiLabelMap.ProductNotCreateLocationFacilityId}</h1> </#if> -<#if facilityId?exists> +<#if facilityId??> <tr> <td class="label">${uiLabelMap.ProductType}</td> <td> <select name="locationTypeEnumId"> <#if (facilityLocation.locationTypeEnumId)?has_content> - <#assign locationTypeEnum = facilityLocation.getRelatedOne("TypeEnumeration", true)?if_exists> + <#assign locationTypeEnum = facilityLocation.getRelatedOne("TypeEnumeration", true)!> <option value="${facilityLocation.locationTypeEnumId}">${(locationTypeEnum.get("description",locale))?default(facilityLocation.locationTypeEnumId)}</option> <option value="${facilityLocation.locationTypeEnumId}">----</option> </#if> @@ -68,27 +68,27 @@ under the License. </tr> <tr> <td class="label">${uiLabelMap.CommonArea}</td> - <td><input type="text" name="areaId" value="${(facilityLocation.areaId)?if_exists}" size="19" maxlength="20" /></td> + <td><input type="text" name="areaId" value="${(facilityLocation.areaId)!}" size="19" maxlength="20" /></td> </tr> <tr> <td class="label">${uiLabelMap.ProductAisle}</td> - <td><input type="text" name="aisleId" value="${(facilityLocation.aisleId)?if_exists}" size="19" maxlength="20" /></td> + <td><input type="text" name="aisleId" value="${(facilityLocation.aisleId)!}" size="19" maxlength="20" /></td> </tr> <tr> <td class="label">${uiLabelMap.ProductSection}</td> - <td><input type="text" name="sectionId" value="${(facilityLocation.sectionId)?if_exists}" size="19" maxlength="20" /></td> + <td><input type="text" name="sectionId" value="${(facilityLocation.sectionId)!}" size="19" maxlength="20" /></td> </tr> <tr> <td class="label">${uiLabelMap.ProductLevel}</td> - <td><input type="text" name="levelId" value="${(facilityLocation.levelId)?if_exists}" size="19" maxlength="20" /></td> + <td><input type="text" name="levelId" value="${(facilityLocation.levelId)!}" size="19" maxlength="20" /></td> </tr> <tr> <td class="label">${uiLabelMap.ProductPosition}</td> - <td><input type="text" name="positionId" value="${(facilityLocation.positionId)?if_exists}" size="19" maxlength="20" /></td> + <td><input type="text" name="positionId" value="${(facilityLocation.positionId)!}" size="19" maxlength="20" /></td> </tr> <tr> <td> </td> - <#if locationSeqId?exists> + <#if locationSeqId??> <td><input type="submit" value="${uiLabelMap.CommonUpdate}" /></td> <#else> <td><input type="submit" value="${uiLabelMap.CommonSave}" /></td> @@ -96,7 +96,7 @@ under the License. </tr> </table> </form> - <#if locationSeqId?exists> + <#if locationSeqId??> <br /> <div class="screenlet"> <div class="screenlet-title-bar"> @@ -109,17 +109,17 @@ under the License. <td>${uiLabelMap.ProductProduct}</td> <td>${uiLabelMap.ProductMinimumStockAndMoveQuantity}</td> </tr> - <#list productFacilityLocations?if_exists as productFacilityLocation> - <#assign product = productFacilityLocation.getRelatedOne("Product", false)?if_exists> + <#list productFacilityLocations! as productFacilityLocation> + <#assign product = productFacilityLocation.getRelatedOne("Product", false)!> <tr> - <td><#if product?exists>${(product.internalName)?if_exists}</#if>[${productFacilityLocation.productId}]</td> + <td><#if product??>${(product.internalName)!}</#if>[${productFacilityLocation.productId}]</td> <td> <form method="post" action="<@ofbizUrl>updateProductFacilityLocation</@ofbizUrl>" id="lineForm${productFacilityLocation_index}"> - <input type="hidden" name="productId" value="${(productFacilityLocation.productId)?if_exists}"/> - <input type="hidden" name="facilityId" value="${(productFacilityLocation.facilityId)?if_exists}"/> - <input type="hidden" name="locationSeqId" value="${(productFacilityLocation.locationSeqId)?if_exists}"/> - <input type="text" size="10" name="minimumStock" value="${(productFacilityLocation.minimumStock)?if_exists}"/> - <input type="text" size="10" name="moveQuantity" value="${(productFacilityLocation.moveQuantity)?if_exists}"/> + <input type="hidden" name="productId" value="${(productFacilityLocation.productId)!}"/> + <input type="hidden" name="facilityId" value="${(productFacilityLocation.facilityId)!}"/> + <input type="hidden" name="locationSeqId" value="${(productFacilityLocation.locationSeqId)!}"/> + <input type="text" size="10" name="minimumStock" value="${(productFacilityLocation.minimumStock)!}"/> + <input type="text" size="10" name="moveQuantity" value="${(productFacilityLocation.moveQuantity)!}"/> <input type="submit" value="${uiLabelMap.CommonUpdate}"/> <a href="javascript:document.getElementById('lineForm${productFacilityLocation_index}').action='<@ofbizUrl>deleteProductFacilityLocation</@ofbizUrl>';document.getElementById('lineForm${productFacilityLocation_index}').submit();" class="buttontext">${uiLabelMap.CommonDelete}</a> </form> @@ -135,8 +135,8 @@ under the License. </div> <div class="screenlet-body"> <form method="post" action="<@ofbizUrl>createProductFacilityLocation</@ofbizUrl>" style="margin: 0;" name="createProductFacilityLocationForm"> - <input type="hidden" name="facilityId" value="${facilityId?if_exists}" /> - <input type="hidden" name="locationSeqId" value="${locationSeqId?if_exists}" /> + <input type="hidden" name="facilityId" value="${facilityId!}" /> + <input type="hidden" name="locationSeqId" value="${locationSeqId!}" /> <input type="hidden" name="useValues" value="true" /> <span class="label">${uiLabelMap.ProductProductId}</span><input type="text" size="10" name="productId" /> <span class="label">${uiLabelMap.ProductMinimumStock}</span><input type="text" size="10" name="minimumStock" /> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |