Author: jleroux
Date: Mon Jun 7 09:18:50 2010
New Revision: 952160
URL: http://svn.apache.org/viewvc?rev=952160&view=rev
Log:
Reverted on Scott's advice (useless and give some trouble on back button: POST
=> msg like "do you want to send again", not GET)
Modified:
ofbiz/branches/release10.04/ (props changed)
ofbiz/branches/release10.04/applications/accounting/widget/InvoiceForms.xml
ofbiz/branches/release10.04/applications/accounting/widget/PaymentGatewayConfigForms.xml
ofbiz/branches/release10.04/applications/order/widget/ordermgr/OrderEntryForms.xml
ofbiz/branches/release10.04/applications/party/widget/partymgr/CommunicationEventForms.xml
ofbiz/branches/release10.04/applications/product/widget/catalog/ProductForms.xml
ofbiz/branches/release10.04/applications/product/widget/facility/ShipmentGatewayConfigForms.xml
ofbiz/branches/release10.04/specialpurpose/projectmgr/widget/forms/ProjectForms.xml
Propchange: ofbiz/branches/release10.04/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jun 7 09:18:50 2010
@@ -1,3 +1,3 @@
/ofbiz/branches/addbirt:831210-885099,885686-886087
/ofbiz/branches/multitenant20100310:921280-927264
-/ofbiz/trunk:939988,939990,939999,940025,940053,940234,940248,940309,940401,940410,940425,940779,940815,940849,941007,941047,941109,941177,941199,941261,941440,941600,941999,942084,942406,942414,942671,942883-942884,943168,943271-943272,944614,944621,944623,944647,944669,944797,944895,945010,945018,945026,945118,945573,945578,945580,945582,945610,945619,945848,945852,945857,946061,946066,946073,946075,946080,946309,946313,946320,946322,946596,947004-947005,947392,947424,947679,947988,948017,948694,949174,949710,949844,950866,950870,950893,951005,951062,951098,951251,951367,951381,951672,952119
+/ofbiz/trunk:939988,939990,939999,940025,940053,940234,940248,940309,940401,940410,940425,940779,940815,940849,941007,941047,941109,941177,941199,941261,941440,941600,941999,942084,942406,942414,942671,942883-942884,943168,943271-943272,944614,944621,944623,944647,944669,944797,944895,945010,945018,945026,945118,945573,945578,945580,945582,945610,945619,945848,945852,945857,946061,946066,946073,946075,946080,946309,946313,946320,946322,946596,947004-947005,947392,947424,947679,947988,948017,948694,949174,949710,949844,950866,950870,950893,951005,951062,951098,951251,951367,951381,951672
Modified:
ofbiz/branches/release10.04/applications/accounting/widget/InvoiceForms.xml
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release10.04/applications/accounting/widget/InvoiceForms.xml?rev=952160&r1=952159&r2=952160&view=diff
==============================================================================
--- ofbiz/branches/release10.04/applications/accounting/widget/InvoiceForms.xml
(original)
+++ ofbiz/branches/release10.04/applications/accounting/widget/InvoiceForms.xml
Mon Jun 7 09:18:50 2010
@@ -215,12 +215,7 @@ under the License.
<field name="paymentId"><hyperlink
target="paymentOverview?paymentId=${paymentId}"
description="${paymentId}"/></field>
<field name="amount"><display type="currency"
currency="${currencyUomId}"/></field>
<field name="origAmount"><display type="currency"
currency="${origCurrencyUomId}"/></field>
- <field name="acctgTransId">
- <hyperlink description="${acctgTransId}" target="EditAcctgTrans">
- <parameter param-name="acctgTransId"
from-field="acctgTransId"/>
- <parameter param-name="organizationPartyId"
from-field="organizationPartyId"/>
- </hyperlink>
- </field>
+ <field name="acctgTransId"><hyperlink description="${acctgTransId}"
target="EditAcctgTrans?acctgTransId=${acctgTransId}&organizationPartyId=${organizationPartyId}"/></field>
<field name="acctgTransTypeId"
title="${uiLabelMap.FormFieldTitle_acctgTransType}"><display-entity
entity-name="AcctgTransType"/></field>
<field name="glJournalId"
title="${uiLabelMap.FormFieldTitle_glJournal}"><display-entity
entity-name="GlJournal" description="${glJournalName}"/></field>
<field name="glAccountTypeId"
title="${uiLabelMap.FormFieldTitle_glAccountType}"><display-entity
entity-name="GlAccountType"/></field>
Modified:
ofbiz/branches/release10.04/applications/accounting/widget/PaymentGatewayConfigForms.xml
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release10.04/applications/accounting/widget/PaymentGatewayConfigForms.xml?rev=952160&r1=952159&r2=952160&view=diff
==============================================================================
---
ofbiz/branches/release10.04/applications/accounting/widget/PaymentGatewayConfigForms.xml
(original)
+++
ofbiz/branches/release10.04/applications/accounting/widget/PaymentGatewayConfigForms.xml
Mon Jun 7 09:18:50 2010
@@ -50,9 +50,7 @@ under the License.
<auto-fields-entity entity-name="PaymentGatewayConfig"
default-field-type="display"/>
<field name="paymentGatewayConfigId"><hidden/></field>
<field name="description"
title="${uiLabelMap.AccountingPaymentGatewayConfigDescription}">
- <hyperlink description="${description}"
target="EditPaymentGatewayConfig">
- <parameter param-name="paymentGatewayConfigId"
from-field="paymentGatewayConfigId"/>
- </hyperlink>
+ <hyperlink description="${description}"
target="EditPaymentGatewayConfig?paymentGatewayConfigId=${paymentGatewayConfigId}"/>
</field>
<field name="paymentGatewayConfigTypeId"
title="${uiLabelMap.AccountingPaymentGatewayConfigTypeId}">
<display-entity entity-name="PaymentGatewayConfigType"
key-field-name="paymentGatewayConfigTypeId" description="${description}"/>
@@ -387,9 +385,7 @@ under the License.
<auto-fields-entity entity-name="PaymentGatewayConfigType"
default-field-type="display"/>
<field name="paymentGatewayConfigTypeId"><hidden/></field>
<field name="description"
title="${uiLabelMap.AccountingPaymentGatewayConfigTypeDescription}">
- <hyperlink description="${description}"
target="EditPaymentGatewayConfigType">
- <parameter
param-name="paymentGatewayConfigTypeId"
from-field="paymentGatewayConfigTypeId"/>
- </hyperlink>
+ <hyperlink description="${description}"
target="EditPaymentGatewayConfigType?paymentGatewayConfigTypeId=${paymentGatewayConfigTypeId}"/>
</field>
</form>
Modified:
ofbiz/branches/release10.04/applications/order/widget/ordermgr/OrderEntryForms.xml
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release10.04/applications/order/widget/ordermgr/OrderEntryForms.xml?rev=952160&r1=952159&r2=952160&view=diff
==============================================================================
---
ofbiz/branches/release10.04/applications/order/widget/ordermgr/OrderEntryForms.xml
(original)
+++
ofbiz/branches/release10.04/applications/order/widget/ordermgr/OrderEntryForms.xml
Mon Jun 7 09:18:50 2010
@@ -199,9 +199,7 @@ under the License.
<form name="LookupAssociatedProducts" type="multi" use-row-submit="true"
list-name="productList" title="" target="BulkAddProducts"
paginate-target="LookupAssociatedProducts"
default-title-style="tableheadtext" default-widget-style="inputBox"
default-tooltip-style="tabletext">
<field name="productId" title="${uiLabelMap.ProductProductId}"
widget-style="buttontext">
- <hyperlink description="${productId}"
target="/catalog/control/EditProductInventoryItems" target-type="inter-app">
- <parameter param-name="productId"
from-field="productId"/>
- </hyperlink>
+ <hyperlink description="${productId}"
target="/catalog/control/EditProductInventoryItems?productId=${productId}"
target-type="inter-app"/>
</field>
<field name="brandName"
title="${uiLabelMap.ProductBrandName}"><display/></field>
<field name="internalName"><display/></field>
Modified:
ofbiz/branches/release10.04/applications/party/widget/partymgr/CommunicationEventForms.xml
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release10.04/applications/party/widget/partymgr/CommunicationEventForms.xml?rev=952160&r1=952159&r2=952160&view=diff
==============================================================================
---
ofbiz/branches/release10.04/applications/party/widget/partymgr/CommunicationEventForms.xml
(original)
+++
ofbiz/branches/release10.04/applications/party/widget/partymgr/CommunicationEventForms.xml
Mon Jun 7 09:18:50 2010
@@ -287,9 +287,7 @@ under the License.
<field name="communicationEventId"><display/></field>
<field name="contactListId" use-when="contactListId!=null">
<display-entity entity-name="ContactList"
description="${contactListName}">
- <sub-hyperlink target="/marketing/control/EditContactList"
description="[${communicationEvent.contactListId}]" target-type="inter-app">
- <parameter param-name="contactListId"
from-field="communicationEvent.contactListId"/>
- </sub-hyperlink>
+ <sub-hyperlink
target="/marketing/control/EditContactList?contactListId=${communicationEvent.contactListId}"
description="[${communicationEvent.contactListId}]" target-type="inter-app"/>
</display-entity>
</field>
<field name="partyIdFrom" use-when=""my"==void"
title="${uiLabelMap.PartyPartyFrom}">
@@ -472,9 +470,7 @@ under the License.
</service>
</actions>
<field name="orderId" title="${uiLabelMap.FormFieldTitle_orderId}">
- <hyperlink target="/ordermgr/control/orderview"
description="${orderId}" target-type="inter-app">
- <parameter param-name="orderId" from-field="orderId"/>
- </hyperlink>
+ <hyperlink target="/ordermgr/control/orderview?orderId=${orderId}"
description="${orderId}" target-type="inter-app"/>
</field>
<field name="communicationEventId">
<hyperlink description="${communicationEventId}"
target="ViewCommunicationEvent">
@@ -1026,9 +1022,7 @@ under the License.
<set field="orderTypeId" from-field="orderHeader.orderTypeId"/>
</row-actions>
<field name="orderId" title="${uiLabelMap.FormFieldTitle_orderId}"
widget-style="buttontext">
- <hyperlink target="/ordermgr/control/orderview"
description="${orderId}" target-type="inter-app">
- <parameter param-name="orderId" from-field="orderId"/>
- </hyperlink>
+ <hyperlink target="/ordermgr/control/orderview?orderId=${orderId}"
description="${orderId}" target-type="inter-app"/>
</field>
<field name="communicationEventId"><hidden/></field>
<field name="orderTypeId" title="${uiLabelMap.OrderOrderType}">
Modified:
ofbiz/branches/release10.04/applications/product/widget/catalog/ProductForms.xml
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release10.04/applications/product/widget/catalog/ProductForms.xml?rev=952160&r1=952159&r2=952160&view=diff
==============================================================================
---
ofbiz/branches/release10.04/applications/product/widget/catalog/ProductForms.xml
(original)
+++
ofbiz/branches/release10.04/applications/product/widget/catalog/ProductForms.xml
Mon Jun 7 09:18:50 2010
@@ -1989,9 +1989,7 @@ under the License.
<form name="ListCommEvents" list-name="communicationEvents" type="list"
header-row-style="header-row" default-table-style="basic-table">
<field name="communicationEventId" widget-style="buttontext">
- <hyperlink description="${communicationEventId}"
target="/partymgr/control/EditCommunicationEvent" target-type="inter-app">
- <parameter param-name="communicationEventId"
from-field="communicationEventId"/>
- </hyperlink>
+ <hyperlink description="${communicationEventId}"
target="/partymgr/control/EditCommunicationEvent?communicationEventId=${communicationEventId}"
target-type="inter-app"/>
</field>
<field name="subject"><display/></field>
<field name="communicationEventTypeId"><display-entity
description="${description}" entity-name="CommunicationEventType"
key-field-name="communicationEventTypeId"/></field>
Modified:
ofbiz/branches/release10.04/applications/product/widget/facility/ShipmentGatewayConfigForms.xml
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release10.04/applications/product/widget/facility/ShipmentGatewayConfigForms.xml?rev=952160&r1=952159&r2=952160&view=diff
==============================================================================
---
ofbiz/branches/release10.04/applications/product/widget/facility/ShipmentGatewayConfigForms.xml
(original)
+++
ofbiz/branches/release10.04/applications/product/widget/facility/ShipmentGatewayConfigForms.xml
Mon Jun 7 09:18:50 2010
@@ -50,9 +50,7 @@ under the License.
<auto-fields-entity entity-name="ShipmentGatewayConfig"
default-field-type="display"/>
<field name="shipmentGatewayConfigId"><hidden/></field>
<field name="description"
title="${uiLabelMap.FacilityShipmentGatewayConfigDescription}">
- <hyperlink description="${description}"
target="EditShipmentGatewayConfig">
- <parameter param-name="shipmentGatewayConfigId"
from-field="shipmentGatewayConfigId"/>
- </hyperlink>
+ <hyperlink description="${description}"
target="EditShipmentGatewayConfig?shipmentGatewayConfigId=${shipmentGatewayConfigId}"/>
</field>
<field name="shipmentGatewayConfTypeId"
title="${uiLabelMap.FacilityShipmentGatewayConfigTypeId}">
<display-entity entity-name="ShipmentGatewayConfigType"
key-field-name="shipmentGatewayConfTypeId" description="${description}"/>
@@ -315,9 +313,7 @@ under the License.
<auto-fields-entity entity-name="ShipmentGatewayConfigType"
default-field-type="display"/>
<field name="shipmentGatewayConfTypeId"><hidden/></field>
<field name="description"
title="${uiLabelMap.FacilityShipmentGatewayConfigTypeDescription}">
- <hyperlink description="${description}"
target="EditShipmentGatewayConfigType">
- <parameter param-name="shipmentGatewayConfTypeId"
from-field="shipmentGatewayConfTypeId"/>
- </hyperlink>
+ <hyperlink description="${description}"
target="EditShipmentGatewayConfigType?shipmentGatewayConfTypeId=${shipmentGatewayConfTypeId}"/>
</field>
</form>
Modified:
ofbiz/branches/release10.04/specialpurpose/projectmgr/widget/forms/ProjectForms.xml
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release10.04/specialpurpose/projectmgr/widget/forms/ProjectForms.xml?rev=952160&r1=952159&r2=952160&view=diff
==============================================================================
---
ofbiz/branches/release10.04/specialpurpose/projectmgr/widget/forms/ProjectForms.xml
(original)
+++
ofbiz/branches/release10.04/specialpurpose/projectmgr/widget/forms/ProjectForms.xml
Mon Jun 7 09:18:50 2010
@@ -340,9 +340,7 @@
<field name="estimatedStartDate"
title="${uiLabelMap.WorkEffortEstimatedStartDate}"><date-time
type="date"/></field>
<field name="estimatedCompletionDate"
title="${uiLabelMap.WorkEffortEstimatedCompletionDate}"><date-time
type="date"/></field>
<field name="edit" title=" ">
- <hyperlink target="EditTask"
description="${uiLabelMap.CommonEdit"}>
- <parameter param-name="workEffortId"
from-field="workEffortId}"/>
- </hyperlink>
+ <hyperlink target="EditTask?workEffortId=${workEffortId}"
description="${uiLabelMap.CommonEdit}"/>
</field>
<field name="submitButton" title="${uiLabelMap.CommonUpdate}"><submit
button-type="button"/></field>
</form>
