svn commit: r1618554 [18/38] - in /ofbiz/branches/OFBIZ-5312-ofb
Locked
svn commit: r1618554 [18/38] - in /ofbiz/branches/OFBIZ-5312-ofb
 
|
Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/catalog/product/EditProductFeatures.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/catalog/product/EditProductFeatures.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/catalog/product/EditProductFeatures.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/catalog/product/EditProductFeatures.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 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/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/catalog/product/EditProductInventoryItems.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/catalog/product/EditProductInventoryItems.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/catalog/product/EditProductInventoryItems.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/catalog/product/EditProductInventoryItems.ftl Mon Aug 18 07:42:27 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> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/catalog/product/EditProductQuickAdmin.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/catalog/product/EditProductQuickAdmin.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/catalog/product/EditProductQuickAdmin.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/catalog/product/EditProductQuickAdmin.ftl Mon Aug 18 07:42:27 2014 @@ -16,12 +16,12 @@ 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!> <#if product?has_content> <!-- First some general forms and scripts --> <form name="removeAssocForm" action="<@ofbizUrl>quickAdminUpdateProductAssoc</@ofbizUrl>"> - <input type="hidden" name="productId" value="${product.productId?if_exists}"/> - <input type="hidden" name="PRODUCT_ID" value="${product.productId?if_exists}"/> + <input type="hidden" name="productId" value="${product.productId!}"/> + <input type="hidden" name="PRODUCT_ID" value="${product.productId!}"/> <input type="hidden" name="PRODUCT_ID_TO" value=""/> <input type="hidden" name="PRODUCT_ASSOC_TYPE_ID" value="PRODUCT_VARIANT"/> <input type="hidden" name="FROM_DATE" value=""/> @@ -29,7 +29,7 @@ under the License. <input type="hidden" name="useValues" value="true"/> </form> <form name="removeSelectable" action="<@ofbizUrl>updateProductQuickAdminDelFeatureTypes</@ofbizUrl>"> - <input type="hidden" name="productId" value="${product.productId?if_exists}"/> + <input type="hidden" name="productId" value="${product.productId!}"/> <input type="hidden" name="productFeatureTypeId" value=""/> </form> <script language="JavaScript" type="text/javascript"> @@ -51,7 +51,7 @@ function removeSelectable(typeString, pr } function doPublish() { - window.open('/ecommerce/control/product?product_id=${productId?if_exists}'); + window.open('/ecommerce/control/product?product_id=${productId!}'); document.publish.submit(); } @@ -63,21 +63,21 @@ function doPublish() { <div class="screenlet-body"> <!-- Name update section --> <form action="<@ofbizUrl>updateProductQuickAdminName</@ofbizUrl>" method="post" style="margin: 0;" name="editProduct"> - <input type="hidden" name="productId" value="${productId?if_exists}"/> - <#if (product.isVirtual)?if_exists == "Y"> + <input type="hidden" name="productId" value="${productId!}"/> + <#if (product.isVirtual)! == "Y"> <input type="hidden" name="isVirtual" value="Y"/> </#if> <table cellspacing="0" class="basic-table"> <tr> - <td><h2>${productId?if_exists}</h2></td> - <td><input type="text" name="productName" size="40" maxlength="40" value="${product.productName?if_exists}"/></td> + <td><h2>${productId!}</h2></td> + <td><input type="text" name="productName" size="40" maxlength="40" value="${product.productName!}"/></td> <td><input type="submit" value="${uiLabelMap.ProductUpdateName}"/></td> </tr> </table> </form> </div> </div> -<#if (product.isVirtual)?if_exists == "Y"> +<#if (product.isVirtual)! == "Y"> <div class="screenlet"> <div class="screenlet-title-bar"> <h3>${uiLabelMap.ProductSelectableFeatures}</h3> @@ -85,19 +85,19 @@ function doPublish() { <div class="screenlet-body"> <!-- ***************************************************** Selectable features section --> <form action="<@ofbizUrl>EditProductQuickAdmin</@ofbizUrl>" method="post" style="margin: 0;" name="selectableFeatureTypeSelector"> - <input type="hidden" name="productId" value="${product.productId?if_exists}"/> + <input type="hidden" name="productId" value="${product.productId!}"/> <table cellspacing="0" class="basic-table"> <tr> <td colspan="2"><span class="label">${uiLabelMap.CommonType}</span> <select name="productFeatureTypeId" onchange="javascript:document.selectableFeatureTypeSelector.submit();"> <option value="~~any~~">${uiLabelMap.ProductAnyFeatureType}</option> <#list featureTypes as featureType> - <#if (featureType.productFeatureTypeId)?if_exists == (productFeatureTypeId)?if_exists> + <#if (featureType.productFeatureTypeId)! == (productFeatureTypeId)!> <#assign selected="selected"/> <#else> <#assign selected=""/> </#if> - <option ${selected} value="${featureType.productFeatureTypeId?if_exists}">${featureType.get("description",locale)?if_exists}</option> + <option ${selected} value="${featureType.productFeatureTypeId!}">${featureType.get("description",locale)!}</option> </#list> </select> </td> @@ -106,8 +106,8 @@ function doPublish() { </form> <br /> <form action="<@ofbizUrl>updateProductQuickAdminSelFeat</@ofbizUrl>" method="post" style="margin: 0;" name="selectableFeature"> - <input type="hidden" name="productId" value="${product.productId?if_exists}"/> - <input type="hidden" name="productFeatureTypeId" value="${(productFeatureTypeId)?if_exists}"/> + <input type="hidden" name="productId" value="${product.productId!}"/> + <input type="hidden" name="productFeatureTypeId" value="${(productFeatureTypeId)!}"/> <table cellspacing="0" class="basic-table"> <tr class="header-row"> <td><b>${uiLabelMap.ProductProductId}</b></td> @@ -123,15 +123,15 @@ function doPublish() { <#assign assocProduct = productAssoc.getRelatedOne("AssocProduct", false)/> <tr valign="middle"<#if rowClass == "1"> class="alternate-row"</#if>> <td nowrap="nowrap"> - <input type="hidden" name="productId${idx}" value="${assocProduct.productId?if_exists}"/> - <a class="buttontext" href="<@ofbizUrl>EditProduct?productId=${assocProduct.productId}</@ofbizUrl>">${assocProduct.productId?if_exists}</a></td> - <td width="100%"><a class="buttontext" href="<@ofbizUrl>EditProduct?productId=${assocProduct.productId}</@ofbizUrl>">${assocProduct.internalName?if_exists}</a></td> + <input type="hidden" name="productId${idx}" value="${assocProduct.productId!}"/> + <a class="buttontext" href="<@ofbizUrl>EditProduct?productId=${assocProduct.productId}</@ofbizUrl>">${assocProduct.productId!}</a></td> + <td width="100%"><a class="buttontext" href="<@ofbizUrl>EditProduct?productId=${assocProduct.productId}</@ofbizUrl>">${assocProduct.internalName!}</a></td> <td colspan="2"> - <input type="text" name="description${idx}" size="70" maxlength="100" value="${selFeatureDesc[assocProduct.productId]?if_exists}"/> + <input type="text" name="description${idx}" size="70" maxlength="100" value="${selFeatureDesc[assocProduct.productId]!}"/> </td> <#assign checked=""/> - <#if ((assocProduct.smallImageUrl?if_exists != "") && (assocProduct.smallImageUrl?if_exists == product.smallImageUrl?if_exists) && - (assocProduct.smallImageUrl?if_exists != "") && (assocProduct.smallImageUrl?if_exists == product.smallImageUrl?if_exists)) > + <#if ((assocProduct.smallImageUrl! != "") && (assocProduct.smallImageUrl! == product.smallImageUrl!) && + (assocProduct.smallImageUrl! != "") && (assocProduct.smallImageUrl! == product.smallImageUrl!)) > <#assign checked = "checked='checked'"/> </#if> <td><input type="radio" ${checked} name="useImages" value="${assocProduct.productId}"/></td> @@ -151,8 +151,8 @@ function doPublish() { <td> <table cellspacing="0" class="basic-table"> <#list selectableFeatureTypes as selectableFeatureType> - <tr><td><a class="buttontext" href="javascript:removeSelectable('${(selectableFeatureType.get("description",locale))?if_exists}','${selectableFeatureType.productFeatureTypeId}','${product.productId}')">x</a> - <a class="buttontext" href="<@ofbizUrl>EditProductQuickAdmin?productFeatureTypeId=${(selectableFeatureType.productFeatureTypeId)?if_exists}&productId=${product.productId?if_exists}</@ofbizUrl>">${(selectableFeatureType.get("description",locale))?if_exists}</a></td></tr> + <tr><td><a class="buttontext" href="javascript:removeSelectable('${(selectableFeatureType.get("description",locale))!}','${selectableFeatureType.productFeatureTypeId}','${product.productId}')">x</a> + <a class="buttontext" href="<@ofbizUrl>EditProductQuickAdmin?productFeatureTypeId=${(selectableFeatureType.productFeatureTypeId)!}&productId=${product.productId!}</@ofbizUrl>">${(selectableFeatureType.get("description",locale))!}</a></td></tr> </#list> </table> </td> @@ -167,14 +167,14 @@ function doPublish() { </div> </div> </#if> -<#if (product.isVariant)?if_exists == "Y"> +<#if (product.isVariant)! == "Y"> <div class="screenlet"> <div class="screenlet-title-bar"> <h3>${uiLabelMap.ProductDistinguishingFeatures}</h3> </div> <div class="screenlet-body"> <form action="<@ofbizUrl>updateProductQuickAdminDistFeat</@ofbizUrl>" method="post" style="margin: 0;" name="distFeature"> - <input type="hidden" name="productId" value="${product.productId?if_exists}"/> + <input type="hidden" name="productId" value="${product.productId!}"/> <table cellspacing="0" class="basic-table"> <tr class="header-row"> <td><b>${uiLabelMap.ProductProductId}</b></td> @@ -208,7 +208,7 @@ function doPublish() { <div class="screenlet-body"> <!-- ***************************************************** Shipping dimensions section --> <form action="<@ofbizUrl>updateProductQuickAdminShipping</@ofbizUrl>" method="post" name="updateShipping"> - <input type="hidden" name="productId" value="${product.productId?if_exists}"/> + <input type="hidden" name="productId" value="${product.productId!}"/> <input type="hidden" name="heightUomId" value="LEN_in"/> <input type="hidden" name="widthUomId" value="LEN_in"/> <input type="hidden" name="depthUomId" value="LEN_in"/> @@ -227,22 +227,22 @@ function doPublish() { <td><b>${uiLabelMap.ProductST}</b></td> <td><b>${uiLabelMap.ProductTD}</b></td> </tr> - <#if (product.isVirtual)?if_exists == "Y"> + <#if (product.isVirtual)! == "Y"> <#assign idx=0/> <#assign rowClass = "2"> <#list assocProducts as assocProduct> <tr valign="middle"<#if rowClass == "1"> class="alternate-row"</#if>> - <td><input type="text" name="productHeight${idx}" size="6" maxlength="20" value="${assocProduct.productHeight?if_exists}"/></td> - <td><input type="text" name="productWidth${idx}" size="6" maxlength="20" value="${assocProduct.productWidth?if_exists}"/></td> - <td><input type="text" name="productDepth${idx}" size="6" maxlength="20" value="${assocProduct.productDepth?if_exists}"/></td> - <td><input type="text" name="weight${idx}" size="6" maxlength="20" value="${assocProduct.weight?if_exists}"/></td> - <td><input type="text" name="~floz${idx}" size="6" maxlength="20" value="${featureFloz.get(assocProduct.productId)?if_exists}"/></td> - <td><input type="text" name="~ml${idx}" size="6" maxlength="20" value="${featureMl.get(assocProduct.productId)?if_exists}"/></td> - <td><input type="text" name="~ntwt${idx}" size="6" maxlength="20" value="${featureNtwt.get(assocProduct.productId)?if_exists}"/></td> - <td><input type="text" name="~grams${idx}" size="6" maxlength="20" value="${featureGrams.get(assocProduct.productId)?if_exists}"/></td> - <td><a class="buttontext" href="<@ofbizUrl>EditProductFeatures?productId=${assocProduct.productId}</@ofbizUrl>">${StringUtil.wrapString(featureHazmat.get(assocProduct.productId)?if_exists)}</a></td> - <td><a class="buttontext" href="<@ofbizUrl>EditProduct?productId=${assocProduct.productId}</@ofbizUrl>">${StringUtil.wrapString(featureSalesThru.get(assocProduct.productId)?if_exists)}</a></td> - <td><a class="buttontext" href="<@ofbizUrl>EditProductAssoc?productId=${assocProduct.productId}</@ofbizUrl>">${StringUtil.wrapString(featureThruDate.get(assocProduct.productId)?if_exists)}</a></td> + <td><input type="text" name="productHeight${idx}" size="6" maxlength="20" value="${assocProduct.productHeight!}"/></td> + <td><input type="text" name="productWidth${idx}" size="6" maxlength="20" value="${assocProduct.productWidth!}"/></td> + <td><input type="text" name="productDepth${idx}" size="6" maxlength="20" value="${assocProduct.productDepth!}"/></td> + <td><input type="text" name="weight${idx}" size="6" maxlength="20" value="${assocProduct.weight!}"/></td> + <td><input type="text" name="~floz${idx}" size="6" maxlength="20" value="${featureFloz.get(assocProduct.productId)!}"/></td> + <td><input type="text" name="~ml${idx}" size="6" maxlength="20" value="${featureMl.get(assocProduct.productId)!}"/></td> + <td><input type="text" name="~ntwt${idx}" size="6" maxlength="20" value="${featureNtwt.get(assocProduct.productId)!}"/></td> + <td><input type="text" name="~grams${idx}" size="6" maxlength="20" value="${featureGrams.get(assocProduct.productId)!}"/></td> + <td><a class="buttontext" href="<@ofbizUrl>EditProductFeatures?productId=${assocProduct.productId}</@ofbizUrl>">${StringUtil.wrapString(featureHazmat.get(assocProduct.productId)!)}</a></td> + <td><a class="buttontext" href="<@ofbizUrl>EditProduct?productId=${assocProduct.productId}</@ofbizUrl>">${StringUtil.wrapString(featureSalesThru.get(assocProduct.productId)!)}</a></td> + <td><a class="buttontext" href="<@ofbizUrl>EditProductAssoc?productId=${assocProduct.productId}</@ofbizUrl>">${StringUtil.wrapString(featureThruDate.get(assocProduct.productId)!)}</a></td> </tr> <#assign idx = idx + 1/> <#-- toggle the row color --> @@ -258,17 +258,17 @@ function doPublish() { </tr> <#else> <tr> - <td><input type="text" name="productHeight" size="6" maxlength="20" value="${product.productHeight?if_exists}" /></td> - <td><input type="text" name="productWidth" size="6" maxlength="20" value="${product.productWidth?if_exists}" /></td> - <td><input type="text" name="productDepth" size="6" maxlength="20" value="${product.productDepth?if_exists}" /></td> - <td><input type="text" name="weight" size="6" maxlength="20" value="${product.weight?if_exists}" /></td> - <td><input type="text" name="~floz" size="6" maxlength="20" value="${floz?if_exists}" /></td> - <td><input type="text" name="~ml" size="6" maxlength="20" value="${ml?if_exists}" /></td> - <td><input type="text" name="~ntwt" size="6" maxlength="20" value="${ntwt?if_exists}" /></td> - <td><input type="text" name="~grams" size="6" maxlength="20" value="${grams?if_exists}" /></td> - <td><a class="buttontext" href="<@ofbizUrl>EditProductFeatures?productId=${product.productId}</@ofbizUrl>">${StringUtil.wrapString(hazmat?if_exists)}</a></td> - <td><a class="buttontext" href="<@ofbizUrl>EditProduct?productId=${product.productId}</@ofbizUrl>">${StringUtil.wrapString(salesthru?if_exists)}</a></td> - <td><a class="buttontext" href="<@ofbizUrl>EditProductAssoc?productId=${product.productId}</@ofbizUrl>">${StringUtil.wrapString(thrudate?if_exists)}</a></td> + <td><input type="text" name="productHeight" size="6" maxlength="20" value="${product.productHeight!}" /></td> + <td><input type="text" name="productWidth" size="6" maxlength="20" value="${product.productWidth!}" /></td> + <td><input type="text" name="productDepth" size="6" maxlength="20" value="${product.productDepth!}" /></td> + <td><input type="text" name="weight" size="6" maxlength="20" value="${product.weight!}" /></td> + <td><input type="text" name="~floz" size="6" maxlength="20" value="${floz!}" /></td> + <td><input type="text" name="~ml" size="6" maxlength="20" value="${ml!}" /></td> + <td><input type="text" name="~ntwt" size="6" maxlength="20" value="${ntwt!}" /></td> + <td><input type="text" name="~grams" size="6" maxlength="20" value="${grams!}" /></td> + <td><a class="buttontext" href="<@ofbizUrl>EditProductFeatures?productId=${product.productId}</@ofbizUrl>">${StringUtil.wrapString(hazmat!)}</a></td> + <td><a class="buttontext" href="<@ofbizUrl>EditProduct?productId=${product.productId}</@ofbizUrl>">${StringUtil.wrapString(salesthru!)}</a></td> + <td><a class="buttontext" href="<@ofbizUrl>EditProductAssoc?productId=${product.productId}</@ofbizUrl>">${StringUtil.wrapString(thrudate!)}</a></td> </tr> <tr> <td colspan="10" align="right"><input type="submit" value="${uiLabelMap.ProductUpdateShipping}" /></td> @@ -292,7 +292,7 @@ function doPublish() { <td> <#if addedFeatureTypeIds?has_content> <form method="post" action="<@ofbizUrl>quickAdminApplyFeatureToProduct</@ofbizUrl>" name="addFeatureById"> - <input type="hidden" name="productId" value="${product.productId?if_exists}"/> + <input type="hidden" name="productId" value="${product.productId!}"/> <input type="hidden" name="productFeatureApplTypeId" value="STANDARD_FEATURE"/> <input type="hidden" name="fromDate" value="${nowTimestampString}"/> <table cellspacing="0" class="basic-table"> @@ -329,7 +329,7 @@ function doPublish() { <#list standardFeatureAppls as standardFeatureAppl> <#assign featureId = standardFeatureAppl.productFeatureId/> <tr valign="middle"<#if rowClass == "1"> class="alternate-row"</#if>> - <td colspan="2"><a href='<@ofbizUrl>quickAdminRemoveFeatureFromProduct?productId=${standardFeatureAppl.productId?if_exists}&productFeatureId=${featureId?if_exists}&fromDate=${(standardFeatureAppl.fromDate)?if_exists}</@ofbizUrl>' class="buttontext">x</a> + <td colspan="2"><a href='<@ofbizUrl>quickAdminRemoveFeatureFromProduct?productId=${standardFeatureAppl.productId!}&productFeatureId=${featureId!}&fromDate=${(standardFeatureAppl.fromDate)!}</@ofbizUrl>' class="buttontext">x</a> ${productFeatureTypeLookup.get(featureId).description}: ${standardFeatureLookup.get(featureId).description} </td> </tr> @@ -348,15 +348,15 @@ function doPublish() { <br /> </#if> <form action="<@ofbizUrl>EditProductQuickAdmin</@ofbizUrl>"> - <input type="hidden" name="productFeatureTypeId" value="${(productFeatureTypeId)?if_exists}"/> - <input type="hidden" name="productId" value="${product.productId?if_exists}"/> + <input type="hidden" name="productFeatureTypeId" value="${(productFeatureTypeId)!}"/> + <input type="hidden" name="productId" value="${product.productId!}"/> <table cellspacing="0" class="basic-table"> <tr> <td align="right">${uiLabelMap.ProductFeatureTypes}</td> <td> <select multiple="multiple" name="addFeatureTypeId"> <#list featureTypes as featureType> - <option value="${featureType.productFeatureTypeId?if_exists}">${featureType.get("description",locale)?if_exists}</option> + <option value="${featureType.productFeatureTypeId!}">${featureType.get("description",locale)!}</option> </#list> </select> </td> @@ -375,7 +375,7 @@ function doPublish() { <!-- **************************************************** Categories section --> <form action="<@ofbizUrl>quickAdminAddCategories</@ofbizUrl>"> <input type="hidden" name="fromDate" value="${nowTimestampString}"/> - <input type="hidden" name="productId" value="${product.productId?if_exists}"/> + <input type="hidden" name="productId" value="${product.productId!}"/> <table cellspacing="0" class="basic-table"> <tr> <td> @@ -384,7 +384,7 @@ function doPublish() { <td> <select multiple="multiple" name="categoryId"> <#list allCategories as category> - <option value="${category.productCategoryId?if_exists}">${category.description?if_exists} ${category.productCategoryId}</option> + <option value="${category.productCategoryId!}">${category.description!} ${category.productCategoryId}</option> </#list> </select> </td> @@ -407,11 +407,11 @@ function doPublish() { <tr valign="middle"<#if rowClass == "1"> class="alternate-row"</#if>> <td colspan="2"> <form name="quickAdminRemoveProductFromCategory_${prodCatMemb_index}" action="<@ofbizUrl>quickAdminRemoveProductFromCategory</@ofbizUrl>" method="post"> - <input type="hidden" name="productId" value="${prodCatMemb.productId?if_exists}" /> + <input type="hidden" name="productId" value="${prodCatMemb.productId!}" /> <input type="hidden" name="productCategoryId" value="${prodCatMemb.productCategoryId}" /> - <input type="hidden" name="fromDate" value="${(prodCatMemb.fromDate)?if_exists}" /> + <input type="hidden" name="fromDate" value="${(prodCatMemb.fromDate)!}" /> <a href="javascript:document.quickAdminRemoveProductFromCategory_${prodCatMemb_index}.submit();" class="buttontext">x</a> - ${prodCat.description?if_exists} ${prodCat.productCategoryId} + ${prodCat.description!} ${prodCat.productCategoryId} </form> </td> </tr> @@ -437,8 +437,8 @@ function doPublish() { <!-- **************************************************** publish section --> <#if (showPublish == "true")> <form action="<@ofbizUrl>quickAdminAddCategories</@ofbizUrl>" name="publish"> - <input type="hidden" name="productId" value="${product.productId?if_exists}"/> - <input type="hidden" name="categoryId" value="${allCategoryId?if_exists}"/> + <input type="hidden" name="productId" value="${product.productId!}"/> + <input type="hidden" name="categoryId" value="${allCategoryId!}"/> <table cellspacing="0" class="basic-table"> <tr> <td> @@ -450,8 +450,8 @@ function doPublish() { </form> <#else> <form action="<@ofbizUrl>quickAdminUnPublish</@ofbizUrl>" name="unpublish"> - <input type="hidden" name="productId" value="${product.productId?if_exists}"/> - <input type="hidden" name="productCategoryId" value="${allCategoryId?if_exists}"/> + <input type="hidden" name="productId" value="${product.productId!}"/> + <input type="hidden" name="productCategoryId" value="${allCategoryId!}"/> <table cellspacing="0" class="basic-table"> <tr> <td> @@ -466,5 +466,5 @@ function doPublish() { </div> </div> <#else> - <h3>${uiLabelMap.ProductProductNotFound} ${productId?if_exists}</h3> + <h3>${uiLabelMap.ProductProductNotFound} ${productId!}</h3> </#if> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/catalog/product/ProductInventorySummary.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/catalog/product/ProductInventorySummary.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/catalog/product/ProductInventorySummary.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/catalog/product/ProductInventorySummary.ftl Mon Aug 18 07:42:27 2014 @@ -16,13 +16,13 @@ KIND, either express or implied. See th specific language governing permissions and limitations under the License. --> -<#if parameters.showAllFacilities?exists> +<#if parameters.showAllFacilities??> <a href="EditProductInventoryItems?productId=${productId}" class="buttontext">${uiLabelMap.ProductShowProductFacilities}</a> <#else> <a href="EditProductInventoryItems?productId=${productId}&showAllFacilities=Y" class="buttontext">${uiLabelMap.ProductShowAllFacilities}</a> </#if> <div class="screenlet"> - <#if product?exists> + <#if product??> <div class="screenlet-title-bar"> <h3>${uiLabelMap.ProductInventorySummary}</h3> </div> @@ -42,33 +42,33 @@ under the License. </tr> <#assign rowClass = "2"> <#list quantitySummaryByFacility.values() as quantitySummary> - <#if quantitySummary.facilityId?exists> + <#if quantitySummary.facilityId??> <#assign facilityId = quantitySummary.facilityId> <#assign facility = delegator.findOne("Facility", Static["org.ofbiz.base.util.UtilMisc"].toMap("facilityId", facilityId), false)> - <#assign manufacturingInQuantitySummary = manufacturingInQuantitySummaryByFacility.get(facilityId)?if_exists> - <#assign manufacturingOutQuantitySummary = manufacturingOutQuantitySummaryByFacility.get(facilityId)?if_exists> - <#assign totalQuantityOnHand = quantitySummary.totalQuantityOnHand?if_exists> - <#assign totalAvailableToPromise = quantitySummary.totalAvailableToPromise?if_exists> - <#assign mktgPkgATP = quantitySummary.mktgPkgATP?if_exists> - <#assign mktgPkgQOH = quantitySummary.mktgPkgQOH?if_exists> - <#assign incomingShipmentAndItemList = quantitySummary.incomingShipmentAndItemList?if_exists> - <#assign incomingProductionRunList = manufacturingInQuantitySummary.incomingProductionRunList?if_exists> - <#assign incomingQuantityTotal = manufacturingInQuantitySummary.estimatedQuantityTotal?if_exists> - <#assign outgoingProductionRunList = manufacturingOutQuantitySummary.outgoingProductionRunList?if_exists> - <#assign outgoingQuantityTotal = manufacturingOutQuantitySummary.estimatedQuantityTotal?if_exists> + <#assign manufacturingInQuantitySummary = manufacturingInQuantitySummaryByFacility.get(facilityId)!> + <#assign manufacturingOutQuantitySummary = manufacturingOutQuantitySummaryByFacility.get(facilityId)!> + <#assign totalQuantityOnHand = quantitySummary.totalQuantityOnHand!> + <#assign totalAvailableToPromise = quantitySummary.totalAvailableToPromise!> + <#assign mktgPkgATP = quantitySummary.mktgPkgATP!> + <#assign mktgPkgQOH = quantitySummary.mktgPkgQOH!> + <#assign incomingShipmentAndItemList = quantitySummary.incomingShipmentAndItemList!> + <#assign incomingProductionRunList = manufacturingInQuantitySummary.incomingProductionRunList!> + <#assign incomingQuantityTotal = manufacturingInQuantitySummary.estimatedQuantityTotal!> + <#assign outgoingProductionRunList = manufacturingOutQuantitySummary.outgoingProductionRunList!> + <#assign outgoingQuantityTotal = manufacturingOutQuantitySummary.estimatedQuantityTotal!> <tr valign="middle"<#if rowClass == "1"> class="alternate-row"</#if>> - <td>${(facility.facilityName)?if_exists} [${facilityId?default("[No Facility]")}] + <td>${(facility.facilityName)!} [${facilityId?default("[No Facility]")}] <a href="/facility/control/ReceiveInventory?facilityId=${facilityId}&productId=${productId}&externLoginKey=${externalLoginKey}" class="buttontext">${uiLabelMap.ProductInventoryReceive}</a></td> - <td><#if totalAvailableToPromise?exists>${totalAvailableToPromise}<#else> </#if></td> - <td><#if totalQuantityOnHand?exists>${totalQuantityOnHand}<#else> </#if></td> + <td><#if totalAvailableToPromise??>${totalAvailableToPromise}<#else> </#if></td> + <td><#if totalQuantityOnHand??>${totalQuantityOnHand}<#else> </#if></td> <#if isMarketingPackage == "true"> - <td><#if mktgPkgATP?exists>${mktgPkgATP}<#else> </#if></td> - <td><#if mktgPkgQOH?exists>${mktgPkgQOH}<#else> </#if></td> + <td><#if mktgPkgATP??>${mktgPkgATP}<#else> </#if></td> + <td><#if mktgPkgQOH??>${mktgPkgQOH}<#else> </#if></td> </#if> <td> <#if incomingShipmentAndItemList?has_content> <#list incomingShipmentAndItemList as incomingShipmentAndItem> - <div>${incomingShipmentAndItem.shipmentId}:${incomingShipmentAndItem.shipmentItemSeqId}-${(incomingShipmentAndItem.estimatedArrivalDate.toString())?if_exists}-<#if incomingShipmentAndItem.quantity?exists>${incomingShipmentAndItem.quantity?string.number}<#else>[${uiLabelMap.ProductQuantityNotSet}]</#if></div> + <div>${incomingShipmentAndItem.shipmentId}:${incomingShipmentAndItem.shipmentItemSeqId}-${(incomingShipmentAndItem.estimatedArrivalDate.toString())!}-<#if incomingShipmentAndItem.quantity??>${incomingShipmentAndItem.quantity?string.number}<#else>[${uiLabelMap.ProductQuantityNotSet}]</#if></div> </#list> <#else> <div> </div> @@ -77,9 +77,9 @@ under the License. <td> <#if incomingProductionRunList?has_content> <#list incomingProductionRunList as incomingProductionRun> - <div>${incomingProductionRun.workEffortId}-${(incomingProductionRun.estimatedCompletionDate.toString())?if_exists}-<#if incomingProductionRun.estimatedQuantity?exists>${incomingProductionRun.estimatedQuantity?string.number}<#else>[${uiLabelMap.ProductQuantityNotSet}]</#if></div> + <div>${incomingProductionRun.workEffortId}-${(incomingProductionRun.estimatedCompletionDate.toString())!}-<#if incomingProductionRun.estimatedQuantity??>${incomingProductionRun.estimatedQuantity?string.number}<#else>[${uiLabelMap.ProductQuantityNotSet}]</#if></div> </#list> - <div><b>${uiLabelMap.CommonTotal}: ${incomingQuantityTotal?if_exists}</b></div> + <div><b>${uiLabelMap.CommonTotal}: ${incomingQuantityTotal!}</b></div> <#else> <div> </div> </#if> @@ -87,9 +87,9 @@ under the License. <td> <#if outgoingProductionRunList?has_content> <#list outgoingProductionRunList as outgoingProductionRun> - <div>${outgoingProductionRun.workEffortParentId?default("")}:${outgoingProductionRun.workEffortId}-${(outgoingProductionRun.estimatedStartDate.toString())?if_exists}-<#if outgoingProductionRun.estimatedQuantity?exists>${outgoingProductionRun.estimatedQuantity?string.number}<#else>[${uiLabelMap.ProductQuantityNotSet}]</#if></div> + <div>${outgoingProductionRun.workEffortParentId?default("")}:${outgoingProductionRun.workEffortId}-${(outgoingProductionRun.estimatedStartDate.toString())!}-<#if outgoingProductionRun.estimatedQuantity??>${outgoingProductionRun.estimatedQuantity?string.number}<#else>[${uiLabelMap.ProductQuantityNotSet}]</#if></div> </#list> - <div><b>${uiLabelMap.CommonTotal}: ${outgoingQuantityTotal?if_exists}</b></div> + <div><b>${uiLabelMap.CommonTotal}: ${outgoingQuantityTotal!}</b></div> <#else> <div> </div> </#if> @@ -107,6 +107,6 @@ under the License. </table> </div> <#else> - <h2>${uiLabelMap.ProductProductNotFound} ${productId?if_exists}!</h2> + <h2>${uiLabelMap.ProductProductNotFound} ${productId!}!</h2> </#if> </div> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/catalog/product/QuickAddVariants.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/catalog/product/QuickAddVariants.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/catalog/product/QuickAddVariants.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/catalog/product/QuickAddVariants.ftl Mon Aug 18 07:42:27 2014 @@ -45,7 +45,7 @@ function clickAll(e) { } } </script> -<#if (product.isVirtual)?if_exists != "Y"> +<#if (product.isVirtual)! != "Y"> <h2>${uiLabelMap.ProductWarningProductNotVirtual}</h2> </#if> <#if featureTypes?has_content && (featureTypes.size() > 0)> @@ -75,7 +75,7 @@ function clickAll(e) { <#assign productFeatureIds = ""> <#list curProductFeatureAndAppls as productFeatureAndAppl> <td> - ${productFeatureAndAppl.description?if_exists} + ${productFeatureAndAppl.description!} <#assign productFeatureIds = productFeatureIds + "|" + productFeatureAndAppl.productFeatureId> </td> </#list> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/catalog/product/ViewProductOrders.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/catalog/product/ViewProductOrders.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/catalog/product/ViewProductOrders.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/catalog/product/ViewProductOrders.ftl Mon Aug 18 07:42:27 2014 @@ -50,7 +50,7 @@ under the License. <form name="paginationForm" method="post" action="<@ofbizUrl>viewProductOrder</@ofbizUrl>"> <input type="hidden" name="viewSize"/> <input type="hidden" name="viewIndex"/> - <#if paramIdList?exists && paramIdList?has_content> + <#if paramIdList?? && paramIdList?has_content> <#list paramIdList as paramIds> <#assign paramId = paramIds.split("=")/> <#if "productId" == paramId[0]> @@ -70,7 +70,7 @@ under the License. <td>${uiLabelMap.OrderQuantity}</td> <td>${uiLabelMap.OrderOrderType}</td> </tr> - <#if orderList?has_content && productId?exists> + <#if orderList?has_content && productId??> <#list orderList as order> <#assign orderItems = delegator.findByAnd("OrderItem", {"orderId" : order.orderId, "productId" : productId}, null, false)/> <#list orderItems as orderItem> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/catalog/promo/EditProductPromoCode.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/catalog/promo/EditProductPromoCode.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/catalog/promo/EditProductPromoCode.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/catalog/promo/EditProductPromoCode.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 productPromoCode?exists> +<#if productPromoCode??> <div class="screenlet"> <div class="screenlet-title-bar"> <h3>${uiLabelMap.ProductPromoCodeEmails}</h3> @@ -34,16 +34,16 @@ under the License. </#list> <div> <form method="post" action="<@ofbizUrl>createProductPromoCodeEmail</@ofbizUrl>" style="margin: 0;"> - <input type="hidden" name="productPromoCodeId" value="${productPromoCodeId?if_exists}"/> + <input type="hidden" name="productPromoCodeId" value="${productPromoCodeId!}"/> <input type="hidden" name="productPromoId" value="${productPromoId}"/> <span class="label">${uiLabelMap.ProductAddEmail}:</span><input type="text" size="40" name="emailAddress" /> <input type="submit" value="${uiLabelMap.CommonAdd}" /> </form> - <#if productPromoCode.requireEmailOrParty?if_exists == "N"> + <#if productPromoCode.requireEmailOrParty! == "N"> <div class="tooltip">${uiLabelMap.ProductNoteRequireEmailParty}</div> </#if> - <form method="post" action="<@ofbizUrl>createBulkProductPromoCodeEmail?productPromoCodeId=${productPromoCodeId?if_exists}</@ofbizUrl>" enctype="multipart/form-data" style="margin: 0;"> - <input type="hidden" name="productPromoCodeId" value="${productPromoCodeId?if_exists}"/> + <form method="post" action="<@ofbizUrl>createBulkProductPromoCodeEmail?productPromoCodeId=${productPromoCodeId!}</@ofbizUrl>" enctype="multipart/form-data" style="margin: 0;"> + <input type="hidden" name="productPromoCodeId" value="${productPromoCodeId!}"/> <input type="hidden" name="productPromoId" value="${productPromoId}"/> <input type="file" size="40" name="uploadedFile" /> <input type="submit" value="${uiLabelMap.CommonUpload}" /> @@ -61,7 +61,7 @@ under the License. </#list> <div> <form method="post" action="<@ofbizUrl>createProductPromoCodeParty</@ofbizUrl>"> - <input type="hidden" name="productPromoCodeId" value="${productPromoCodeId?if_exists}"/> + <input type="hidden" name="productPromoCodeId" value="${productPromoCodeId!}"/> <input type="hidden" name="productPromoId" value="${productPromoId}"/> <span class="label">${uiLabelMap.ProductAddPartyId}:</span><input type="text" size="10" name="partyId" /> <input type="submit" value="${uiLabelMap.CommonAdd}" /> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |