svn commit: r1552154 - in /ofbiz/branches/release13.07: ./ applications/manufacturing/web
Locked
svn commit: r1552154 - in /ofbiz/branches/release13.07: ./ applications/manufacturing/web
 
|
Author: jleroux
Date: Wed Dec 18 23:07:21 2013 New Revision: 1552154 URL: http://svn.apache.org/r1552154 Log: "Applied fix from trunk for revision: 1552149" ------------------------------------------------------------------------ r1552149 | jleroux | 2013-12-19 00:00:57 +0100 (jeu. 19 déc. 2013) | 3 lignes Fixes an issue where externalKeyParam was not escaped in link so was useless (this is only in .ftl files) Actually the right thing to do should be to work on migrating all freemarker templates in backend to widgets and using target-type="inter-app" for those. I know Adrian has opened a Jira for that, next task in my TODO list. Without this effort we will never be able to style the backend uniformly, notably in custom projects... ------------------------------------------------------------------------ Modified: ofbiz/branches/release13.07/ (props changed) ofbiz/branches/release13.07/applications/manufacturing/webapp/manufacturing/bom/BomSimulation.ftl ofbiz/branches/release13.07/applications/order/webapp/ordermgr/entry/cart/showcartitems.ftl ofbiz/branches/release13.07/applications/order/webapp/ordermgr/entry/checkinits.ftl ofbiz/branches/release13.07/applications/order/webapp/ordermgr/order/ordercontactinfo.ftl ofbiz/branches/release13.07/applications/order/webapp/ordermgr/order/orderinfo.ftl ofbiz/branches/release13.07/applications/order/webapp/ordermgr/order/orderitems.ftl ofbiz/branches/release13.07/applications/order/webapp/ordermgr/order/orderpaymentinfo.ftl ofbiz/branches/release13.07/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl ofbiz/branches/release13.07/applications/order/webapp/ordermgr/return/quickReturn.ftl ofbiz/branches/release13.07/applications/order/webapp/ordermgr/return/returnHeader.ftl ofbiz/branches/release13.07/applications/order/webapp/ordermgr/return/returnItems.ftl ofbiz/branches/release13.07/applications/order/webapp/ordermgr/return/returnList.ftl ofbiz/branches/release13.07/applications/order/webapp/ordermgr/task/ordertasklist.ftl ofbiz/branches/release13.07/applications/party/webapp/partymgr/party/profileblocks/FinAccounts.ftl ofbiz/branches/release13.07/applications/party/webapp/partymgr/party/profileblocks/PaymentMethods.ftl ofbiz/branches/release13.07/applications/product/webapp/catalog/product/EditProductInventoryItems.ftl ofbiz/branches/release13.07/applications/product/webapp/facility/facility/PicklistOptions.ftl ofbiz/branches/release13.07/applications/product/webapp/facility/inventory/receiveInventory.ftl ofbiz/branches/release13.07/applications/product/webapp/facility/returns/receiveReturn.ftl ofbiz/branches/release13.07/applications/product/webapp/facility/shipment/PackOrder.ftl ofbiz/branches/release13.07/applications/product/webapp/facility/shipment/VerifyPick.ftl ofbiz/branches/release13.07/applications/product/webapp/facility/shipment/WeightPackage.ftl ofbiz/branches/release13.07/themes/flatgrey/includes/appbar.ftl ofbiz/branches/release13.07/themes/flatgrey/includes/header.ftl Propchange: ofbiz/branches/release13.07/ ------------------------------------------------------------------------------ Merged /ofbiz/trunk:r1552149 Modified: ofbiz/branches/release13.07/applications/manufacturing/webapp/manufacturing/bom/BomSimulation.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/release13.07/applications/manufacturing/webapp/manufacturing/bom/BomSimulation.ftl?rev=1552154&r1=1552153&r2=1552154&view=diff ============================================================================== --- ofbiz/branches/release13.07/applications/manufacturing/webapp/manufacturing/bom/BomSimulation.ftl (original) +++ ofbiz/branches/release13.07/applications/manufacturing/webapp/manufacturing/bom/BomSimulation.ftl Wed Dec 18 23:07:21 2013 @@ -110,7 +110,7 @@ under the License. <#list productsData as productData> <#assign node = productData.node> <tr valign="middle"<#if alt_row> class="alternate-row"</#if>> - <td><a href="/catalog/control/EditProduct?productId=${node.product.productId}${externalKeyParam}" class="buttontext">${node.product.productId}</a></td> + <td><a href="/catalog/control/EditProduct?productId=${node.product.productId}${StringUtil.wrapString(externalKeyParam)}" class="buttontext">${node.product.productId}</a></td> <td>${node.product.internalName?default(" ")}</td> <td align="right">${node.quantity}</td> <td align="right">${productData.qoh?if_exists}</td> @@ -118,7 +118,7 @@ under the License. <#if productData.unitCost?exists && (productData.unitCost > 0)> <td align="right">${productData.unitCost?if_exists}</td> <#else> - <td align="right"><a href="/catalog/control/EditProductCosts?productId=${node.product.productId}${externalKeyParam}" class="buttontext">NA</a></td> + <td align="right"><a href="/catalog/control/EditProductCosts?productId=${node.product.productId}${StringUtil.wrapString(externalKeyParam)}" class="buttontext">NA</a></td> </#if> <td align="right">${productData.totalCost?if_exists}</td> </tr> Modified: ofbiz/branches/release13.07/applications/order/webapp/ordermgr/entry/cart/showcartitems.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/release13.07/applications/order/webapp/ordermgr/entry/cart/showcartitems.ftl?rev=1552154&r1=1552153&r2=1552154&view=diff ============================================================================== --- ofbiz/branches/release13.07/applications/order/webapp/ordermgr/entry/cart/showcartitems.ftl (original) +++ ofbiz/branches/release13.07/applications/order/webapp/ordermgr/entry/cart/showcartitems.ftl Wed Dec 18 23:07:21 2013 @@ -109,7 +109,7 @@ under the License. <#if cartLine.getAttribute("surveyResponses")?has_content> <br />Surveys: <#list cartLine.getAttribute("surveyResponses") as surveyResponseId> - <a href="/content/control/ViewSurveyResponses?surveyResponseId=${surveyResponseId}${externalKeyParam}" class="buttontext" style="font-size: xx-small;">${surveyResponseId}</a> + <a href="/content/control/ViewSurveyResponses?surveyResponseId=${surveyResponseId}${StringUtil.wrapString(externalKeyParam)}" class="buttontext" style="font-size: xx-small;">${surveyResponseId}</a> </#list> </#if> </div> Modified: ofbiz/branches/release13.07/applications/order/webapp/ordermgr/entry/checkinits.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/release13.07/applications/order/webapp/ordermgr/entry/checkinits.ftl?rev=1552154&r1=1552153&r2=1552154&view=diff ============================================================================== --- ofbiz/branches/release13.07/applications/order/webapp/ordermgr/entry/checkinits.ftl (original) +++ ofbiz/branches/release13.07/applications/order/webapp/ordermgr/entry/checkinits.ftl Wed Dec 18 23:07:21 2013 @@ -38,7 +38,7 @@ under the License. <ul> <li class="h3">${uiLabelMap.OrderSalesOrder}<#if shoppingCart?exists> ${uiLabelMap.OrderInProgress}</#if></li> <li><a href="javascript:document.salesentryform.submit();">${uiLabelMap.CommonContinue}</a></li> - <li><a href="/partymgr/control/findparty?${externalKeyParam}">${uiLabelMap.PartyFindParty}</a></li> + <li><a href="/partymgr/control/findparty?${StringUtil.wrapString(externalKeyParam)}">${uiLabelMap.PartyFindParty}</a></li> </ul> <br class="clear"/> </div> @@ -130,7 +130,7 @@ under the License. <ul> <li class="h3">${uiLabelMap.OrderPurchaseOrder}<#if shoppingCart?exists> ${uiLabelMap.OrderInProgress}</#if></li> <li><a href="javascript:document.poentryform.submit();">${uiLabelMap.CommonContinue}</a></li> - <li><a href="/partymgr/control/findparty?${externalKeyParam}">${uiLabelMap.PartyFindParty}</a></li> + <li><a href="/partymgr/control/findparty?${StringUtil.wrapString(externalKeyParam)}">${uiLabelMap.PartyFindParty}</a></li> </ul> <br class="clear"/> </div> Modified: ofbiz/branches/release13.07/applications/order/webapp/ordermgr/order/ordercontactinfo.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/release13.07/applications/order/webapp/ordermgr/order/ordercontactinfo.ftl?rev=1552154&r1=1552153&r2=1552154&view=diff ============================================================================== --- ofbiz/branches/release13.07/applications/order/webapp/ordermgr/order/ordercontactinfo.ftl (original) +++ ofbiz/branches/release13.07/applications/order/webapp/ordermgr/order/ordercontactinfo.ftl Wed Dec 18 23:07:21 2013 @@ -84,7 +84,7 @@ under the License. ${displayPartyNameResult.fullName?default("[${uiLabelMap.OrderPartyNameNotFound}]")} </#if> <#if partyId?exists> - (<a href="${customerDetailLink}${partyId}${externalKeyParam}" target="partymgr" class="buttontext">${partyId}</a>) + (<a href="${customerDetailLink}${partyId}${StringUtil.wrapString(externalKeyParam)}" target="partymgr" class="buttontext">${partyId}</a>) <br/> <#if orderHeader.salesChannelEnumId != "POS_SALES_CHANNEL"> <div> Modified: ofbiz/branches/release13.07/applications/order/webapp/ordermgr/order/orderinfo.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/release13.07/applications/order/webapp/ordermgr/order/orderinfo.ftl?rev=1552154&r1=1552153&r2=1552154&view=diff ============================================================================== --- ofbiz/branches/release13.07/applications/order/webapp/ordermgr/order/orderinfo.ftl (original) +++ ofbiz/branches/release13.07/applications/order/webapp/ordermgr/order/orderinfo.ftl Wed Dec 18 23:07:21 2013 @@ -164,7 +164,7 @@ under the License. <td align="right" valign="top" width="15%" class="label"> ${uiLabelMap.OrderProductStore}</td> <td width="5%"> </td> <td valign="top" width="80%"> - ${productStore.storeName!} <a href="/catalog/control/EditProductStore?productStoreId=${productStore.productStoreId}${externalKeyParam}" target="catalogmgr" class="buttontext">(${productStore.productStoreId})</a> + ${productStore.storeName!} <a href="/catalog/control/EditProductStore?productStoreId=${productStore.productStoreId}${StringUtil.wrapString(externalKeyParam)}" target="catalogmgr" class="buttontext">(${productStore.productStoreId})</a> </td> </tr> <tr><td colspan="3"><hr /></td></tr> @@ -174,7 +174,7 @@ under the License. <td width="5%"> </td> <td valign="top" width="80%"> <#if orderHeader.originFacilityId?has_content> - <a href="/facility/control/EditFacility?facilityId=${orderHeader.originFacilityId}${externalKeyParam}" target="facilitymgr" class="buttontext">${orderHeader.originFacilityId}</a> + <a href="/facility/control/EditFacility?facilityId=${orderHeader.originFacilityId}${StringUtil.wrapString(externalKeyParam)}" target="facilitymgr" class="buttontext">${orderHeader.originFacilityId}</a> <#else> ${uiLabelMap.CommonNA} </#if> @@ -186,7 +186,7 @@ under the License. <td width="5%"> </td> <td valign="top" width="80%"> <#if orderHeader.createdBy?has_content> - <a href="/partymgr/control/viewprofile?userlogin_id=${orderHeader.createdBy}${externalKeyParam}" target="partymgr" class="buttontext">${orderHeader.createdBy}</a> + <a href="/partymgr/control/viewprofile?userlogin_id=${orderHeader.createdBy}${StringUtil.wrapString(externalKeyParam)}" target="partymgr" class="buttontext">${orderHeader.createdBy}</a> <#else> ${uiLabelMap.CommonNotSet} </#if> Modified: ofbiz/branches/release13.07/applications/order/webapp/ordermgr/order/orderitems.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/release13.07/applications/order/webapp/ordermgr/order/orderitems.ftl?rev=1552154&r1=1552153&r2=1552154&view=diff ============================================================================== --- ofbiz/branches/release13.07/applications/order/webapp/ordermgr/order/orderitems.ftl (original) +++ ofbiz/branches/release13.07/applications/order/webapp/ordermgr/order/orderitems.ftl Wed Dec 18 23:07:21 2013 @@ -87,7 +87,7 @@ under the License. <a href="/content/control/ViewSimpleContent?contentId=${downloadContent.contentId}" class="buttontext" target="_blank">${uiLabelMap.ContentDownload}</a> </#list> </#if> - <a href="/catalog/control/EditProduct?productId=${productId}${externalKeyParam}" class="buttontext" target="_blank">${uiLabelMap.ProductCatalog}</a> + <a href="/catalog/control/EditProduct?productId=${productId}${StringUtil.wrapString(externalKeyParam)}" class="buttontext" target="_blank">${uiLabelMap.ProductCatalog}</a> <a href="/ecommerce/control/product?product_id=${productId}" class="buttontext" target="_blank">${uiLabelMap.OrderEcommerce}</a> <#if orderItemContentWrapper.get("IMAGE_URL")?has_content> <a href="<@ofbizUrl>viewimage?orderId=${orderId}&orderItemSeqId=${orderItem.orderItemSeqId}&orderContentTypeId=IMAGE_URL</@ofbizUrl>" @@ -124,7 +124,7 @@ under the License. <tr> <td style="text-align: right; padding-bottom: 10px;"> <a class="buttontext" - href="/catalog/control/EditProductInventoryItems?productId=${productId}&showAllFacilities=Y${externalKeyParam}" + href="/catalog/control/EditProductInventoryItems?productId=${productId}&showAllFacilities=Y${StringUtil.wrapString(externalKeyParam)}" target="_blank">${uiLabelMap.ProductInventory}</a> </td> <td> </td> @@ -327,7 +327,7 @@ under the License. <td colspan="6"> <#if orderItem.orderItemTypeId != "RENTAL_ORDER_ITEM"> <span class="label">${uiLabelMap.ManufacturingProductionRun}</span> - <a href="/manufacturing/control/ShowProductionRun?productionRunId=${workEffort.workEffortId}${externalKeyParam}" + <a href="/manufacturing/control/ShowProductionRun?productionRunId=${workEffort.workEffortId}${StringUtil.wrapString(externalKeyParam)}" class="buttontext">${workEffort.workEffortId}</a> ${uiLabelMap.OrderCurrentStatus} ${(delegator.findOne("StatusItem", Static["org.ofbiz.base.util.UtilMisc"].toMap("statusId", workEffort.getString("currentStatusId")), true).get("description",locale))?if_exists} @@ -418,7 +418,7 @@ under the License. (${orderItemAdjustment.comments?default("")}) </#if> <#if orderItemAdjustment.productPromoId?has_content> - <a href="/catalog/control/EditProductPromo?productPromoId=${orderItemAdjustment.productPromoId}${externalKeyParam}" + <a href="/catalog/control/EditProductPromo?productPromoId=${orderItemAdjustment.productPromoId}${StringUtil.wrapString(externalKeyParam)}" >${orderItemAdjustment.getRelatedOne("ProductPromo", false).getString("promoName")}</a> </#if> <#if orderItemAdjustment.orderAdjustmentTypeId == "SALES_TAX"> @@ -479,7 +479,7 @@ under the License. <tr<#if itemClass == "1"> class="alternate-row"</#if>> <td align="right" colspan="2"> <span class="label">${uiLabelMap.CommonSurveys}</span> - <a href="/content/control/ViewSurveyResponses?surveyResponseId=${survey.surveyResponseId}&surveyId=${survey.surveyId}${externalKeyParam}" + <a href="/content/control/ViewSurveyResponses?surveyResponseId=${survey.surveyResponseId}&surveyId=${survey.surveyId}${StringUtil.wrapString(externalKeyParam)}" class="buttontext">${survey.surveyId}</a> </td> <td colspan="5"> </td> @@ -543,7 +543,7 @@ under the License. <tr<#if itemClass == "1"> class="alternate-row"</#if>> <td align="right" colspan="2"> <span class="label">${uiLabelMap.CommonInventory}</span> - <a href="/facility/control/EditInventoryItem?inventoryItemId=${orderItemShipGrpInvRes.inventoryItemId}${externalKeyParam}" + <a href="/facility/control/EditInventoryItem?inventoryItemId=${orderItemShipGrpInvRes.inventoryItemId}${StringUtil.wrapString(externalKeyParam)}" class="buttontext">${orderItemShipGrpInvRes.inventoryItemId}</a> <span class="label">${uiLabelMap.OrderShipGroup}</span> ${orderItemShipGrpInvRes.shipGroupSeqId} </td> @@ -571,7 +571,7 @@ under the License. <td align="right" colspan="2"> <span class="label">${uiLabelMap.OrderPlannedInShipment}</span> <a target="facility" - href="/facility/control/ViewShipment?shipmentId=${orderShipment.shipmentId}${externalKeyParam}" + href="/facility/control/ViewShipment?shipmentId=${orderShipment.shipmentId}${StringUtil.wrapString(externalKeyParam)}" class="buttontext">${orderShipment.shipmentId}</a>: ${orderShipment.shipmentItemSeqId} </td> <td align="center"> @@ -590,7 +590,7 @@ under the License. <#if itemIssuance.shipmentId?has_content> <span class="label">${uiLabelMap.OrderIssuedToShipmentItem}</span> <a target="facility" - href="/facility/control/ViewShipment?shipmentId=${itemIssuance.shipmentId}${externalKeyParam}" + href="/facility/control/ViewShipment?shipmentId=${itemIssuance.shipmentId}${StringUtil.wrapString(externalKeyParam)}" class="buttontext">${itemIssuance.shipmentId}</a>: ${itemIssuance.shipmentItemSeqId?if_exists} <#else> <span class="label">${uiLabelMap.OrderIssuedWithoutShipment}</span> @@ -611,7 +611,7 @@ under the License. <#if itemIssuance.inventoryItemId?has_content> <#assign inventoryItem = itemIssuance.getRelatedOne("InventoryItem", false)/> <span class="label">${uiLabelMap.CommonInventory}</span> - <a href="/facility/control/EditInventoryItem?inventoryItemId=${itemIssuance.inventoryItemId}${externalKeyParam}" + <a href="/facility/control/EditInventoryItem?inventoryItemId=${itemIssuance.inventoryItemId}${StringUtil.wrapString(externalKeyParam)}" class="buttontext">${itemIssuance.inventoryItemId}</a> <span class="label">${uiLabelMap.OrderShipGroup}</span> ${itemIssuance.shipGroupSeqId?if_exists} <#if (inventoryItem.serialNumber?has_content)> @@ -636,12 +636,12 @@ under the License. <#if shipmentReceipt.shipmentId?has_content> <span class="label">${uiLabelMap.OrderShipmentReceived}</span> <a target="facility" - href="/facility/control/ViewShipment?shipmentId=${shipmentReceipt.shipmentId}${externalKeyParam}" + href="/facility/control/ViewShipment?shipmentId=${shipmentReceipt.shipmentId}${StringUtil.wrapString(externalKeyParam)}" class="buttontext">${shipmentReceipt.shipmentId}</a>:${shipmentReceipt.shipmentItemSeqId?if_exists} </#if> <#if shipmentReceipt.datetimeReceived?has_content>${Static["org.ofbiz.base.util.UtilFormatOut"].formatDateTime(shipmentReceipt.datetimeReceived, "", locale, timeZone)!}</#if> <span class="label">${uiLabelMap.CommonInventory}</span> - <a href="/facility/control/EditInventoryItem?inventoryItemId=${shipmentReceipt.inventoryItemId}${externalKeyParam}" + <a href="/facility/control/EditInventoryItem?inventoryItemId=${shipmentReceipt.inventoryItemId}${StringUtil.wrapString(externalKeyParam)}" class="buttontext">${shipmentReceipt.inventoryItemId}</a> </td> <td align="center"> Modified: ofbiz/branches/release13.07/applications/order/webapp/ordermgr/order/orderpaymentinfo.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/release13.07/applications/order/webapp/ordermgr/order/orderpaymentinfo.ftl?rev=1552154&r1=1552153&r2=1552154&view=diff ============================================================================== --- ofbiz/branches/release13.07/applications/order/webapp/ordermgr/order/orderpaymentinfo.ftl (original) +++ ofbiz/branches/release13.07/applications/order/webapp/ordermgr/order/orderpaymentinfo.ftl Wed Dec 18 23:07:21 2013 @@ -79,8 +79,8 @@ under the License. <td width="1%"> </td> <td valign="top" width="60%"> <#list invoices as invoice> - <div>${uiLabelMap.CommonNbr}<a href="/accounting/control/invoiceOverview?invoiceId=${invoice}${externalKeyParam}" class="buttontext">${invoice}</a> - (<a target="_BLANK" href="/accounting/control/invoice.pdf?invoiceId=${invoice}${externalKeyParam}" class="buttontext">PDF</a>)</div> + <div>${uiLabelMap.CommonNbr}<a href="/accounting/control/invoiceOverview?invoiceId=${invoice}${StringUtil.wrapString(externalKeyParam)}" class="buttontext">${invoice}</a> + (<a target="_BLANK" href="/accounting/control/invoice.pdf?invoiceId=${invoice}${StringUtil.wrapString(externalKeyParam)}" class="buttontext">PDF</a>)</div> </#list> </td> <td width="10%"> </td> @@ -144,7 +144,7 @@ under the License. <table class="basic-table" cellspacing='0'> <tr> <td valign="top"> - ${uiLabelMap.CommonNbr}<a href="/accounting/control/EditBillingAccount?billingAccountId=${billingAccount.billingAccountId}${externalKeyParam}" class="buttontext">${billingAccount.billingAccountId}</a> - ${billingAccount.description?if_exists} + ${uiLabelMap.CommonNbr}<a href="/accounting/control/EditBillingAccount?billingAccountId=${billingAccount.billingAccountId}${StringUtil.wrapString(externalKeyParam)}" class="buttontext">${billingAccount.billingAccountId}</a> - ${billingAccount.description?if_exists} </td> <td valign="top" align="right"> <#if orderPaymentPreference.statusId != "PAYMENT_SETTLED" && orderPaymentPreference.statusId != "PAYMENT_RECEIVED"> @@ -191,7 +191,7 @@ under the License. <#if (finAccountType?has_content)> ${finAccountType.description?default(finAccountType.finAccountTypeId)} </#if> - #${finAccount.finAccountCode?default(finAccount.finAccountId)} (<a href="/accounting/control/EditFinAccount?finAccountId=${finAccount.finAccountId}${externalKeyParam}" class="buttontext">${finAccount.finAccountId}</a>) + #${finAccount.finAccountCode?default(finAccount.finAccountId)} (<a href="/accounting/control/EditFinAccount?finAccountId=${finAccount.finAccountId}${StringUtil.wrapString(externalKeyParam)}" class="buttontext">${finAccount.finAccountId}</a>) <br /> ${finAccount.finAccountName?if_exists} <br /> @@ -199,10 +199,10 @@ under the License. <#-- Authorize and Capture transactions --> <div> <#if orderPaymentPreference.statusId != "PAYMENT_SETTLED"> - <a href="/accounting/control/AuthorizeTransaction?orderId=${orderId?if_exists}&orderPaymentPreferenceId=${orderPaymentPreference.orderPaymentPreferenceId}${externalKeyParam}" class="buttontext">${uiLabelMap.AccountingAuthorize}</a> + <a href="/accounting/control/AuthorizeTransaction?orderId=${orderId?if_exists}&orderPaymentPreferenceId=${orderPaymentPreference.orderPaymentPreferenceId}${StringUtil.wrapString(externalKeyParam)}" class="buttontext">${uiLabelMap.AccountingAuthorize}</a> </#if> <#if orderPaymentPreference.statusId == "PAYMENT_AUTHORIZED"> - <a href="/accounting/control/CaptureTransaction?orderId=${orderId?if_exists}&orderPaymentPreferenceId=${orderPaymentPreference.orderPaymentPreferenceId}${externalKeyParam}" class="buttontext">${uiLabelMap.AccountingCapture}</a> + <a href="/accounting/control/CaptureTransaction?orderId=${orderId?if_exists}&orderPaymentPreferenceId=${orderPaymentPreference.orderPaymentPreferenceId}${StringUtil.wrapString(externalKeyParam)}" class="buttontext">${uiLabelMap.AccountingCapture}</a> </#if> </div> </div> @@ -217,7 +217,7 @@ under the License. (<span class="label">${uiLabelMap.OrderReference}</span> ${gatewayResponse.referenceNum?if_exists} <span class="label">${uiLabelMap.OrderAvs}</span> ${gatewayResponse.gatewayAvsResult?default("N/A")} <span class="label">${uiLabelMap.OrderScore}</span> ${gatewayResponse.gatewayScoreResult?default("N/A")}) - <a href="/accounting/control/ViewGatewayResponse?paymentGatewayResponseId=${gatewayResponse.paymentGatewayResponseId}${externalKeyParam}" class="buttontext">${uiLabelMap.CommonDetails}</a> + <a href="/accounting/control/ViewGatewayResponse?paymentGatewayResponseId=${gatewayResponse.paymentGatewayResponseId}${StringUtil.wrapString(externalKeyParam)}" class="buttontext">${uiLabelMap.CommonDetails}</a> <#if gatewayResponse_has_next><hr /></#if> </#list> </div> @@ -248,7 +248,7 @@ under the License. <td width="60%"> <div> <#list paymentList as paymentMap> - <a href="/accounting/control/paymentOverview?paymentId=${paymentMap.paymentId}${externalKeyParam}" class="buttontext">${paymentMap.paymentId}</a><#if paymentMap_has_next><br /></#if> + <a href="/accounting/control/paymentOverview?paymentId=${paymentMap.paymentId}${StringUtil.wrapString(externalKeyParam)}" class="buttontext">${paymentMap.paymentId}</a><#if paymentMap_has_next><br /></#if> </#list> </div> </td> @@ -308,7 +308,7 @@ under the License. <td width="60%"> <div> <#list paymentList as paymentMap> - <a href="/accounting/control/paymentOverview?paymentId=${paymentMap.paymentId}${externalKeyParam}" class="buttontext">${paymentMap.paymentId}</a><#if paymentMap_has_next><br /></#if> + <a href="/accounting/control/paymentOverview?paymentId=${paymentMap.paymentId}${StringUtil.wrapString(externalKeyParam)}" class="buttontext">${paymentMap.paymentId}</a><#if paymentMap_has_next><br /></#if> </#list> </div> </td> @@ -356,10 +356,10 @@ under the License. <#-- Authorize and Capture transactions --> <div> <#if orderPaymentPreference.statusId != "PAYMENT_SETTLED"> - <a href="/accounting/control/AuthorizeTransaction?orderId=${orderId?if_exists}&orderPaymentPreferenceId=${orderPaymentPreference.orderPaymentPreferenceId}${externalKeyParam}" class="buttontext">${uiLabelMap.AccountingAuthorize}</a> + <a href="/accounting/control/AuthorizeTransaction?orderId=${orderId?if_exists}&orderPaymentPreferenceId=${orderPaymentPreference.orderPaymentPreferenceId}${StringUtil.wrapString(externalKeyParam)}" class="buttontext">${uiLabelMap.AccountingAuthorize}</a> </#if> <#if orderPaymentPreference.statusId == "PAYMENT_AUTHORIZED"> - <a href="/accounting/control/CaptureTransaction?orderId=${orderId?if_exists}&orderPaymentPreferenceId=${orderPaymentPreference.orderPaymentPreferenceId}${externalKeyParam}" class="buttontext">${uiLabelMap.AccountingCapture}</a> + <a href="/accounting/control/CaptureTransaction?orderId=${orderId?if_exists}&orderPaymentPreferenceId=${orderPaymentPreference.orderPaymentPreferenceId}${StringUtil.wrapString(externalKeyParam)}" class="buttontext">${uiLabelMap.AccountingCapture}</a> </#if> </div> <#else> @@ -377,7 +377,7 @@ under the License. (<span class="label">${uiLabelMap.OrderReference}</span> ${gatewayResponse.referenceNum?if_exists} <span class="label">${uiLabelMap.OrderAvs}</span> ${gatewayResponse.gatewayAvsResult?default("N/A")} <span class="label">${uiLabelMap.OrderScore}</span> ${gatewayResponse.gatewayScoreResult?default("N/A")}) - <a href="/accounting/control/ViewGatewayResponse?paymentGatewayResponseId=${gatewayResponse.paymentGatewayResponseId}${externalKeyParam}" class="buttontext">${uiLabelMap.CommonDetails}</a> + <a href="/accounting/control/ViewGatewayResponse?paymentGatewayResponseId=${gatewayResponse.paymentGatewayResponseId}${StringUtil.wrapString(externalKeyParam)}" class="buttontext">${uiLabelMap.CommonDetails}</a> <#if gatewayResponse_has_next><hr /></#if> </#list> </div> @@ -446,7 +446,7 @@ under the License. <td width="60%"> <div> <#list paymentList as paymentMap> - <a href="/accounting/control/paymentOverview?paymentId=${paymentMap.paymentId}${externalKeyParam}" class="buttontext">${paymentMap.paymentId}</a><#if paymentMap_has_next><br /></#if> + <a href="/accounting/control/paymentOverview?paymentId=${paymentMap.paymentId}${StringUtil.wrapString(externalKeyParam)}" class="buttontext">${paymentMap.paymentId}</a><#if paymentMap_has_next><br /></#if> </#list> </div> </td> @@ -505,7 +505,7 @@ under the License. <td width="60%"> <div> <#list paymentList as paymentMap> - <a href="/accounting/control/paymentOverview?paymentId=${paymentMap.paymentId}${externalKeyParam}" class="buttontext">${paymentMap.paymentId}</a><#if paymentMap_has_next><br /></#if> + <a href="/accounting/control/paymentOverview?paymentId=${paymentMap.paymentId}${StringUtil.wrapString(externalKeyParam)}" class="buttontext">${paymentMap.paymentId}</a><#if paymentMap_has_next><br /></#if> </#list> </div> </td> @@ -540,7 +540,7 @@ under the License. <td width="60%"> <div> <#list paymentList as paymentMap> - <a href="/accounting/control/paymentOverview?paymentId=${paymentMap.paymentId}${externalKeyParam}" class="buttontext">${paymentMap.paymentId}</a><#if paymentMap_has_next><br /></#if> + <a href="/accounting/control/paymentOverview?paymentId=${paymentMap.paymentId}${StringUtil.wrapString(externalKeyParam)}" class="buttontext">${paymentMap.paymentId}</a><#if paymentMap_has_next><br /></#if> </#list> </div> </td> @@ -567,8 +567,8 @@ under the License. <td width="1%"> </td> <td valign="top" width="60%"> <#list invoices as invoice> - <div>${uiLabelMap.CommonNbr}<a href="/accounting/control/invoiceOverview?invoiceId=${invoice}${externalKeyParam}" class="buttontext">${invoice}</a> - (<a target="_BLANK" href="/accounting/control/invoice.pdf?invoiceId=${invoice}${externalKeyParam}" class="buttontext">PDF</a>)</div> + <div>${uiLabelMap.CommonNbr}<a href="/accounting/control/invoiceOverview?invoiceId=${invoice}${StringUtil.wrapString(externalKeyParam)}" class="buttontext">${invoice}</a> + (<a target="_BLANK" href="/accounting/control/invoice.pdf?invoiceId=${invoice}${StringUtil.wrapString(externalKeyParam)}" class="buttontext">PDF</a>)</div> </#list> </td> <td width="10%"> </td> Modified: ofbiz/branches/release13.07/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/release13.07/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl?rev=1552154&r1=1552153&r2=1552154&view=diff ============================================================================== --- ofbiz/branches/release13.07/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl (original) +++ ofbiz/branches/release13.07/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl Wed Dec 18 23:07:21 2013 @@ -575,8 +575,8 @@ under the License. <td valign="top" width="80%"> <#list shipGroupShipments as shipment> <div> - ${uiLabelMap.CommonNbr}<a href="/facility/control/ViewShipment?shipmentId=${shipment.shipmentId}${externalKeyParam}" class="buttontext">${shipment.shipmentId}</a> - <a target="_BLANK" href="/facility/control/PackingSlip.pdf?shipmentId=${shipment.shipmentId}${externalKeyParam}" class="buttontext">${uiLabelMap.ProductPackingSlip}</a> + ${uiLabelMap.CommonNbr}<a href="/facility/control/ViewShipment?shipmentId=${shipment.shipmentId}${StringUtil.wrapString(externalKeyParam)}" class="buttontext">${shipment.shipmentId}</a> + <a target="_BLANK" href="/facility/control/PackingSlip.pdf?shipmentId=${shipment.shipmentId}${StringUtil.wrapString(externalKeyParam)}" class="buttontext">${uiLabelMap.ProductPackingSlip}</a> <#if "SALES_ORDER" == orderHeader.orderTypeId && "ORDER_COMPLETED" == orderHeader.statusId> <#assign shipmentRouteSegments = delegator.findByAnd("ShipmentRouteSegment", {"shipmentId" : shipment.shipmentId}, null, false)> <#if shipmentRouteSegments?has_content> @@ -608,7 +608,7 @@ under the License. <#if orderHeader.orderTypeId == "SALES_ORDER"> <#if !shipGroup.supplierPartyId?has_content> <#if orderHeader.statusId == "ORDER_APPROVED"> - <a href="/facility/control/PackOrder?facilityId=${storeFacilityId?if_exists}&orderId=${orderId}&shipGroupSeqId=${shipGroup.shipGroupSeqId}${externalKeyParam}" class="buttontext">${uiLabelMap.OrderPackShipmentForShipGroup}</a> + <a href="/facility/control/PackOrder?facilityId=${storeFacilityId?if_exists}&orderId=${orderId}&shipGroupSeqId=${shipGroup.shipGroupSeqId}${StringUtil.wrapString(externalKeyParam)}" class="buttontext">${uiLabelMap.OrderPackShipmentForShipGroup}</a> <br /> </#if> <a href="javascript:document.createShipment_${shipGroup.shipGroupSeqId}.submit()" class="buttontext">${uiLabelMap.OrderNewShipmentForShipGroup}</a> Modified: ofbiz/branches/release13.07/applications/order/webapp/ordermgr/return/quickReturn.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/release13.07/applications/order/webapp/ordermgr/return/quickReturn.ftl?rev=1552154&r1=1552153&r2=1552154&view=diff ============================================================================== --- ofbiz/branches/release13.07/applications/order/webapp/ordermgr/return/quickReturn.ftl (original) +++ ofbiz/branches/release13.07/applications/order/webapp/ordermgr/return/quickReturn.ftl Wed Dec 18 23:07:21 2013 @@ -61,7 +61,7 @@ under the License. <input type='text' size='20' name='paymentMethodId' /> </#if> <#if (party.partyId)?has_content> - <a href="/partymgr/control/editcreditcard?partyId=${party.partyId}${externalKeyParam}" target="partymgr" class="smallSubmit">${uiLabelMap.AccountingCreateNewCreditCard}</a> + <a href="/partymgr/control/editcreditcard?partyId=${party.partyId}${StringUtil.wrapString(externalKeyParam)}" target="partymgr" class="smallSubmit">${uiLabelMap.AccountingCreateNewCreditCard}</a> </#if> </td></tr> </table> Modified: ofbiz/branches/release13.07/applications/order/webapp/ordermgr/return/returnHeader.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/release13.07/applications/order/webapp/ordermgr/return/returnHeader.ftl?rev=1552154&r1=1552153&r2=1552154&view=diff ============================================================================== --- ofbiz/branches/release13.07/applications/order/webapp/ordermgr/return/returnHeader.ftl (original) +++ ofbiz/branches/release13.07/applications/order/webapp/ordermgr/return/returnHeader.ftl Wed Dec 18 23:07:21 2013 @@ -155,7 +155,7 @@ under the License. <input type='text' size='20' name='paymentMethodId' value="${returnHeader?if_exists.paymentMethodId?if_exists}"/> </#if> <#if (returnHeader.fromPartyId)?has_content> - <a href="/partymgr/control/editcreditcard?partyId=${returnHeader.fromPartyId}${externalKeyParam}" target="partymgr" class="smallSubmit">${uiLabelMap.AccountingCreateNewCreditCard}</a> + <a href="/partymgr/control/editcreditcard?partyId=${returnHeader.fromPartyId}${StringUtil.wrapString(externalKeyParam)}" target="partymgr" class="smallSubmit">${uiLabelMap.AccountingCreateNewCreditCard}</a> </#if> </td> </tr> Modified: ofbiz/branches/release13.07/applications/order/webapp/ordermgr/return/returnItems.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/release13.07/applications/order/webapp/ordermgr/return/returnItems.ftl?rev=1552154&r1=1552153&r2=1552154&view=diff ============================================================================== --- ofbiz/branches/release13.07/applications/order/webapp/ordermgr/return/returnItems.ftl (original) +++ ofbiz/branches/release13.07/applications/order/webapp/ordermgr/return/returnItems.ftl Wed Dec 18 23:07:21 2013 @@ -71,13 +71,13 @@ under the License. <#if returnHeader?has_content> <#if returnHeader.destinationFacilityId?has_content && returnHeader.statusId == "RETURN_ACCEPTED" && returnHeader.returnHeaderTypeId?starts_with("CUSTOMER_")> <#list returnShipmentIds as returnShipmentId> - <a href="/facility/control/ViewShipment?shipmentId=${returnShipmentId.shipmentId}${externalKeyParam}" class="buttontext">${uiLabelMap.ProductShipmentId} ${returnShipmentId.shipmentId}</a> - <a href="/facility/control/ReceiveReturn?facilityId=${returnHeader.destinationFacilityId}&returnId=${returnHeader.returnId?if_exists}&shipmentId=${returnShipmentId.shipmentId}${externalKeyParam}" class="buttontext">${uiLabelMap.OrderReceiveReturn}</a> + <a href="/facility/control/ViewShipment?shipmentId=${returnShipmentId.shipmentId}${StringUtil.wrapString(externalKeyParam)}" class="buttontext">${uiLabelMap.ProductShipmentId} ${returnShipmentId.shipmentId}</a> + <a href="/facility/control/ReceiveReturn?facilityId=${returnHeader.destinationFacilityId}&returnId=${returnHeader.returnId?if_exists}&shipmentId=${returnShipmentId.shipmentId}${StringUtil.wrapString(externalKeyParam)}" class="buttontext">${uiLabelMap.OrderReceiveReturn}</a> </#list> <#elseif returnHeader.statusId == "SUP_RETURN_ACCEPTED" && returnHeader.returnHeaderTypeId == "VENDOR_RETURN"> <#if returnShipmentIds?has_content> <#list returnShipmentIds as returnShipmentId> - <a href="/facility/control/ViewShipment?shipmentId=${returnShipmentId.shipmentId}${externalKeyParam}" class="buttontext">${uiLabelMap.ProductShipmentId} ${returnShipmentId.shipmentId}</a> + <a href="/facility/control/ViewShipment?shipmentId=${returnShipmentId.shipmentId}${StringUtil.wrapString(externalKeyParam)}" class="buttontext">${uiLabelMap.ProductShipmentId} ${returnShipmentId.shipmentId}</a> </#list> <#else> <a href="/facility/control/EditShipment?primaryReturnId=${returnHeader.returnId}&partyIdTo=${toPartyId}&statusId=SHIPMENT_INPUT&shipmentTypeId=PURCHASE_RETURN" class="buttontext">${uiLabelMap.OrderCreateReturnShipment}</a> @@ -252,11 +252,11 @@ under the License. <#assign itemResp = item.getRelatedOne("ReturnItemResponse", false)?if_exists> <#if itemResp?has_content> <#if itemResp.paymentId?has_content> - <div>${uiLabelMap.AccountingPayment} ${uiLabelMap.CommonNbr}<a href="/accounting/control/paymentOverview?paymentId=${itemResp.paymentId}${externalKeyParam}" class="buttontext">${itemResp.paymentId}</a></div> + <div>${uiLabelMap.AccountingPayment} ${uiLabelMap.CommonNbr}<a href="/accounting/control/paymentOverview?paymentId=${itemResp.paymentId}${StringUtil.wrapString(externalKeyParam)}" class="buttontext">${itemResp.paymentId}</a></div> <#elseif itemResp.replacementOrderId?has_content> <div>${uiLabelMap.OrderOrder} ${uiLabelMap.CommonNbr}<a href="<@ofbizUrl>orderview?orderId=${itemResp.replacementOrderId}</@ofbizUrl>" class="buttontext">${itemResp.replacementOrderId}</a></div> <#elseif itemResp.billingAccountId?has_content> - <div>${uiLabelMap.AccountingAccountId} ${uiLabelMap.CommonNbr}<a href="/accounting/control/EditBillingAccount?billingAccountId=${itemResp.billingAccountId}${externalKeyParam}" class="buttontext">${itemResp.billingAccountId}</a></div> + <div>${uiLabelMap.AccountingAccountId} ${uiLabelMap.CommonNbr}<a href="/accounting/control/EditBillingAccount?billingAccountId=${itemResp.billingAccountId}${StringUtil.wrapString(externalKeyParam)}" class="buttontext">${itemResp.billingAccountId}</a></div> </#if> <#else> <div>${uiLabelMap.CommonNone}</div> Modified: ofbiz/branches/release13.07/applications/order/webapp/ordermgr/return/returnList.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/release13.07/applications/order/webapp/ordermgr/return/returnList.ftl?rev=1552154&r1=1552153&r2=1552154&view=diff ============================================================================== --- ofbiz/branches/release13.07/applications/order/webapp/ordermgr/return/returnList.ftl (original) +++ ofbiz/branches/release13.07/applications/order/webapp/ordermgr/return/returnList.ftl Wed Dec 18 23:07:21 2013 @@ -39,7 +39,7 @@ under the License. <td><div>${returnHeader.entryDate.toString()}</div></td> <td> <#if returnHeader.fromPartyId?exists> - <a href="${customerDetailLink}${returnHeader.fromPartyId}${externalKeyParam}" class='buttontext'>${returnHeader.fromPartyId}</a> + <a href="${customerDetailLink}${returnHeader.fromPartyId}${StringUtil.wrapString(externalKeyParam)}" class='buttontext'>${returnHeader.fromPartyId}</a> <#else> <span class="label">${uiLabelMap.CommonNA}</span> </#if> Modified: ofbiz/branches/release13.07/applications/order/webapp/ordermgr/task/ordertasklist.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/release13.07/applications/order/webapp/ordermgr/task/ordertasklist.ftl?rev=1552154&r1=1552153&r2=1552154&view=diff ============================================================================== --- ofbiz/branches/release13.07/applications/order/webapp/ordermgr/task/ordertasklist.ftl (original) +++ ofbiz/branches/release13.07/applications/order/webapp/ordermgr/task/ordertasklist.ftl Wed Dec 18 23:07:21 2013 @@ -142,7 +142,7 @@ under the License. <td> <div> <#if task.customerPartyId?exists> - <a href="${customerDetailLink}${task.customerPartyId}${externalKeyParam}" target="partymgr" class="buttontext">${Static["org.ofbiz.order.task.TaskWorker"].getCustomerName(task)}</a> + <a href="${customerDetailLink}${task.customerPartyId}${StringUtil.wrapString(externalKeyParam)}" target="partymgr" class="buttontext">${Static["org.ofbiz.order.task.TaskWorker"].getCustomerName(task)}</a> <#else> N/A </#if> @@ -165,7 +165,7 @@ under the License. </td> <td>${task.priority?default("0")}</td> <td> - <a href="/workeffort/control/activity?workEffortId=${task.workEffortId}${externalKeyParam}" target="workeffort" class="buttontext"> + <a href="/workeffort/control/activity?workEffortId=${task.workEffortId}${StringUtil.wrapString(externalKeyParam)}" target="workeffort" class="buttontext"> ${Static["org.ofbiz.order.task.TaskWorker"].getPrettyStatus(task)} </a> </td> @@ -229,7 +229,7 @@ under the License. </td> <td> <#if task.customerPartyId?exists> - <a href="${customerDetailLink}${task.customerPartyId}${externalKeyParam}" target="partymgr" class="buttontext">${Static["org.ofbiz.order.task.TaskWorker"].getCustomerName(task)}</a> + <a href="${customerDetailLink}${task.customerPartyId}${StringUtil.wrapString(externalKeyParam)}" target="partymgr" class="buttontext">${Static["org.ofbiz.order.task.TaskWorker"].getCustomerName(task)}</a> <#else> </#if> @@ -253,7 +253,7 @@ under the License. <#if task.wepaPartyId == "_NA_"> <div>N/A</div> <#else> - <a href="${customerDetailLink}${task.wepaPartyId}${externalKeyParam}" target="partymgr" class="buttontext">${task.wepaPartyId}</a> + <a href="${customerDetailLink}${task.wepaPartyId}${StringUtil.wrapString(externalKeyParam)}" target="partymgr" class="buttontext">${task.wepaPartyId}</a> </#if> </td> <td>${Static["org.ofbiz.order.task.TaskWorker"].getRoleDescription(task)}</td> Modified: ofbiz/branches/release13.07/applications/party/webapp/partymgr/party/profileblocks/FinAccounts.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/release13.07/applications/party/webapp/partymgr/party/profileblocks/FinAccounts.ftl?rev=1552154&r1=1552153&r2=1552154&view=diff ============================================================================== --- ofbiz/branches/release13.07/applications/party/webapp/partymgr/party/profileblocks/FinAccounts.ftl (original) +++ ofbiz/branches/release13.07/applications/party/webapp/partymgr/party/profileblocks/FinAccounts.ftl Wed Dec 18 23:07:21 2013 @@ -19,7 +19,7 @@ under the License. <div style="border-bottom: 1px solid #ccc; margin-bottom: 20px"> <p> - <b>${uiLabelMap.AccountingAccountNumber}:</b> <a href="/accounting/control/EditFinAccount?finAccountId=${ownedFinAccount.finAccountId}${externalKeyParam}" + <b>${uiLabelMap.AccountingAccountNumber}:</b> <a href="/accounting/control/EditFinAccount?finAccountId=${ownedFinAccount.finAccountId}${StringUtil.wrapString(externalKeyParam)}" class="smallSubmit">${ownedFinAccount.finAccountId}</a> <b>${uiLabelMap.AccountingAccountType}:</b> ${(ownedFinAccountType.description)?default('N/A')} <b>${uiLabelMap.FormFieldTitle_finAccountName}:</b> ${ownedFinAccount.finAccountName?if_exists} Modified: ofbiz/branches/release13.07/applications/party/webapp/partymgr/party/profileblocks/PaymentMethods.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/release13.07/applications/party/webapp/partymgr/party/profileblocks/PaymentMethods.ftl?rev=1552154&r1=1552153&r2=1552154&view=diff ============================================================================== --- ofbiz/branches/release13.07/applications/party/webapp/partymgr/party/profileblocks/PaymentMethods.ftl (original) +++ ofbiz/branches/release13.07/applications/party/webapp/partymgr/party/profileblocks/PaymentMethods.ftl Wed Dec 18 23:07:21 2013 @@ -81,7 +81,7 @@ under the License. </td> <td class="button-col"> <#if security.hasEntityPermission("MANUAL", "_PAYMENT", session)> - <a href="/accounting/control/manualETx?paymentMethodId=${paymentMethod.paymentMethodId}${externalKeyParam}">${uiLabelMap.PartyManualTx}</a> + <a href="/accounting/control/manualETx?paymentMethodId=${paymentMethod.paymentMethodId}${StringUtil.wrapString(externalKeyParam)}">${uiLabelMap.PartyManualTx}</a> </#if> <#if security.hasEntityPermission("PAY_INFO", "_UPDATE", session) || security.hasEntityPermission("ACCOUNTING", "_UPDATE", session)> <a href="<@ofbizUrl>editcreditcard?partyId=${partyId}&paymentMethodId=${paymentMethod.paymentMethodId}</@ofbizUrl>">${uiLabelMap.CommonUpdate}</a> Modified: ofbiz/branches/release13.07/applications/product/webapp/catalog/product/EditProductInventoryItems.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/release13.07/applications/product/webapp/catalog/product/EditProductInventoryItems.ftl?rev=1552154&r1=1552153&r2=1552154&view=diff ============================================================================== --- ofbiz/branches/release13.07/applications/product/webapp/catalog/product/EditProductInventoryItems.ftl (original) +++ ofbiz/branches/release13.07/applications/product/webapp/catalog/product/EditProductInventoryItems.ftl Wed Dec 18 23:07:21 2013 @@ -24,7 +24,7 @@ under the License. </div> <div class="screenlet-body"> <#if productId?has_content> - <a href="/facility/control/EditInventoryItem?productId=${productId}${externalKeyParam}" class="buttontext">${uiLabelMap.ProductCreateNewInventoryItemProduct}</a> + <a href="/facility/control/EditInventoryItem?productId=${productId}${StringUtil.wrapString(externalKeyParam)}" class="buttontext">${uiLabelMap.ProductCreateNewInventoryItemProduct}</a> <#if showEmpty> <a href="<@ofbizUrl>EditProductInventoryItems?productId=${productId}</@ofbizUrl>" class="buttontext">${uiLabelMap.ProductHideEmptyItems}</a> <#else> @@ -61,7 +61,7 @@ under the License. <#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> <tr valign="middle"<#if rowClass == "1"> class="alternate-row"</#if>> - <td><a href="/facility/control/EditInventoryItem?inventoryItemId=${(inventoryItem.inventoryItemId)?if_exists}${externalKeyParam}" class="buttontext">${(inventoryItem.inventoryItemId)?if_exists}</a></td> + <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> <div> @@ -80,13 +80,13 @@ under the License. <td style="color: red;">${uiLabelMap.ProductErrorFacility} (${inventoryItem.facilityId}) ${uiLabelMap.ProductAndContainer} (${inventoryItem.containerId}) ${uiLabelMap.CommonSpecified}</td> <#elseif inventoryItem.facilityId?exists> - <td>${uiLabelMap.ProductFacilityLetter}: <a href="/facility/control/EditFacility?facilityId=${inventoryItem.facilityId}${externalKeyParam}" class="linktext">${inventoryItem.facilityId}</a></td> + <td>${uiLabelMap.ProductFacilityLetter}: <a href="/facility/control/EditFacility?facilityId=${inventoryItem.facilityId}${StringUtil.wrapString(externalKeyParam)}" class="linktext">${inventoryItem.facilityId}</a></td> <#elseif (inventoryItem.containerId)?exists> <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}${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><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 align="right"><@ofbizCurrency amount=inventoryItem.unitCost isoCode=inventoryItem.currencyUomId/></td> Modified: ofbiz/branches/release13.07/applications/product/webapp/facility/facility/PicklistOptions.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/release13.07/applications/product/webapp/facility/facility/PicklistOptions.ftl?rev=1552154&r1=1552153&r2=1552154&view=diff ============================================================================== --- ofbiz/branches/release13.07/applications/product/webapp/facility/facility/PicklistOptions.ftl (original) +++ ofbiz/branches/release13.07/applications/product/webapp/facility/facility/PicklistOptions.ftl Wed Dec 18 23:07:21 2013 @@ -273,14 +273,14 @@ under the License. <#assign orderProduct = oiasga.getRelatedOne("OrderItem", false).getRelatedOne("Product", false)?if_exists> <#assign product = oiasga.getRelatedOne("InventoryItem", false).getRelatedOne("Product", false)?if_exists> <tr valign="middle"<#if alt_row> class="alternate-row"</#if>> - <td><a href="/ordermgr/control/orderview?orderId=${oiasga.orderId}${externalKeyParam}" class="buttontext" target="_blank">${oiasga.orderId}</a></td> + <td><a href="/ordermgr/control/orderview?orderId=${oiasga.orderId}${StringUtil.wrapString(externalKeyParam)}" class="buttontext" target="_blank">${oiasga.orderId}</a></td> <td>${header.orderDate?string}</td> <td>${(channel.description)?if_exists}</td> <td>${oiasga.orderItemSeqId}</td> <td> - <a href="/catalog/control/EditProduct?productId=${orderProduct.productId?if_exists}${externalKeyParam}" class="buttontext" target="_blank">${(orderProduct.internalName)?if_exists}</a> + <a href="/catalog/control/EditProduct?productId=${orderProduct.productId?if_exists}${StringUtil.wrapString(externalKeyParam)}" class="buttontext" target="_blank">${(orderProduct.internalName)?if_exists}</a> <#if orderProduct.productId != product.productId> - [<a href="/catalog/control/EditProduct?productId=${product.productId?if_exists}${externalKeyParam}" class="buttontext" target="_blank">${(product.internalName)?if_exists}</a>] + [<a href="/catalog/control/EditProduct?productId=${product.productId?if_exists}${StringUtil.wrapString(externalKeyParam)}" class="buttontext" target="_blank">${(product.internalName)?if_exists}</a>] </#if> </td> <td>${oiasga.shipGroupSeqId}</td> Modified: ofbiz/branches/release13.07/applications/product/webapp/facility/inventory/receiveInventory.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/release13.07/applications/product/webapp/facility/inventory/receiveInventory.ftl?rev=1552154&r1=1552153&r2=1552154&view=diff ============================================================================== --- ofbiz/branches/release13.07/applications/product/webapp/facility/inventory/receiveInventory.ftl (original) +++ ofbiz/branches/release13.07/applications/product/webapp/facility/inventory/receiveInventory.ftl Wed Dec 18 23:07:21 2013 @@ -403,7 +403,7 @@ under the License. <td width="45%"> <b>${orderItemType.get("description",locale)}</b> : ${orderItem.itemDescription?if_exists} <input type="text" size="12" name="productId_o_${rowCount}"/> - <a href="/catalog/control/EditProduct?${externalKeyParam}" target="catalog" class="buttontext">${uiLabelMap.ProductCreateProduct}</a> + <a href="/catalog/control/EditProduct?${StringUtil.wrapString(externalKeyParam)}" target="catalog" class="buttontext">${uiLabelMap.ProductCreateProduct}</a> </td> </#if> <td align="right">${uiLabelMap.ProductLocation}:</td> Modified: ofbiz/branches/release13.07/applications/product/webapp/facility/returns/receiveReturn.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/release13.07/applications/product/webapp/facility/returns/receiveReturn.ftl?rev=1552154&r1=1552153&r2=1552154&view=diff ============================================================================== --- ofbiz/branches/release13.07/applications/product/webapp/facility/returns/receiveReturn.ftl (original) +++ ofbiz/branches/release13.07/applications/product/webapp/facility/returns/receiveReturn.ftl Wed Dec 18 23:07:21 2013 @@ -120,7 +120,7 @@ under the License. <div> ${returnItem.returnItemSeqId}: <b>${orderItemType.get("description",locale)}</b> : ${orderItem.itemDescription?if_exists} <input type="text" size="12" name="productId_o_${rowCount}" /> - <a href="/catalog/control/EditProduct?${externalKeyParam}" target="catalog" class="buttontext">${uiLabelMap.ProductCreateProduct}</a> + <a href="/catalog/control/EditProduct?${StringUtil.wrapString(externalKeyParam)}" target="catalog" class="buttontext">${uiLabelMap.ProductCreateProduct}</a> </div> </td> <#else> Modified: ofbiz/branches/release13.07/applications/product/webapp/facility/shipment/PackOrder.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/release13.07/applications/product/webapp/facility/shipment/PackOrder.ftl?rev=1552154&r1=1552153&r2=1552154&view=diff ============================================================================== --- ofbiz/branches/release13.07/applications/product/webapp/facility/shipment/PackOrder.ftl (original) +++ ofbiz/branches/release13.07/applications/product/webapp/facility/shipment/PackOrder.ftl Wed Dec 18 23:07:21 2013 @@ -58,8 +58,8 @@ under the License. <ul> <#list invoiceIds as invoiceId> <li> - ${uiLabelMap.CommonNbr}<a href="/accounting/control/invoiceOverview?invoiceId=${invoiceId}${externalKeyParam}" target="_blank" class="buttontext">${invoiceId}</a> - (<a href="/accounting/control/invoice.pdf?invoiceId=${invoiceId}${externalKeyParam}" target="_blank" class="buttontext">PDF</a>) + ${uiLabelMap.CommonNbr}<a href="/accounting/control/invoiceOverview?invoiceId=${invoiceId}${StringUtil.wrapString(externalKeyParam)}" target="_blank" class="buttontext">${invoiceId}</a> + (<a href="/accounting/control/invoice.pdf?invoiceId=${invoiceId}${StringUtil.wrapString(externalKeyParam)}" target="_blank" class="buttontext">PDF</a>) </li> </#list> </ul> @@ -295,9 +295,9 @@ under the License. </#if> </td> <td> - <a href="/catalog/control/EditProduct?productId=${orderProduct.productId?if_exists}${externalKeyParam}" class="buttontext" target="_blank">${(orderProduct.internalName)?if_exists}</a> + <a href="/catalog/control/EditProduct?productId=${orderProduct.productId?if_exists}${StringUtil.wrapString(externalKeyParam)}" class="buttontext" target="_blank">${(orderProduct.internalName)?if_exists}</a> <#if orderProduct.productId != product.productId> - [<a href="/catalog/control/EditProduct?productId=${product.productId?if_exists}${externalKeyParam}" class="buttontext" target="_blank">${(product.internalName)?if_exists}</a>] + [<a href="/catalog/control/EditProduct?productId=${product.productId?if_exists}${StringUtil.wrapString(externalKeyParam)}" class="buttontext" target="_blank">${(product.internalName)?if_exists}</a>] </#if> </td> <td align="right">${orderItemQuantity}</td> @@ -459,7 +459,7 @@ under the License. <td>${line.getOrderItemSeqId()}</td> <td>${line.getProductId()?default("N/A")}</td> <td> - <a href="/catalog/control/EditProduct?productId=${line.getProductId()?if_exists}${externalKeyParam}" class="buttontext" target="_blank">${product.internalName?if_exists?default("[N/A]")}</a> + <a href="/catalog/control/EditProduct?productId=${line.getProductId()?if_exists}${StringUtil.wrapString(externalKeyParam)}" class="buttontext" target="_blank">${product.internalName?if_exists?default("[N/A]")}</a> </td> <td>${line.getInventoryItemId()}</td> <td align="right">${line.getQuantity()}</td> @@ -503,7 +503,7 @@ under the License. <td>${line.getOrderItemSeqId()}</td> <td>${line.getProductId()?default("N/A")}</td> <td> - <a href="/catalog/control/EditProduct?productId=${line.getProductId()?if_exists}${externalKeyParam}" class="buttontext" target="_blank">${product.internalName?if_exists?default("[N/A]")}</a> + <a href="/catalog/control/EditProduct?productId=${line.getProductId()?if_exists}${StringUtil.wrapString(externalKeyParam)}" class="buttontext" target="_blank">${product.internalName?if_exists?default("[N/A]")}</a> </td> <td>${line.getInventoryItemId()}</td> <td align="right">${line.getQuantity()}</td> Modified: ofbiz/branches/release13.07/applications/product/webapp/facility/shipment/VerifyPick.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/release13.07/applications/product/webapp/facility/shipment/VerifyPick.ftl?rev=1552154&r1=1552153&r2=1552154&view=diff ============================================================================== --- ofbiz/branches/release13.07/applications/product/webapp/facility/shipment/VerifyPick.ftl (original) +++ ofbiz/branches/release13.07/applications/product/webapp/facility/shipment/VerifyPick.ftl Wed Dec 18 23:07:21 2013 @@ -39,8 +39,8 @@ under the License. <ul> <#list invoiceIds as invoiceId> <li> - ${uiLabelMap.CommonNbr}<a href="/accounting/control/invoiceOverview?invoiceId=${invoiceId}${externalKeyParam}" target="_blank" class="buttontext">${invoiceId}</a> - (<a href="/accounting/control/invoice.pdf?invoiceId=${invoiceId}${externalKeyParam}" target="_blank" class="buttontext">PDF</a>) + ${uiLabelMap.CommonNbr}<a href="/accounting/control/invoiceOverview?invoiceId=${invoiceId}${StringUtil.wrapString(externalKeyParam)}" target="_blank" class="buttontext">${invoiceId}</a> + (<a href="/accounting/control/invoice.pdf?invoiceId=${invoiceId}${StringUtil.wrapString(externalKeyParam)}" target="_blank" class="buttontext">PDF</a>) </li> </#list> </ul> @@ -234,7 +234,7 @@ under the License. <td>${orderItemSeqId?if_exists}</td> <td>${product.productId?default("N/A")}</td> <td> - <a href="/catalog/control/EditProduct?productId=${product.productId?if_exists}${externalKeyParam}" class="buttontext" target="_blank">${(product.internalName)?if_exists}</a> + <a href="/catalog/control/EditProduct?productId=${product.productId?if_exists}${StringUtil.wrapString(externalKeyParam)}" class="buttontext" target="_blank">${(product.internalName)?if_exists}</a> </td> <td> <select name="geo_${rowKey}"> Modified: ofbiz/branches/release13.07/applications/product/webapp/facility/shipment/WeightPackage.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/release13.07/applications/product/webapp/facility/shipment/WeightPackage.ftl?rev=1552154&r1=1552153&r2=1552154&view=diff ============================================================================== --- ofbiz/branches/release13.07/applications/product/webapp/facility/shipment/WeightPackage.ftl (original) +++ ofbiz/branches/release13.07/applications/product/webapp/facility/shipment/WeightPackage.ftl Wed Dec 18 23:07:21 2013 @@ -38,8 +38,8 @@ under the License. <ul> <#list invoiceIds as invoiceId> <li> - ${uiLabelMap.CommonNbr}<a href="/accounting/control/invoiceOverview?invoiceId=${invoiceId}${externalKeyParam}" target="_blank" class="buttontext">${invoiceId}</a> - (<a href="/accounting/control/invoice.pdf?invoiceId=${invoiceId}${externalKeyParam}" target="_blank" class="buttontext">PDF</a>) + ${uiLabelMap.CommonNbr}<a href="/accounting/control/invoiceOverview?invoiceId=${invoiceId}${StringUtil.wrapString(externalKeyParam)}" target="_blank" class="buttontext">${invoiceId}</a> + (<a href="/accounting/control/invoice.pdf?invoiceId=${invoiceId}${StringUtil.wrapString(externalKeyParam)}" target="_blank" class="buttontext">PDF</a>) </li> </#list> </ul> Modified: ofbiz/branches/release13.07/themes/flatgrey/includes/appbar.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/release13.07/themes/flatgrey/includes/appbar.ftl?rev=1552154&r1=1552153&r2=1552154&view=diff ============================================================================== --- ofbiz/branches/release13.07/themes/flatgrey/includes/appbar.ftl (original) +++ ofbiz/branches/release13.07/themes/flatgrey/includes/appbar.ftl Wed Dec 18 23:07:21 2013 @@ -61,7 +61,7 @@ under the License. <li> </#if> </#if> - <a href="${thisURL}${externalKeyParam}"<#if selected> class="selected"</#if><#if uiLabelMap?exists> title="${uiLabelMap[display.description]}">${uiLabelMap[display.title]}<#else> title="${display.description}">${display.title}</#if></a> + <a href="${thisURL}${StringUtil.wrapString(externalKeyParam)}"<#if selected> class="selected"</#if><#if uiLabelMap?exists> title="${uiLabelMap[display.description]}">${uiLabelMap[display.title]}<#else> title="${display.description}">${display.title}</#if></a> <#assign appCount = appCount + 1> </#if> </#if> @@ -95,7 +95,7 @@ under the License. <li> </#if> </#if> - <a href="${thisURL}${externalKeyParam}"<#if selected> class="selected"</#if><#if uiLabelMap?exists> title="${uiLabelMap[display.description]}">${uiLabelMap[display.title]}<#else> title="${display.description}">${display.title}</#if></a> + <a href="${thisURL}${StringUtil.wrapString(externalKeyParam)}"<#if selected> class="selected"</#if><#if uiLabelMap?exists> title="${uiLabelMap[display.description]}">${uiLabelMap[display.title]}<#else> title="${display.description}">${display.title}</#if></a> <#assign appCount = appCount + 1> </#if> </#list> Modified: ofbiz/branches/release13.07/themes/flatgrey/includes/header.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/release13.07/themes/flatgrey/includes/header.ftl?rev=1552154&r1=1552153&r2=1552154&view=diff ============================================================================== --- ofbiz/branches/release13.07/themes/flatgrey/includes/header.ftl (original) +++ ofbiz/branches/release13.07/themes/flatgrey/includes/header.ftl Wed Dec 18 23:07:21 2013 @@ -133,7 +133,7 @@ under the License. <#if layoutSettings.topLines?has_content> <#list layoutSettings.topLines as topLine> <#if topLine.text?exists> - <li>${topLine.text}<a href="${StringUtil.wrapString(topLine.url?if_exists)}${externalKeyParam}">${topLine.urlText?if_exists}</a></li> + <li>${topLine.text}<a href="${StringUtil.wrapString(topLine.url?if_exists)}${StringUtil.wrapString(externalKeyParam)}">${topLine.urlText?if_exists}</a></li> <#elseif topLine.dropDownList?exists> <li><#include "component://common/webcommon/includes/insertDropDown.ftl"/></li> <#else> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |