You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@ofbiz.apache.org by Jacques Le Roux <ja...@les7arts.com> on 2009/04/11 15:14:24 UTC
Re: svn commit: r764077 - in /ofbiz/trunk: applications/manufacturing/webapp/manufacturing/jobshopmgt/ applications/order/webapp/ordermgr/order/ applications/product/webapp/facility/shipment/ specialpurpose/ecommerce/webapp/ecommerce/customer/ specialpurpo
Hi Ashish,
The problems was that it was not working in orderview : it broke things, I began to search, in order to keep most of them, but
finally gave up and kept only 3 files
Jacques
From: "Ashish Nagar" <as...@hotwaxmedia.com>
> Hello Jacques,
>
> I got David's comment over it. It makes lot sense to me that on the urls which are not calling any service, parameters can be
> passed through link. But I was wondering, how it is better to send parameters as "get" not by "post" (through form)? IMO, if we
> send parameters through forms, then that will be more sophisticated, hence more secured. Please provide your suggestions over
> this.
>
> BTW, the idea to convert only urls invoking service to form is good one, if there could be some automatized strategy to identify
> them.
>
> Regards,
> --
> Ashish Nagar
>
> jleroux@apache.org wrote:
>> Author: jleroux
>> Date: Fri Apr 10 22:09:23 2009
>> New Revision: 764077
>>
>> URL: http://svn.apache.org/viewvc?rev=764077&view=rev
>> Log:
>> I finally reverted almost all Ashish Nagar's patch from https://issues.apache.org/jira/browse/OFBIZ-2260 - OFBIZ-2260 that I
>> commited after a review but no tests in r762149.
>> This because these URLs in FTL file were not calling services, hence, as explained David, did not need any changes
>> I kept only changes I found by chances (because I got conflicts in them) in
>> specialpurpose\ecommerce\webapp\ecommerce\order\orderitems.ftl
>> specialpurpose\ecommerce\webapp\ecommerce\order\orderheader.ftl
>> applications/order/webapp/ordermgr/order/ordershippinginfo.ftl I also added one secured URLs - createShipment2 - in this last
>> file and there are more to do just below : quickDropShipOrder, createShipment. I think we need more than good will and chance
>> here. We need to define a strategy to spot the URLs calling services in ftl files. This does not sound like impossible to
>> automatize and I firmly think we should do that before freezing R9.04
>>
>> Modified:
>> ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/WorkWithShipmentPlans.ftl
>> ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/associatedProductionRuns.ftl
>> ofbiz/trunk/applications/order/webapp/ordermgr/order/orderitems.ftl
>> ofbiz/trunk/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl
>> ofbiz/trunk/applications/product/webapp/facility/shipment/EditShipment.ftl
>> ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/editcontactmech.ftl
>> ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/messagedetail.ftl
>> ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/messagelist.ftl
>> ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/viewprofile.ftl
>> ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/anonymoustrail.ftl
>> ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/orderheader.ftl
>> ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/orderstatus.ftl
>>
>> Modified: ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/WorkWithShipmentPlans.ftl
>> URL:
>> http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/WorkWithShipmentPlans.ftl?rev=764077&r1=764076&r2=764077&view=diff
>> ==============================================================================
>> --- ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/WorkWithShipmentPlans.ftl (original)
>> +++ ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/WorkWithShipmentPlans.ftl Fri Apr 10 22:09:23 2009
>> @@ -26,39 +26,16 @@
>> ${listShipmentPlanForm.renderFormString(context)}
>> <#if workInProgress>
>> <br/>
>> - <div>
>> - <form name= "shipmentWorkEffortTasks" method= "post" action= "<@o...@ofbizUrl>" >
>> - <input type= "hidden" name= "shipmentId" value= "${shipmentId}">
>> - <a href="javascript:document.shipmentWorkEffortTasks.submit()" class="buttontext"
>> target="_report">${uiLabelMap.ManufacturingTasksReport}</a>
>> - </form>
>> - </div>
>> - <div>
>> - <form name= "cuttingListReport" method= "post" action= "<@o...@ofbizUrl>" >
>> - <input type= "hidden" name= "shipmentId" value= "${shipmentId}">
>> - <a href="javascript:document.cuttingListReport.submit()" target="_report"
>> class="buttontext">${uiLabelMap.ManufacturingCuttingListReport}</a>
>> - </form>
>> - </div>
>> + <div><a href="<@o...@ofbizUrl>" class="buttontext"
>> target="_report">${uiLabelMap.ManufacturingTasksReport}</a></div>
>> + <div><a href="<@o...@ofbizUrl>" target="_report"
>> class="buttontext">${uiLabelMap.ManufacturingCuttingListReport}</a></div>
>> <#else>
>> - <div>
>> - <form name= "createProductionRunsForShipment" method= "post" action=
>> "<@o...@ofbizUrl>">
>> - <input type= "hidden" name= "shipmentId" value= "${shipmentId}">
>> - <a href="javascript:document.createProductionRunsForShipment.submit()"
>> class="buttontext">${uiLabelMap.ManufacturingCreateProductionRun}</a>
>> - </form>
>> - </div>
>> + <div><a href="<@o...@ofbizUrl>"
>> class="buttontext">${uiLabelMap.ManufacturingCreateProductionRun}</a></div>
>> <br/>
>> - <div>
>> - <form name= "shipmentPlanStockReport" method= "post" action= "<@o...@ofbizUrl>">
>> - <input type= "hidden" name= "shipmentId" value= "${shipmentId}">
>> - <a href="javascript:document.shipmentPlanStockReport.submit()" target="_report"
>> class="buttontext">${uiLabelMap.ManufacturingShipmentPlanStockReport}</a></div>
>> - </form>
>> - </div>
>> + <div><a href="<@o...@ofbizUrl>" target="_report"
>> class="buttontext">${uiLabelMap.ManufacturingShipmentPlanStockReport}</a></div>
>> </#if>
>> - <div>
>> - <form name= "shipmentLabel" method= "post" action= "<@o...@ofbizUrl>">
>> - <input type= "hidden" name= "shipmentId" value= "${shipmentId}">
>> - <a href="javascript:document.shipmentLabel.submit()" class="buttontext"
>> target="_report">${uiLabelMap.ManufacturingPackageLabelsReport}</a></div>
>> - </form>
>> - </div>
>> +
>> + <div><a href="<@o...@ofbizUrl>" class="buttontext"
>> target="_report">${uiLabelMap.ManufacturingPackageLabelsReport}</a></div>
>> + </div>
>> </div>
>> <#else>
>> <div class="screenlet">
>>
>> Modified: ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/associatedProductionRuns.ftl
>> URL:
>> http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/associatedProductionRuns.ftl?rev=764077&r1=764076&r2=764077&view=diff
>> ==============================================================================
>> --- ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/associatedProductionRuns.ftl (original)
>> +++ ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/associatedProductionRuns.ftl Fri Apr 10 22:09:23 2009
>> @@ -16,6 +16,7 @@
>> specific language governing permissions and limitations
>> under the License.
>> -->
>> +
>> <#-- Mandatory work efforts -->
>> <#if mandatoryWorkEfforts?has_content>
>> <p>
>> @@ -23,21 +24,12 @@
>> <#list mandatoryWorkEfforts as mandatoryWorkEffortAssoc>
>> <#assign mandatoryWorkEffort = mandatoryWorkEffortAssoc.getRelatedOne("FromWorkEffort")>
>> <#if "PRUN_COMPLETED" == mandatoryWorkEffort.getString("currentStatusId") || "PRUN_CLOSED" ==
>> mandatoryWorkEffort.getString("currentStatusId")>
>> - <form name= "productionRunDeclarationMandatory" method= "post" action=
>> "<@o...@ofbizUrl>">
>> - <input type= "hidden" name= "productionRunId" value= "${mandatoryWorkEffort.workEffortId}"/>
>> - <a href="javascript:document.productionRunDeclarationMandatory.submit()"
>> class="buttontext">${mandatoryWorkEffort.workEffortName}</a>
>> - </form
>> + <a href="<@o...@ofbizUrl>"
>> class="buttontext">${mandatoryWorkEffort.workEffortName}</a>
>> <#else>
>> <#if "PRUN_CREATED" == mandatoryWorkEffort.getString("currentStatusId") || "PRUN_SCHEDULED" ==
>> mandatoryWorkEffort.getString("currentStatusId")>
>> - <form name= "editProductionRunMandatory" method= "post" action= "<@o...@ofbizUrl>" >
>> - <input type= "hidden" name= "productionRunId" value= "${mandatoryWorkEffort.workEffortId}"/>
>> - <a href= "javascript:document.editProductionRunMandatory.submit()"
>> class="buttontext">${mandatoryWorkEffort.workEffortName}</a>[*]
>> - </form>
>> + <a href="<@o...@ofbizUrl>"
>> class="buttontext">${mandatoryWorkEffort.workEffortName}</a>[*]
>> <#else>
>> - <form name= "prodRunDeclaration" method= "post" action= "<@o...@ofbizUrl>">
>> - <input type= "hidden" name= "productionRunId" value= "${mandatoryWorkEffort.workEffortId}"/>
>> - <a href= "javascript:document.prodRunDeclaration.submit()"
>> class="buttontext">${mandatoryWorkEffort.workEffortName}</a>[*]
>> - </form>
>> + <a href="<@o...@ofbizUrl>"
>> class="buttontext">${mandatoryWorkEffort.workEffortName}</a>[*]
>> </#if>
>> </#if>
>> </#list>
>> @@ -50,21 +42,12 @@
>> <#list dependentWorkEfforts as dependentWorkEffortAssoc>
>> <#assign dependentWorkEffort = dependentWorkEffortAssoc.getRelatedOne("ToWorkEffort")>
>> <#if "PRUN_COMPLETED" == dependentWorkEffort.currentStatusId || "PRUN_CLOSED" == dependentWorkEffort.currentStatusId>
>> - <form name= "productionRunDeclarationDependent" method= "post" action=
>> "<@o...@ofbizUrl>">
>> - <input type= "hidden" name= "productionRunId" value= "${dependentWorkEffort.workEffortId}"/>
>> - <a href= "javascript:document.productionRunDeclarationDependent.submit()"
>> class="buttontext">${dependentWorkEffort.workEffortName}</a>
>> - </form>
>> + <a href="<@o...@ofbizUrl>"
>> class="buttontext">${dependentWorkEffort.workEffortName}</a>
>> <#else>
>> <#if "PRUN_CREATED" == dependentWorkEffort.getString("currentStatusId") || "PRUN_SCHEDULED" ==
>> dependentWorkEffort.getString("currentStatusId")>
>> - <form name= "editProductionRunDependent" method= "post" action= "<@o...@ofbizUrl>">
>> - <input type= "hidden" name= "productionRunId" value= "${dependentWorkEffort.workEffortId}"/>
>> - <a href="javascript:document.editProductionRunDependent.submit()"
>> class="buttontext">${dependentWorkEffort.workEffortName}</a>[*]
>> - </form>
>> + <a href="<@o...@ofbizUrl>"
>> class="buttontext">${dependentWorkEffort.workEffortName}</a>[*]
>> <#else>
>> - <form name= "prodRunDeclarationDependent" method= "post" action=
>> "<@o...@ofbizUrl>">
>> - <input type= "hidden" name= "productionRunId" value= "${dependentWorkEffort.workEffortId}"/>
>> - <a href="javascript:document.prodRunDeclarationDependent.submit()"
>> class="buttontext">${dependentWorkEffort.workEffortName}</a>[*]
>> - </form>
>> + <a href="<@o...@ofbizUrl>"
>> class="buttontext">${dependentWorkEffort.workEffortName}</a>[*]
>> </#if>
>> </#if>
>> </#list>
>>
>> Modified: ofbiz/trunk/applications/order/webapp/ordermgr/order/orderitems.ftl
>> URL:
>> http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/order/orderitems.ftl?rev=764077&r1=764076&r2=764077&view=diff
>> ==============================================================================
>> --- ofbiz/trunk/applications/order/webapp/ordermgr/order/orderitems.ftl (original)
>> +++ ofbiz/trunk/applications/order/webapp/ordermgr/order/orderitems.ftl Fri Apr 10 22:09:23 2009
>> @@ -293,10 +293,7 @@
>> <td colspan="6">
>> <div>
>> <span class="label">${uiLabelMap.OrderLinkedToRequirement}</span>
>> - <form name= "orderView" method= "post" action= "<@o...@ofbizUrl>">
>> - <input type= "hidden" name= "requirementId" value= "${linkedRequirement.requirementId}">
>> - <a href="javascript:document.orderView.submit()"
>> class="buttontext">${linkedRequirement.requirementId}</a>
>> - </form>
>> + <a href="<@o...@ofbizUrl>"
>> class="buttontext">${linkedRequirement.requirementId}</a>
>> </div>
>> </td>
>> </tr>
>>
>> Modified: ofbiz/trunk/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl
>> URL:
>> http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl?rev=764077&r1=764076&r2=764077&view=diff
>> ==============================================================================
>> --- ofbiz/trunk/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl (original)
>> +++ ofbiz/trunk/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl Fri Apr 10 22:09:23 2009
>> @@ -373,7 +373,8 @@
>> <#assign facilities = facilitiesForShipGroup.get(shipGroup.shipGroupSeqId)>
>> <#if facilities?has_content>
>> <div>
>> - <form action="/facility/control/createShipment" method="GET">
>> + <a href="javascript:document.createShipment2.submit()"
>> class="buttontext">${uiLabelMap.OrderNewShipmentForShipGroup}</a>
>> + <form name="createShipment2" method="post" action="/facility/control/createShipment">
>> <input type="hidden" name="primaryOrderId" value="${orderId}"/>
>> <input type="hidden" name="primaryShipGroupSeqId" value="${shipGroup.shipGroupSeqId}"/>
>> <input type="hidden" name="shipmentTypeId" value="PURCHASE_SHIPMENT"/>
>> @@ -387,8 +388,8 @@
>> </#list>
>> </select>
>> <input type="submit" class="smallSubmit" value="${uiLabelMap.OrderNewShipmentForShipGroup}
>> [${shipGroup.shipGroupSeqId}]"/>
>> - </form>
>> - </div>
>> + </form>
>> + </div>
>> <#else>
>> <a
>> href="<@o...@ofbizUrl>"
>> class="buttontext" target="_blank">${uiLabelMap.ProductShipmentQuickComplete}</a>
>> <a
>> href="/facility/control/createShipment?primaryOrderId=${orderId}&primaryShipGroupSeqId=${shipGroup.shipGroupSeqId}&shipmentTypeId=DROP_SHIPMENT&statusId=PURCH_SHIP_CREATED&externalLoginKey=${externalLoginKey}"
>> class="buttontext">${uiLabelMap.OrderNewDropShipmentForShipGroup} [${shipGroup.shipGroupSeqId}]</a>
>> @@ -403,4 +404,4 @@
>> </div>
>> </div>
>> </#list>
>> -</#if>
>> \ No newline at end of file
>> +</#if>
>>
>> Modified: ofbiz/trunk/applications/product/webapp/facility/shipment/EditShipment.ftl
>> URL:
>> http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/shipment/EditShipment.ftl?rev=764077&r1=764076&r2=764077&view=diff
>> ==============================================================================
>> --- ofbiz/trunk/applications/product/webapp/facility/shipment/EditShipment.ftl (original)
>> +++ ofbiz/trunk/applications/product/webapp/facility/shipment/EditShipment.ftl Fri Apr 10 22:09:23 2009
>> @@ -23,12 +23,7 @@
>> </#if>
>> -->
>> <#if shipmentId?has_content>
>> - <div>
>> - <form name= "shipmentManifest" action= "<@o...@ofbizUrl>" method= "post">
>> - <input type= "hidden" name= "shipmentId" value= "${shipmentId}">
>> - <a href="javascript:document.shipmentManifest.submit()" class="buttontext"
>> target="_blank">${uiLabelMap.ProductGenerateShipmentManifestReport}</a>
>> - </form>
>> - </div>
>> + <div><a href="<@o...@ofbizUrl>" class="buttontext"
>> target="_blank">${uiLabelMap.ProductGenerateShipmentManifestReport}</a></div>
>> </#if>
>> <div class="screenlet">
>> <div class="screenlet-title-bar">
>>
>> Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/editcontactmech.ftl
>> URL:
>> http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/editcontactmech.ftl?rev=764077&r1=764076&r2=764077&view=diff
>> ==============================================================================
>> --- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/editcontactmech.ftl (original)
>> +++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/editcontactmech.ftl Fri Apr 10 22:09:23 2009
>> @@ -80,17 +80,7 @@
>> (${uiLabelMap.CommonSince}:${partyContactMechPurpose.fromDate.toString()})
>> <#if
>> partyContactMechPurpose.thruDate?exists>(${uiLabelMap.CommonExpires}:${partyContactMechPurpose.thruDate.toString()})</#if>
>> </div></td>
>> - <td bgcolor='white'>
>> - <div>
>> - <form name= "deletePartyContactMechPurpose" method= "post" action=
>> "<@o...@ofbizUrl>">
>> - <input type= "hidden" name= "contactMechId" value= "${contactMechId}">
>> - <input type= "hidden" name= "contactMechPurposeTypeId" value=
>> "${partyContactMechPurpose.contactMechPurposeTypeId}">
>> - <input type= "hidden" name= "fromDate" value= "${partyContactMechPurpose.fromDate}">
>> - <input type= "hidden" name= "useValues" value= "true">
>> - <a href="javascript:document.deletePartyContactMechPurpose.submit()"
>> class='buttontext'> ${uiLabelMap.CommonDelete} </a>
>> - </form>
>> - </div>
>> - </td>
>> + <td bgcolor='white'><div><a
>> href='<@o...@ofbizUrl>'
>> class='buttontext'> ${uiLabelMap.CommonDelete} </a></div></td>
>> </tr>
>> </#list>
>> <#if purposeTypes?has_content>
>>
>> Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/messagedetail.ftl
>> URL:
>> http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/messagedetail.ftl?rev=764077&r1=764076&r2=764077&view=diff
>> ==============================================================================
>> --- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/messagedetail.ftl (original)
>> +++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/messagedetail.ftl Fri Apr 10 22:09:23 2009
>> @@ -29,10 +29,7 @@
>> <div class="screenlet-header">
>> <div class="boxlink">
>> <#if (communicationEvent.partyIdFrom?if_exists != (userLogin.partyId)?if_exists)>
>> - <form name= "newmessage" method= "post" action= "<@o...@ofbizUrl>">
>> - <input type= "hidden" name= "communicationEventId" value= "${communicationEvent.communicationEventId}">
>> - <a href="javascript:document.newmessage.submit()" class="submenutext">${uiLabelMap.PartyReply}</a>
>> - </form>
>> + <a href="<@o...@ofbizUrl>"
>> class="submenutext">${uiLabelMap.PartyReply}</a>
>> </#if>
>> <a href="<@o...@ofbizUrl>" class="submenutextright">${uiLabelMap.EcommerceViewList}</a>
>> </div>
>>
>> Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/messagelist.ftl
>> URL:
>> http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/messagelist.ftl?rev=764077&r1=764076&r2=764077&view=diff
>> ==============================================================================
>> --- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/messagelist.ftl (original)
>> +++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/messagelist.ftl Fri Apr 10 22:09:23 2009
>> @@ -34,19 +34,14 @@
>> <td><div class="tabletext">${communicationEvent.subject?default("")}</div></td>
>> <td><div class="tabletext">${communicationEvent.entryDate}</div></td>
>> <td align="right">
>> - <form name="readMessage" method="post" action="<@o...@ofbizUrl>">
>> - <input type="hidden" name="communicationEventId" value="{communicationEvent.communicationEventId}">
>> - <a href="javascript:document.readMessage.submit()" class="buttontext">${uiLabelMap.EcommerceRead}</a>
>> - </form>
>> + <a href="<@o...@ofbizUrl>"
>> class="buttontext">${uiLabelMap.EcommerceRead}</a>
>> <#if isSentMessage>
>> - <form name="newMessage" method="post" action="<@o...@ofbizUrl>">
>> - <input type="hidden" name="communicationEventId" value="{communicationEvent.communicationEventId}">
>> - <a href="javascript:document.newMessage.submit()"class="buttontext">${uiLabelMap.PartyReply}</a>
>> - </form>
>> + <a href="<@o...@ofbizUrl>"
>> class="buttontext">${uiLabelMap.PartyReply}</a>
>> </#if>
>> </td>
>> </tr>
>> </#macro>
>> +
>> <div class="screenlet">
>> <div class="screenlet-header">
>> <div class="boxlink">
>>
>> Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/viewprofile.ftl
>> URL:
>> http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/viewprofile.ftl?rev=764077&r1=764076&r2=764077&view=diff
>> ==============================================================================
>> --- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/viewprofile.ftl (original)
>> +++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/viewprofile.ftl Fri Apr 10 22:09:23 2009
>> @@ -38,10 +38,7 @@
>> <#if showOld>
>> <a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.PartyHideOld}</a>
>> <#else>
>> - <form name= "viewProfile" method= "post" action= "<@o...@ofbizUrl>">
>> - <input type= "hidden" name= "SHOW_OLD" value= "true">
>> - <a href="javascript:document.viewProfile.submit()" class="buttontext">${uiLabelMap.PartyShowOld}</a>
>> - </form>
>> + <a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.PartyShowOld}</a>
>> </#if>
>> <#if (productStore.enableDigProdUpload)?if_exists == "Y">
>> <a href="<@o...@ofbizUrl>"
>> class="buttontext">${uiLabelMap.EcommerceDigitalProductUpload}</a>
>> @@ -147,12 +144,7 @@
>> <#if contactMechPurposeType.contactMechPurposeTypeId == "SHIPPING_LOCATION" &&
>> (profiledefs.defaultShipAddr)?default("") == contactMech.contactMechId>
>> <span class="buttontextdisabled">${uiLabelMap.EcommerceIsDefault}</span>
>> <#elseif contactMechPurposeType.contactMechPurposeTypeId == "SHIPPING_LOCATION">
>> - <form name= "setProfileDefault" method= "post" action=
>> "<@o...@ofbizUrl>">
>> - <input type= "hidden" name= "productStoreId" value= "${productStoreId}">
>> - <input type= "hidden" name= "defaultShipAddr" value= "${contactMech.contactMechId}">
>> - <input type= "hidden" name= "partyId" value= "${party.partyId}">
>> - <a href="javascript:document.setProfileDefault.submit()"
>> class="buttontext">${uiLabelMap.EcommerceSetDefault}</a>
>> - </form>
>> + <a
>> href="<@o...@ofbizUrl>"
>> class="buttontext">${uiLabelMap.EcommerceSetDefault}</a>
>> </#if>
>> <#else>
>> <b>${uiLabelMap.PartyPurposeTypeNotFound}: "${partyContactMechPurpose.contactMechPurposeTypeId}"</b>
>> @@ -218,20 +210,12 @@
>> <td align="center" valign="top" nowrap width="1%"><div
>> class="tabletext"><b>(${partyContactMech.allowSolicitation?if_exists})</b></div></td>
>> <td width="5"> </td>
>> <td align="right" valign="top" nowrap width="1%" nowrap>
>> - <div>
>> - <form name= "editContactMech" method= "post" action= "<@o...@ofbizUrl>">
>> - <input type= "hidden" name= "contactMechId" value= "${contactMech.contactMechId}">
>> - <a href="javascript:document.editContactMech.submit()" class="buttontext">${uiLabelMap.CommonUpdate}</a>
>> - </form>
>> - </div>
>> + <div><a href="<@o...@ofbizUrl>"
>> class="buttontext">
>> + ${uiLabelMap.CommonUpdate}</a> </div>
>> </td>
>> <td align="right" valign="top" width="1%" nowrap>
>> - <div>
>> - <form name= "deleteContactMech" method= "post" action= "<@o...@ofbizUrl>">
>> - <input type= "hidden" name= "contactMechId" value= "${contactMech.contactMechId}">
>> - <a href= "javascript:document.deleteContactMech.submit()"class="buttontext">
>> ${uiLabelMap.CommonExpire}</a>
>> - </form>
>> - </div>
>> + <div><a href="<@o...@ofbizUrl>"
>> class="buttontext">
>> + ${uiLabelMap.CommonExpire}</a> </div>
>> </td>
>> </tr>
>> </#list>
>> @@ -282,12 +266,8 @@
>> </td>
>> <td width="5"> </td>
>> <td align="right" valign="top" width="1%" nowrap>
>> - <div>
>> - <form name= "editCreditCard" method= "post" action= "<@o...@ofbizUrl>">
>> - <input type= "hidden" name= "paymentMethodId" value= "${paymentMethod.paymentMethodId}">
>> - <a href="javascript:document.editCreditCard.submit()"
>> class="buttontext">${uiLabelMap.CommonUpdate}</a>
>> - </form>
>> - </div>
>> + <div><a
>> href="<@o...@ofbizUrl>" class="buttontext">
>> + ${uiLabelMap.CommonUpdate}</a></div>
>> </td>
>> <#elseif paymentMethod.paymentMethodTypeId?if_exists == "GIFT_CARD">
>> <#if giftCard?has_content && giftCard.cardNumber?has_content>
>> @@ -316,11 +296,8 @@
>> </td>
>> <td width="5"> </td>
>> <td align="right" valign="top" width="1%" nowrap>
>> - <div>
>> - <form name= "editGiftCard" method= "post" action= "<@o...@ofbizUrl>">
>> - <input type= "hidden" name= "paymentMethodId" value= "${paymentMethod.paymentMethodId}">
>> - <a href="javascript:document.editGiftCard.submit()"
>> class="buttontext">${uiLabelMap.CommonUpdate}</a>
>> - </div>
>> + <div><a href="<@o...@ofbizUrl>"
>> class="buttontext">
>> + ${uiLabelMap.CommonUpdate}</a></div>
>> </td>
>> <#elseif paymentMethod.paymentMethodTypeId?if_exists == "EFT_ACCOUNT">
>> <td width="80%" valign="top">
>> @@ -333,34 +310,20 @@
>> </td>
>> <td width="5"> </td>
>> <td align="right" valign="top" width="1%" nowrap>
>> - <div>
>> - <form name= "editEftAccount" method= "post" action= "<@o...@ofbizUrl>">
>> - <input type= "hidden" name= "paymentMethodId" value= "${paymentMethod.paymentMethodId}">
>> - <a href="javascript:document.editEftAccount.submit()"
>> class="buttontext">${uiLabelMap.CommonUpdate}</a>
>> - </form>
>> - </div>
>> + <div><a
>> href="<@o...@ofbizUrl>" class="buttontext">
>> + ${uiLabelMap.CommonUpdate}</a></div>
>> </td>
>> </#if>
>> <td align="right" valign="top" width="1%" nowrap>
>> - <div>
>> - <form name= "deletePaymentMethod" method= "post" action=
>> "<@o...@ofbizUrl>">
>> - <input type= "hidden" name= "paymentMethodId" value= "${paymentMethod.paymentMethodId}">
>> - <a href="javascript:document.deletePaymentMethod.submit()"
>> class="buttontext">${uiLabelMap.CommonExpire}</a>
>> - </form>
>> - </div>
>> + <div><a
>> href="<@o...@ofbizUrl>"
>> class="buttontext">
>> + ${uiLabelMap.CommonExpire}</a></div>
>> </td>
>> <td align="right" valign="top" width="1%" nowrap>
>> <#if (profiledefs.defaultPayMeth)?default("") == paymentMethod.paymentMethodId>
>> <span class="buttontextdisabled">${uiLabelMap.EcommerceIsDefault}</span>
>> <#else>
>> - <div>
>> - <form name= "setProfileDefault" method= "post" action=
>> "<@o...@ofbizUrl>">
>> - <input type= "hidden" name= "productStoreId" value= "${productStoreId}">
>> - <input type= "hidden" name= "defaultPayMeth" value= "${paymentMethod.paymentMethodId}">
>> - <input type= "hidden" name= "partyId" value= "${party.partyId}">
>> - <a href="javascript:document.setProfileDefault.submit()" class="buttontext">
>> ${uiLabelMap.EcommerceSetDefault}</a>
>> - </form>
>> - </div>
>> + <div><a
>> href="<@o...@ofbizUrl>"
>> class="buttontext">
>> + ${uiLabelMap.EcommerceSetDefault}</a></div>
>> </#if>
>> </td>
>> </tr>
>> @@ -453,27 +416,15 @@
>> <#assign mimeType = content.getRelatedOneCache("MimeType")?if_exists>
>> <#assign status = content.getRelatedOneCache("StatusItem")>
>> <tr>
>> - <td>
>> - <form name= "img" method= "post" action= "<@o...@ofbizUrl>">
>> - <input type= "hidden" name= "imgId" value= "${content.dataResourceId?if_exists}">
>> - <a href="javascript:document.img.submit()" class="buttontext">${content.contentId}</a>
>> - </form>
>> + <td><a
>> href="<@o...@ofbizUrl>"
>> class="buttontext">${content.contentId}</a>
>> <td><div class="tabletext">${content.contentName?if_exists}</div></td>
>> <td><div class="tabletext">${(contentType.get("description",locale))?if_exists}</div></td>
>> <td><div class="tabletext">${mimeType?if_exists.description?if_exists}</div></td>
>> <td><div class="tabletext">${(status.get("description",locale))?if_exists}</div></td>
>> <td><div class="tabletext">${contentRole.fromDate?if_exists}</div></td>
>> <td align="right">
>> - <form name= "imgForm" method= "post" action= "<@o...@ofbizUrl>">
>> - <input type= "hidden" name= "imgId" value= "${content.dataResourceId?if_exists}">
>> - <a href="javascript:document.imgForm.submit()" class="buttontext">${uiLabelMap.CommonView}</a>
>> - </form>
>> - <form name= "removePartyAsset" method= "post" action= "<@o...@ofbizUrl>">
>> - <input type= "hidden" name= "contentId" value= "${contentRole.contentId}">
>> - <input type= "hidden" name= "partyId" value= "${contentRole.partyId}">
>> - <input type= "hidden" name= "roleTypeId" value= "${contentRole.roleTypeId}">
>> - <a href="javascript:document.removePartyAsset.submit()"class="buttontext">${uiLabelMap.CommonRemove}</a>
>> - </form>
>> + <a
>> href="<@o...@ofbizUrl>"
>> class="buttontext">${uiLabelMap.CommonView}</a>
>> + <a
>> href="<@o...@ofbizUrl>"
>> class="buttontext">${uiLabelMap.CommonRemove}</a>
>> </td>
>> </tr>
>> </#list>
>> @@ -542,13 +493,7 @@
>> <td width="5"> </td>
>> <td width="20%" nowrap>
>> <#if (contactListParty.statusId?if_exists == "CLPT_ACCEPTED")>
>> - <form method="post" action="<@o...@ofbizUrl>" name="clistReject">
>> - <input type="hidden" name="partyId" value="${party.partyId}"/>
>> - <input type="hidden" name="contactListId" value="${contactListParty.contactListId}"/>
>> - <input type="hidden" name="fromDate" value="${contactListParty.fromDate}"/>
>> - <input type="hidden" name="statusId" value="CLPT_REJECTED"/>
>> - <a href="javascript:document.clistReject.submit()" class="buttontext">${uiLabelMap.EcommerceUnsubscribe}</a>
>> - </form>
>> + <a
>> href="<@o...@ofbizUrl>"
>> class="buttontext">${uiLabelMap.EcommerceUnsubscribe}</a>
>> <#elseif (contactListParty.statusId?if_exists == "CLPT_PENDING")>
>> <form method="post" action="<@o...@ofbizUrl>"
>> name="clistAcceptForm${contactListParty_index}">
>> <input type="hidden" name="partyId" value="${party.partyId}"/>
>> @@ -559,13 +504,7 @@
>> <input type="submit" value="${uiLabelMap.EcommerceVerifySubscription}" class="smallSubmit"/>
>> </form>
>> <#elseif (contactListParty.statusId?if_exists == "CLPT_REJECTED")>
>> - <form method="post" action="<@o...@ofbizUrl>" name="clistPending">
>> - <input type="hidden" name="partyId" value="${party.partyId}"/>
>> - <input type="hidden" name="contactListId" value="${contactListParty.contactListId}"/>
>> - <input type="hidden" name="fromDate" value="${contactListParty.fromDate}"/>
>> - <input type="hidden" name="statusId" value="CLPT_PENDING"/>
>> - <a href="javascript:document.clistPending.submit()" class="buttontext">${uiLabelMap.EcommerceSubscribe}</a>
>> - </form>
>> + <a
>> href="<@o...@ofbizUrl>"
>> class="buttontext">${uiLabelMap.EcommerceSubscribe}</a>
>> </#if>
>> </td>
>> </tr>
>> @@ -622,12 +561,7 @@
>> <#if (responses > 0 && survey.allowUpdate?default("N") == "Y")>
>> <#assign surveyLabel = uiLabelMap.EcommerceUpdateSurvey>
>> </#if>
>> - <td align="right" width="10%" nowrap>
>> - <form name= "takeSurvey" method= "post" action= "<@o...@ofbizUrl>">
>> - <input type= "hidden" name= "productStoreSurveyId" value= "${surveyAppl.productStoreSurveyId}">
>> - <a href="javascript:document.takeSurvey.submit()" class="buttontext">${surveyLabel}</a>
>> - </form>
>> - </td>
>> + <td align="right" width="10%" nowrap><a
>> href="<@o...@ofbizUrl>"
>> class="buttontext">${surveyLabel}</a></td>
>> <#else>
>>
>> </#if>
>>
>> Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/anonymoustrail.ftl
>> URL:
>> http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/anonymoustrail.ftl?rev=764077&r1=764076&r2=764077&view=diff
>> ==============================================================================
>> --- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/anonymoustrail.ftl (original)
>> +++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/anonymoustrail.ftl Fri Apr 10 22:09:23 2009
>> @@ -17,15 +17,4 @@
>> under the License.
>> -->
>> -<#if shipAddr?exists>
>> - <a href="<@o...@ofbizUrl>" class="${trailClass.shipAddr}">${uiLabelMap.EcommerceChangeShippingAddress}</a>
>> - <#if shipOptions?exists>
>> - <a href="<@o...@ofbizUrl>"
>> class="${trailClass.shipOptions}">${uiLabelMap.EcommerceChangeShippingOptions}</a>
>> - <#if billing?exists>
>> - <form name= "setBilling" method= "post" action= "<@o...@ofbizUrl>">
>> - <input type= "hidden" name= "resetType" value= "Y">
>> - <a href="javascript:document.setBilling.submit()"
>> class="${trailClass.paymentType}">${uiLabelMap.EcommerceChangePaymentInfo}</a>
>> - </form>
>> - </#if>
>> - </#if>
>> -</#if>
>> +<#if shipAddr?exists><a href="<@o...@ofbizUrl>"
>> class="${trailClass.shipAddr}">${uiLabelMap.EcommerceChangeShippingAddress}</a><#if shipOptions?exists><a
>> href="<@o...@ofbizUrl>"
>> class="${trailClass.shipOptions}">${uiLabelMap.EcommerceChangeShippingOptions}</a><#if billing?exists><a
>> href="<@o...@ofbizUrl>"
>> class="${trailClass.paymentType}">${uiLabelMap.EcommerceChangePaymentInfo}</a></#if></#if></#if>
>>
>> Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/orderheader.ftl
>> URL:
>> http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/orderheader.ftl?rev=764077&r1=764076&r2=764077&view=diff
>> ==============================================================================
>> --- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/orderheader.ftl (original)
>> +++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/orderheader.ftl Fri Apr 10 22:09:23 2009
>> @@ -33,28 +33,17 @@
>> <div class="screenlet-header">
>> <div class="boxlink">
>> <#if maySelectItems?default("N") == "Y" && returnLink?default("N") == "Y" && (orderHeader.statusId)?if_exists ==
>> "ORDER_COMPLETED" && roleTypeId?if_exists == "PLACING_CUSTOMER">
>> - <form name= "makeReturn" method= "post" action= "<@o...@ofbizUrl>">
>> - <input type= "hidden" name= "orderId" value= "${orderHeader.orderId}">
>> - <a href="javascript:document.makeReturn.submit()"
>> class="submenutextright">${uiLabelMap.OrderRequestReturn}</a>
>> - </form>
>> + <a href="<@o...@ofbizUrl>"
>> class="submenutextright">${uiLabelMap.OrderRequestReturn}</a>
>> </#if>
>> </div>
>> <div class="boxhead">
>> ${uiLabelMap.OrderOrder}
>> <#if orderHeader?has_content>
>> - ${uiLabelMap.CommonNbr}
>> - <form name= "orderStatus" method= "post" action= "<@o...@ofbizUrl>">
>> - <input type= "hidden" name= "orderId" value= "${orderHeader.orderId}">
>> - <a href="javascript:document.orderStatus.submit()"
>> class="lightbuttontext">${orderHeader.orderId}</a>
>> - </form>
>> + ${uiLabelMap.CommonNbr}<a href="<@o...@ofbizUrl>"
>> class="lightbuttontext">${orderHeader.orderId}</a>
>> </#if>
>> ${uiLabelMap.CommonInformation}
>> <#if (orderHeader.orderId)?exists>
>> - ${externalOrder?if_exists} [
>> - <form name= "orderPdf" method= "post" action= "<@o...@ofbizUrl>">
>> - <input type= "hidden" name= "orderId" value= "${(orderHeader.orderId)?if_exists}">
>> - <a href="javascript:document.orderPdf.submit()" class="lightbuttontext" target="_blank">PDF</a> ]
>> - </form>
>> + ${externalOrder?if_exists} [ <a
>> href="<@o...@ofbizUrl>" class="lightbuttontext"
>> target="_blank">PDF</a> ]
>> </#if>
>> </div>
>> </div>
>>
>> Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/orderstatus.ftl
>> URL:
>> http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/orderstatus.ftl?rev=764077&r1=764076&r2=764077&view=diff
>> ==============================================================================
>> --- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/orderstatus.ftl (original)
>> +++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/orderstatus.ftl Fri Apr 10 22:09:23 2009
>> @@ -17,7 +17,7 @@
>> under the License.
>> -->
>> <#if orderHeader?has_content>
>> - <form name="addCommonToCartForm" action="<@o...@ofbizUrl>" method="post">
>> + <form name="addCommonToCartForm" action="<@o...@ofbizUrl>"
>> method="GET">
>> <input type="hidden" name="add_all" value="false">
>> <input type="hidden" name="orderId" value="${orderHeader.orderId}">
>> ${screens.render("component://ecommerce/widget/OrderScreens.xml#orderheader")}
>>
>>
>>
>>
>