Modified: ofbiz/trunk/applications/product/webapp/catalog/product/ProductForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/product/ProductForms.xml?rev=759680&r1=759679&r2=759680&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/catalog/product/ProductForms.xml (original) +++ ofbiz/trunk/applications/product/webapp/catalog/product/ProductForms.xml Sun Mar 29 13:33:53 2009 @@ -691,10 +691,10 @@ <field name="description" title="${uiLabelMap.ProductProductDescription}" map-name="content"><text size="40"/></field> <field use-when="contentId == null" name="contentId" title="${uiLabelMap.ProductContentId}" tooltip="${uiLabelMap.ProductOptional}"><text maxlength="20"/></field> <field use-when="contentId != null" name="contentId" title="${uiLabelMap.ProductContentId}" tooltip="${uiLabelMap.ProductNotModificationRecrationProductContentAssociation}" map-name="productContentData" > - <hyperlink description="${contentId} ${contentName}" target="/content/control/editContent" target-type="inter-app"> - <parameter param-name="contentId" from-field="contentId"/> - </hyperlink> - </field> + <hyperlink description="${contentId} ${contentName}" target="/content/control/editContent" target-type="inter-app"> + <parameter param-name="contentId" from-field="contentId"/> + </hyperlink> + </field> <field name="imageData" title="${uiLabelMap.ProductFile}"><file/></field> <field name="fileDataResourceId" map-name="downloadData"><hidden/></field> <field name="productId"><hidden/></field> @@ -1102,7 +1102,9 @@ <display-entity entity-name="WorkEffort" key-field-name="workEffortId" description="${workEffortName}"/> </field> <field name="workEffortId" title="${uiLabelMap.CommonEdit}" widget-style="buttontext"> - <hyperlink also-hidden="false" description="${workEffortId}" target="/manufacturing/control/EditRoutingProductLink?workEffortId=${workEffortId}" target-type="inter-app"/> + <hyperlink also-hidden="false" description="${workEffortId}" target="/manufacturing/control/EditRoutingProductLink" target-type="inter-app"> + <parameter param-name="workEffortId" from-field="workEffortId"/> + </hyperlink> </field> </form> @@ -1177,10 +1179,10 @@ odd-row-style="alternate-row" default-table-style="basic-table"> <field name="orderDate"><display/></field> <field name="orderId"> - <hyperlink also-hidden="false" description="${orderId}" target="/ordermgr/control/orderview" target-type="inter-app"> - <parameter param-name="orderId" from-field="orderId"/> - </hyperlink> - </field> + <hyperlink also-hidden="false" description="${orderId}" target="/ordermgr/control/orderview" target-type="inter-app"> + <parameter param-name="orderId" from-field="orderId"/> + </hyperlink> + </field> <field name="orderItemSeqId"><display/></field> <field name="quantity"><display/></field> <field name="cancelQuantity"><display/></field> @@ -1368,12 +1370,16 @@ <field name="productId"><hidden/></field> <field name="productFeatureId"> <display-entity entity-name="ProductFeature" description="${description}"> - <sub-hyperlink target="EditFeature?productFeatureId=${productFeatureId}" description="[${productFeatureId}]"/> + <sub-hyperlink target="EditFeature" description="[${productFeatureId}]"> + <parameter param-name="productFeatureId" from-field="productFeatureId"/> + </sub-hyperlink> </display-entity> </field> <field name="productFeatureIdTo"> <display-entity entity-name="ProductFeature" description="${description}" key-field-name="productFeatureId"> - <sub-hyperlink target="EditFeature?productFeatureId=${productFeatureIdTo}" description="[${productFeatureIdTo}]"/> + <sub-hyperlink target="EditFeature" description="[${productFeatureIdTo}]"> + <parameter param-name="productFeatureId" from-field="productFeatureIdTo"/> + </sub-hyperlink> </display-entity> </field> <field name="productFeatureIactnTypeId"><display-entity entity-name="ProductFeatureIactnType"/></field> Modified: ofbiz/trunk/applications/product/webapp/catalog/store/ProductStoreForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/store/ProductStoreForms.xml?rev=759680&r1=759679&r2=759680&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/catalog/store/ProductStoreForms.xml (original) +++ ofbiz/trunk/applications/product/webapp/catalog/store/ProductStoreForms.xml Sun Mar 29 13:33:53 2009 @@ -30,7 +30,9 @@ <field name="title" title="${uiLabelMap.ProductTitle}"><display/></field> <field name="subtitle" title="${uiLabelMap.ProductSubTitle}"><display/></field> <field name="editLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext"> - <hyperlink target="EditProductStore?productStoreId=${productStoreId}" description="${uiLabelMap.CommonEdit}"/> + <hyperlink target="EditProductStore" description="${uiLabelMap.CommonEdit}"> + <parameter param-name="productStoreId" from-field="productStoreId"/> + </hyperlink> </field> </form> <form name="EditProductStore" type="single" target="updateProductStore" title="" default-map-name="productStore" Modified: ofbiz/trunk/applications/product/webapp/facility/facility/FacilityForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/facility/FacilityForms.xml?rev=759680&r1=759679&r2=759680&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/facility/facility/FacilityForms.xml (original) +++ ofbiz/trunk/applications/product/webapp/facility/facility/FacilityForms.xml Sun Mar 29 13:33:53 2009 @@ -29,7 +29,9 @@ </service> </actions> <field name="facilityId"> - <hyperlink target="EditFacility?facilityId=${facilityId}" description="${facilityId}"/> + <hyperlink target="EditFacility" description="${facilityId}"> + <parameter param-name="facilityId" from-field="facilityId"/> + </hyperlink> </field> <field name="facilityName"><display/></field> <field name="facilityTypeId" title="${uiLabelMap.ProductFacilityType}"> @@ -459,7 +461,9 @@ <form name="SchedulingList" type="multi" use-row-submit="true" list-name="shipmentRouteSegments" title="${uiLabelMap.PageTitlePackageShipmentScheduling}" target="BatchScheduleShipmentRouteSegments?facilityId=${facilityId}" odd-row-style="alternate-row" default-table-style="basic-table hover-bar" separate-columns="true"> <field name="shipmentId" title="${uiLabelMap.ProductShipmentId}"> - <hyperlink target="ViewShipment?shipmentId=${shipmentId}" description="${shipmentId}"/> + <hyperlink target="ViewShipment" description="${shipmentId}"> + <parameter param-name="shipmentId" from-field="shipmentId"/> + </hyperlink> </field> <field name="primaryOrderId" title="${uiLabelMap.ProductOrderId}"> <hyperlink target="/ordermgr/control/orderview" description="${primaryOrderId}" target-type="inter-app"> @@ -467,7 +471,9 @@ </hyperlink> </field> <field name="shipmentRouteSegmentId"> - <hyperlink target="EditShipmentRouteSegments?shipmentId=${shipmentId}" description="${shipmentRouteSegmentId}"/> + <hyperlink target="EditShipmentRouteSegments" description="${shipmentRouteSegmentId}"> + <parameter param-name="shipmentId" from-field="shipmentId"/> + </hyperlink> </field> <field name="carrierPartyId" title="${uiLabelMap.ProductCarrier}"> <display-entity description="${groupName}" entity-name="PartyNameView" key-field-name="partyId"/> @@ -497,7 +503,9 @@ <form name="Labels" type="multi" use-row-submit="true" list-name="shipmentPackageRouteSegments" title="" target="BatchPrintShippingLabels" separate-columns="true" odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <field name="shipmentId" title="${uiLabelMap.ProductShipmentId}"> - <hyperlink target="ViewShipment?shipmentId=${shipmentId}" description="${shipmentId}"/> + <hyperlink target="ViewShipment" description="${shipmentId}"> + <parameter param-name="shipmentId" from-field="shipmentId"/> + </hyperlink> </field> <field name="primaryOrderId" title="${uiLabelMap.ProductOrderId}"> <hyperlink target="/ordermgr/control/orderview" description="${primaryOrderId}" target-type="inter-app"> @@ -546,7 +554,9 @@ <hyperlink description="${inventoryItemId}" target="EditInventoryItem?inventoryItemId=${inventoryItemId}"/> </field> <field name="productId" widget-style="buttontext"> - <hyperlink description="${productId}" target="/catalog/control/EditProductInventoryItems?productId=${productId}" target-type="inter-app"/> + <hyperlink description="${productId}" target="/catalog/control/EditProductInventoryItems" target-type="inter-app"> + <parameter param-name="productId" from-field="productId"/> + </hyperlink> </field> <field name="internalName"><display/></field> <field name="availableToPromiseTotal" title="${uiLabelMap.ProductItemATP}"><display/></field> @@ -572,7 +582,9 @@ <field name="facilityId"><hidden/></field> <field name="facilityGroupId" title="${uiLabelMap.ProductFacilityGroupId}"> <display-entity entity-name="FacilityGroup" key-field-name="facilityGroupId" description="${facilityGroupName}"> - <sub-hyperlink target="EditFacilityGroup?facilityGroupId=${facilityGroupId}" description="[${facilityGroupId}]"/> + <sub-hyperlink target="EditFacilityGroup" description="[${facilityGroupId}]"> + <parameter param-name="facilityGroupId" from-field="facilityGroupId"/> + </sub-hyperlink> </display-entity> </field> <field name="fromDate"><display/></field> @@ -718,13 +730,19 @@ </row-actions> <field name="inventoryTransferId" title="${uiLabelMap.ProductInventoryTransfer}" widget-style="buttontext"> - <hyperlink target="TransferInventoryItem?inventoryTransferId=${inventoryTransferId}" description="${inventoryTransferId}"/> + <hyperlink target="TransferInventoryItem" description="${inventoryTransferId}"> + <parameter param-name="inventoryTransferId" from-field="inventoryTransferId"/> + </hyperlink> </field> <field name="inventoryItemId" widget-style="buttontext"> - <hyperlink target="EditInventoryItem?inventoryItemId=${inventoryItemId}" description="${inventoryItemId}"/> + <hyperlink target="EditInventoryItem" description="${inventoryItemId}"> + <parameter param-name="inventoryItemId" from-field="inventoryItemId"/> + </hyperlink> </field> <field name="facilityId" widget-style="buttontext"> - <hyperlink target="EditFacility?facilityId=${facilityId}" description="${facilityId}"/> + <hyperlink target="EditFacility" description="${facilityId}"> + <parameter param-name="facilityId" from-field="facilityId"/> + </hyperlink> </field> <field name="facilityName" entry-name="facilityId"> <display-entity entity-name="Facility" key-field-name="facilityId" description="${facilityName}"/> @@ -756,13 +774,19 @@ </entity-one> </row-actions> <field name="inventoryTransferId" title="${uiLabelMap.ProductInventoryTransfer}" widget-style="buttontext"> - <hyperlink target="TransferInventoryItem?inventoryTransferId=${inventoryTransferId}" description="${inventoryTransferId}"/> + <hyperlink target="TransferInventoryItem" description="${inventoryTransferId}"> + <parameter param-name="inventoryTransferId" from-field="inventoryTransferId"/> + </hyperlink> </field> <field name="inventoryItemId" widget-style="buttontext"> - <hyperlink target="EditInventoryItem?inventoryItemId=${inventoryItemId}" description="${inventoryItemId}"/> + <hyperlink target="EditInventoryItem" description="${inventoryItemId}"> + <parameter param-name="inventoryItemId" from-field="inventoryItemId"/> + </hyperlink> </field> <field name="facilityIdTo" widget-style="buttontext"> - <hyperlink target="EditFacility?facilityId=${facilityIdTo}" description="${facilityIdTo}"/> + <hyperlink target="EditFacility" description="${facilityIdTo}"> + <parameter param-name="facilityId" from-field="facilityIdTo"/> + </hyperlink> </field> <field name="facilityName" entry-name="facilityIdTo"> <display-entity entity-name="Facility" key-field-name="facilityId" description="${facilityName}"/> @@ -795,10 +819,14 @@ </entity-one> </row-actions> <field name="inventoryTransferId" title="${uiLabelMap.ProductInventoryTransfer}" widget-style="buttontext"> - <hyperlink target="TransferInventoryItem?inventoryTransferId=${inventoryTransferId}" description="${inventoryTransferId}"/> + <hyperlink target="TransferInventoryItem" description="${inventoryTransferId}"> + <parameter param-name="inventoryTransferId" from-field="inventoryTransferId"/> + </hyperlink> </field> <field name="inventoryItemId" widget-style="buttontext"> - <hyperlink target="EditInventoryItem?inventoryItemId=${inventoryItemId}" description="${inventoryItemId}"/> + <hyperlink target="EditInventoryItem" description="${inventoryItemId}"> + <parameter param-name="inventoryItemId" from-field="inventoryItemId"/> + </hyperlink> </field> <field name="facilityIdTo" widget-style="buttontext"> <hyperlink target="EditFacility" description="${facilityIdTo}" also-hidden="false"> Modified: ofbiz/trunk/applications/product/webapp/facility/group/FacilityGroupForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/group/FacilityGroupForms.xml?rev=759680&r1=759679&r2=759680&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/facility/group/FacilityGroupForms.xml (original) +++ ofbiz/trunk/applications/product/webapp/facility/group/FacilityGroupForms.xml Sun Mar 29 13:33:53 2009 @@ -57,7 +57,9 @@ <field name="facilityGroupId"><hidden value="${facilityGroupId}"/></field> <field name="parentFacilityGroupId"> <display-entity entity-name="FacilityGroup" key-field-name="facilityGroupId" description="${facilityGroupName}"> - <sub-hyperlink target="EditFacilityGroup?facilityGroupId=${parentFacilityGroupId}" description="[${parentFacilityGroupId}]"/> + <sub-hyperlink target="EditFacilityGroup" description="[${parentFacilityGroupId}]"> + <parameter param-name="facilityGroupId" from-field="parentFacilityGroupId"/> + </sub-hyperlink> </display-entity> </field> <field name="fromDate"><display/></field> @@ -87,7 +89,9 @@ <field name="parentFacilityGroupId"><hidden/></field> <field name="facilityGroupId"> <display-entity entity-name="FacilityGroup" description="${facilityGroupName}"> - <sub-hyperlink target="EditFacilityGroup?facilityGroupId=${facilityGroupId}" description="[${facilityGroupId}]"/> + <sub-hyperlink target="EditFacilityGroup" description="[${facilityGroupId}]"> + <parameter param-name="facilityGroupId" from-field="facilityGroupId"/> + </sub-hyperlink> </display-entity> </field> <field name="fromDate"><display/></field> @@ -117,7 +121,9 @@ <field name="facilityGroupId"><hidden value="${facilityGroupId}"/></field> <field name="facilityId"> <display-entity entity-name="Facility" key-field-name="facilityId" description="${facilityName}"> - <sub-hyperlink target="EditFacilityGroup?facilityId=${facilityId}" description="[${facilityId}]"/> + <sub-hyperlink target="EditFacilityGroup" description="[${facilityId}]"> + <parameter param-name="facilityId" from-field="facilityId"/> + </sub-hyperlink> </display-entity> </field> <field name="fromDate"><display/></field> @@ -146,7 +152,9 @@ <field name="facilityGroupId"><hidden value="${facilityGroupId}"/></field> <field name="partyId"> <display-entity entity-name="Party" key-field-name="partyId" description="${partyId}"> - <sub-hyperlink target="viewProfile?partyId=${partyId}" description="[${partyId}]"/> + <sub-hyperlink target="viewProfile" description="[${partyId}]"> + <parameter param-name="partyId" from-field="partyId"/> + </sub-hyperlink> </display-entity> </field> <field name="roleTypeId"> Modified: ofbiz/trunk/applications/product/widget/catalog/SubscriptionForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/SubscriptionForms.xml?rev=759680&r1=759679&r2=759680&view=diff ============================================================================== --- ofbiz/trunk/applications/product/widget/catalog/SubscriptionForms.xml (original) +++ ofbiz/trunk/applications/product/widget/catalog/SubscriptionForms.xml Sun Mar 29 13:33:53 2009 @@ -170,7 +170,9 @@ <field name="purchaseThruDate"><ignored/></field> <field name="subscriptionId" widget-style="buttontext"> - <hyperlink description="${subscriptionId}" target="EditSubscription?subscriptionId=${subscriptionId}" also-hidden="false"/> + <hyperlink description="${subscriptionId}" target="EditSubscription" also-hidden="false"> + <parameter param-name="subscriptionId" from-field="subscriptionId"/> + </hyperlink> </field> </form> <form name="EditSubscription" type="single" target="updateSubscription" default-map-name="subscription" @@ -426,7 +428,9 @@ </actions> <field name="subscriptionId"><hidden/></field> <field name="communicationEventId" widget-style="buttontext"> - <hyperlink also-hidden="false" description="${communicationEventId}" target="/partymgr/control/EditCommunicationEvent?communicationEventId=${communicationEventId}" target-type="inter-app"/> + <hyperlink also-hidden="false" description="${communicationEventId}" target="/partymgr/control/EditCommunicationEvent" target-type="inter-app"> + <parameter param-name="communicationEventId" from-field="communicationEventId"/> + </hyperlink> </field> <field name="partyIdFrom"> <display-entity description="${firstName} ${lastName} [${partyId}]" entity-name="Person" key-field-name="partyId"/> Modified: ofbiz/trunk/applications/workeffort/widget/TimesheetForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/widget/TimesheetForms.xml?rev=759680&r1=759679&r2=759680&view=diff ============================================================================== --- ofbiz/trunk/applications/workeffort/widget/TimesheetForms.xml (original) +++ ofbiz/trunk/applications/workeffort/widget/TimesheetForms.xml Sun Mar 29 13:33:53 2009 @@ -29,7 +29,9 @@ </actions> <auto-fields-entity entity-name="Timesheet"/> <field name="timesheetId" title="${uiLabelMap.WorkEffortTimesheetTimesheetId}" widget-style="buttontext"> - <hyperlink description="${timesheetId}" target="EditTimesheet?timesheetId=${timesheetId}" also-hidden="false"/> + <hyperlink description="${timesheetId}" target="EditTimesheet" also-hidden="false"> + <parameter param-name="timesheetId" from-field="timesheetId"/> + </hyperlink> </field> <field name="partyId"><hidden/></field> <field name="clientPartyId"><display-entity entity-name="PartyNameView" key-field-name="partyId" description="${firstName} ${middleName} ${lastName} ${groupName} [${partyId}]"/></field> @@ -82,7 +84,9 @@ </actions> <auto-fields-entity entity-name="Timesheet"/> <field name="timesheetId" title="${uiLabelMap.WorkEffortTimesheetTimesheetId}" widget-style="buttontext"> - <hyperlink description="${timesheetId}" target="EditTimesheet?timesheetId=${timesheetId}" also-hidden="false"/> + <hyperlink description="${timesheetId}" target="EditTimesheet" also-hidden="false"> + <parameter param-name="timesheetId" from-field="timesheetId"/> + </hyperlink> </field> <field name="partyId" title="${uiLabelMap.PartyParty}"><display-entity entity-name="PartyNameView" description="${firstName} ${middleName} ${lastName} ${groupName} [${partyId}]"/></field> </form> Modified: ofbiz/trunk/applications/workeffort/widget/WorkEffortForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/widget/WorkEffortForms.xml?rev=759680&r1=759679&r2=759680&view=diff ============================================================================== --- ofbiz/trunk/applications/workeffort/widget/WorkEffortForms.xml (original) +++ ofbiz/trunk/applications/workeffort/widget/WorkEffortForms.xml Sun Mar 29 13:33:53 2009 @@ -337,12 +337,16 @@ header-row-style="header-row" default-table-style="basic-table"> <field name="workEffortIdFrom" map-name="workEffortAssoc"> <display-entity entity-name="WorkEffort" key-field-name="workEffortId" description="${workEffortName}"> - <sub-hyperlink description="${workEffortIdFrom}" target="EditWorkEffort?workEffortId=${workEffortIdFrom}" link-style="buttontext"/> + <sub-hyperlink description="${workEffortIdFrom}" target="EditWorkEffort" link-style="buttontext"> + <parameter param-name="workEffortId" from-field="workEffortIdFrom"/> + </sub-hyperlink> </display-entity> </field> <field name="workEffortIdTo" map-name="workEffortAssoc"> <display-entity entity-name="WorkEffort" key-field-name="workEffortId" description="${workEffortName}"> - <sub-hyperlink description="${workEffortIdTo}" target="EditWorkEffort?workEffortId=${workEffortIdTo}" link-style="buttontext"/> + <sub-hyperlink description="${workEffortIdTo}" target="EditWorkEffort" link-style="buttontext"> + <parameter param-name="workEffortId" from-field="workEffortIdTo"/> + </sub-hyperlink> </display-entity> </field> <field name="workEffortAssocTypeId" map-name="workEffortAssoc"> @@ -360,12 +364,16 @@ <alt-target target="createWorkEffortAndAssoc" use-when="workEffortAssoc==null"/> <field name="workEffortIdFrom" map-name="workEffortAssoc"> <display-entity entity-name="WorkEffort" key-field-name="workEffortId" description="${workEffortName}"> - <sub-hyperlink description="${workEffortIdFrom}" target="EditWorkEffort?workEffortId=${workEffortIdFrom}" link-style="buttontext"/> + <sub-hyperlink description="${workEffortIdFrom}" target="EditWorkEffort" link-style="buttontext"> + <parameter param-name="workEffortId" from-field="workEffortIdFrom"/> + </sub-hyperlink> </display-entity> </field> <field name="workEffortIdTo" map-name="workEffortAssoc"> <display-entity entity-name="WorkEffort" key-field-name="workEffortId" description="${workEffortName}"> - <sub-hyperlink description="${workEffortIdTo}" target="EditWorkEffort?workEffortId=${workEffortIdTo}" link-style="buttontext"/> + <sub-hyperlink description="${workEffortIdTo}" target="EditWorkEffort" link-style="buttontext"> + <parameter param-name="workEffortId" from-field="workEffortIdTo"/> + </sub-hyperlink> </display-entity> </field> <field name="workEffortId"><hidden/></field> Modified: ofbiz/trunk/applications/workeffort/widget/WorkEffortQuoteForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/widget/WorkEffortQuoteForms.xml?rev=759680&r1=759679&r2=759680&view=diff ============================================================================== --- ofbiz/trunk/applications/workeffort/widget/WorkEffortQuoteForms.xml (original) +++ ofbiz/trunk/applications/workeffort/widget/WorkEffortQuoteForms.xml Sun Mar 29 13:33:53 2009 @@ -29,10 +29,10 @@ </actions> <field name="workEffortId"><hidden/></field> <field name="quoteId" widget-style="buttontext"> - <hyperlink description="${quoteId}" target="/ordermgr/control/EditQuote" target-type="inter-app"> - <parameter param-name="quoteId" from-field="quoteId"/> - </hyperlink> - </field> + <hyperlink description="${quoteId}" target="/ordermgr/control/EditQuote" target-type="inter-app"> + <parameter param-name="quoteId" from-field="quoteId"/> + </hyperlink> + </field> <field name="quoteName"><display/></field> <field name="description"><display/></field> <field name="statusItemDescription"><display/></field> @@ -60,10 +60,10 @@ </actions> <field name="workEffortId"><hidden/></field> <field name="quoteId" widget-style="buttontext"> - <hyperlink description="${quoteId}" target="/ordermgr/control/EditQuote" target-type="inter-app"> - <parameter param-name="quoteId" from-field="quoteId"/> - </hyperlink> - </field> + <hyperlink description="${quoteId}" target="/ordermgr/control/EditQuote" target-type="inter-app"> + <parameter param-name="quoteId" from-field="quoteId"/> + </hyperlink> + </field> <field name="quoteItemSeqId" widget-style="buttontext"> <hyperlink description="${quoteItemSeqId}" target="/ordermgr/control/EditQuoteItem" target-type="inter-app"> <parameter param-name="workEffortId" from-field="workEffortId"/> Modified: ofbiz/trunk/applications/workeffort/widget/WorkEffortRequestForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/widget/WorkEffortRequestForms.xml?rev=759680&r1=759679&r2=759680&view=diff ============================================================================== --- ofbiz/trunk/applications/workeffort/widget/WorkEffortRequestForms.xml (original) +++ ofbiz/trunk/applications/workeffort/widget/WorkEffortRequestForms.xml Sun Mar 29 13:33:53 2009 @@ -29,10 +29,10 @@ </actions> <field name="workEffortId"><hidden/></field> <field name="custRequestId" widget-style="buttontext"> - <hyperlink description="${custRequestId}" target="/ordermgr/control/EditRequest" target-type="inter-app"> - <parameter param-name="custRequestId" from-field="custRequestId"/> - </hyperlink> - </field> + <hyperlink description="${custRequestId}" target="/ordermgr/control/EditRequest" target-type="inter-app"> + <parameter param-name="custRequestId" from-field="custRequestId"/> + </hyperlink> + </field> <field name="description"><display/></field> <field name="custRequestTypeDescription"><display/></field> <field name="statusItemDescription"><display/></field> @@ -61,10 +61,10 @@ </actions> <field name="workEffortId"><hidden/></field> <field name="custRequestId" widget-style="buttontext"> - <hyperlink description="${custRequestId}" target="/ordermgr/control/EditRequest" target-type="inter-app"> - <parameter param-name="custRequestId" from-field="custRequestId"/> - </hyperlink> - </field> + <hyperlink description="${custRequestId}" target="/ordermgr/control/EditRequest" target-type="inter-app"> + <parameter param-name="custRequestId" from-field="custRequestId"/> + </hyperlink> + </field> <field name="custRequestItemSeqId" widget-style="buttontext"><display/></field> <field name="statusItemDescription"><display/></field> <field name="priority"><display/></field> Modified: ofbiz/trunk/specialpurpose/assetmaint/widget/ismgr/FixedAssetForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/assetmaint/widget/ismgr/FixedAssetForms.xml?rev=759680&r1=759679&r2=759680&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/assetmaint/widget/ismgr/FixedAssetForms.xml (original) +++ ofbiz/trunk/specialpurpose/assetmaint/widget/ismgr/FixedAssetForms.xml Sun Mar 29 13:33:53 2009 @@ -123,7 +123,9 @@ <field name="classEnumId"><display-entity entity-name="Enumeration" key-field-name="enumId"/></field> <field name="parentFixedAssetId"> <display-entity entity-name="FixedAsset" key-field-name="fixedAssetId" description="${fixedAssetName}"> - <sub-hyperlink target="EditComputerHardware?fixedAssetId=${parentFixedAssetId}" description="${parentFixedAssetId}"/> + <sub-hyperlink target="EditComputerHardware" description="${parentFixedAssetId}"> + <parameter param-name="fixedAssetId" from-field="parentFixedAssetId"/> + </sub-hyperlink> </display-entity> </field> <on-event-update-area event-type="paginate" area-id="search-results" area-target="FixedAssetSearchResults"/> @@ -149,7 +151,9 @@ <field name="classEnumId"><display-entity entity-name="Enumeration" key-field-name="enumId"/></field> <field name="parentFixedAssetId"> <display-entity entity-name="FixedAsset" key-field-name="fixedAssetId" description="${fixedAssetName}"> - <sub-hyperlink target="EditComputerSoftware?fixedAssetId=${parentFixedAssetId}" description="${parentFixedAssetId}"/> + <sub-hyperlink target="EditComputerSoftware" description="${parentFixedAssetId}"> + <parameter param-name="fixedAssetId" from-field="parentFixedAssetId"/> + </sub-hyperlink> </display-entity> </field> <on-event-update-area event-type="paginate" area-id="search-results" area-target="FixedAssetSearchResults"/> Modified: ofbiz/trunk/specialpurpose/ebay/widget/EbayForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebay/widget/EbayForms.xml?rev=759680&r1=759679&r2=759680&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ebay/widget/EbayForms.xml (original) +++ ofbiz/trunk/specialpurpose/ebay/widget/EbayForms.xml Sun Mar 29 13:33:53 2009 @@ -43,10 +43,10 @@ <field name="externalId" title="${uiLabelMap.EbayImportEbayItem}"><display/></field> <field name="transactionId"><display/></field> <field name="orderId"> - <hyperlink target="orderview" description="${orderId}"> - <parameter param-name="orderId" from-field="orderId"/> - </hyperlink> - </field> + <hyperlink target="orderview" description="${orderId}"> + <parameter param-name="orderId" from-field="orderId"/> + </hyperlink> + </field> <field name="createdDate"><display/></field> <!-- <field name="productId" use-when="!${allowProductIdChange}"><display/></field> Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml?rev=759680&r1=759679&r2=759680&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml (original) +++ ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml Sun Mar 29 13:33:53 2009 @@ -41,7 +41,13 @@ <field name="projectDescription" parameter-name="description" title="${uiLabelMap.CommonDescription}"><text/></field> <field use-when="project!=null" name="currentStatusId" title="${uiLabelMap.CommonStatus}" parameter-name="dummy"><display-entity entity-name="StatusItem" key-field-name="statusId"/></field> <field use-when="project==null" name="currentStatusId"><hidden value="_NA_"/></field> - <field name="clientBillingPartyId"><lookup target-form-name="LookupPartyGroup"><sub-hyperlink target="viewprofile?partyId=${partyId}" description="${partyGroup.groupName}"/></lookup></field> + <field name="clientBillingPartyId"> + <lookup target-form-name="LookupPartyGroup"> + <sub-hyperlink target="viewprofile" description="${partyGroup.groupName}"> + <parameter param-name="partyId" from-field="partyId"/> + </sub-hyperlink> + </lookup> + </field> <field name="organizationPartyId"> <drop-down no-current-selected-key="defaultOrganizationPartyId"> <entity-options entity-name="PartyAcctgPrefAndGroup" description="${groupName}" key-field-name="partyId"/> @@ -268,10 +274,10 @@ <field name="workEffortId"><hidden value="${workEffortId}"/></field> <field name="projectId"><hidden/></field> <field entry-name="workEffortName" name="taskName" parameter-name="workEffortName" title="${uiLabelMap.CommonName}"> - <hyperlink target="taskView" description="${workEffortName}"> - <parameter param-name="workEffortId" from-field="workEffortId"/> - </hyperlink> - </field> + <hyperlink target="taskView" description="${workEffortName}"> + <parameter param-name="workEffortId" from-field="workEffortId"/> + </hyperlink> + </field> <field name="currentStatusId" title="${uiLabelMap.CommonStatus}"><display-entity entity-name="StatusItem" key-field-name="statusId" description="${description}"></display-entity></field> <field name="plannedHours" title="${uiLabelMap.ProjectMgrPlannedHours}"><display/></field> <field name="actualHours" title="${uiLabelMap.ProjectMgrActualHours}"><display/></field> @@ -359,10 +365,10 @@ odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <field name="projectId"><hidden value="parameters.projectId"/></field> <field name="phase"> - <hyperlink target="FindPhase" description="${phaseName}"> - <parameter param-name="projectId" from-field="projectId"/> - </hyperlink> - </field> + <hyperlink target="FindPhase" description="${phaseName}"> + <parameter param-name="projectId" from-field="projectId"/> + </hyperlink> + </field> <field name="currentStatusId"><display-entity entity-name="StatusItem" key-field-name="statusId" description="${description}"/></field> <field name="priority"><display/></field> <field name="startDate"><display type="date"/></field> @@ -374,10 +380,10 @@ odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <field name="projectId"><hidden value="parameters.projectId"/></field> <field name="task"> - <hyperlink target="taskView" description="${workEffortName}"> - <parameter param-name="workEffortId" from-field="workEffortId"/> - </hyperlink> - </field> + <hyperlink target="taskView" description="${workEffortName}"> + <parameter param-name="workEffortId" from-field="workEffortId"/> + </hyperlink> + </field> <field name="phaseName"><display/></field> <field name="currentStatusId"><display-entity entity-name="StatusItem" key-field-name="statusId" description="${description}"/></field> <field name="priority"><display/></field> @@ -538,12 +544,16 @@ <field name="workEffortId"><hidden value="${workEffortId}"/></field> <field name="partyId" use-when="workEffortId==projectId && parameters.get("partyId")!=null"><!-- project level --> <display-entity entity-name="PartyNameView" description="${firstName} ${middleName} ${lastName} ${groupName}[${partyId}]"> - <sub-hyperlink target="ListWorkEffortPartyAssigns?projectId=${workEffortId}" description="${uiLabelMap.CommonChange}"/> + <sub-hyperlink target="ListWorkEffortPartyAssigns" description="${uiLabelMap.CommonChange}"> + <parameter param-name="projectId" from-field="workEffortId"/> + </sub-hyperlink> </display-entity> </field> <field name="partyId" use-when="workEffortId!=projectId && parameters.get("partyId")!=null"><!-- task level --> <display-entity entity-name="PartyNameView" description="${firstName} ${middleName} ${lastName} ${groupName}[${partyId}]"> - <sub-hyperlink target="EditTaskPartyAssigns?workEffortId=${workEffortId}" description="${uiLabelMap.CommonChange}"/> + <sub-hyperlink target="EditTaskPartyAssigns" description="${uiLabelMap.CommonChange}"> + <parameter param-name="workEffortId" from-field="workEffortId"/> + </sub-hyperlink> </display-entity> </field> <field name="partyId" use-when="workEffortId==projectId && parameters.get("partyId")==null" event="onChange" action="javascript:document.AddWorkEffortPartyAssign.submit();"><!-- project level --> @@ -606,10 +616,10 @@ </field> <field name="phaseName" title="${uiLabelMap.ProjectMgrPhaseName}"><display description="${resultProject.phaseName}"/></field> <field name="projectName" title="${uiLabelMap.ProjectMgrProjectName}"> - <hyperlink target="projectView" description="${resultProject.projectName}"> - <parameter param-name="projectId" from-field="resultProject.projectId"/> - </hyperlink> - </field> + <hyperlink target="projectView" description="${resultProject.projectName}"> + <parameter param-name="projectId" from-field="resultProject.projectId"/> + </hyperlink> + </field> <field entry-name="currentStatusId" name="currentStatusId"><display-entity entity-name="StatusItem" key-field-name="statusId" description="${description}"/></field> <field entry-name="statusId" name="Status" title="${uiLabelMap.CommonStatus}"><display-entity entity-name="StatusItem" key-field-name="statusId" description="${description}"/></field> <field name="workEffortId"><hidden value="${workEffortId}"/></field> @@ -658,7 +668,9 @@ <set field="ActualCompletionDate" from-field="result.projectInfo.actualCompletionDate"/> </row-actions> <field entry-name="workEffortName" name="projectName" parameter-name="workEffortName" title="${uiLabelMap.CommonName}" widget-style="buttontext"> - <hyperlink target="projectView?projectId=${workEffortId}" description="${workEffortName}[${workEffortId}]"/> + <hyperlink target="projectView" description="${workEffortName}[${workEffortId}]"> + <parameter param-name="projectId" from-field="workEffortId"/> + </hyperlink> </field> <field name="currentStatusId" title="${uiLabelMap.CommonStatus}"> <display-entity entity-name="StatusItem" key-field-name="statusId" description="${description}"/> Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/forms/RequestForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/forms/RequestForms.xml?rev=759680&r1=759679&r2=759680&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/projectmgr/widget/forms/RequestForms.xml (original) +++ ofbiz/trunk/specialpurpose/projectmgr/widget/forms/RequestForms.xml Sun Mar 29 13:33:53 2009 @@ -105,7 +105,9 @@ <field name="statusId"><display-entity entity-name="StatusItem" description="${description}"/></field> <field name="fromPartyId"> <display-entity entity-name="PartyNameView" description="${firstName} ${middleName} ${lastName} ${groupName}" key-field-name="partyId"> - <sub-hyperlink target="viewprofile?partyId=${fromPartyId}" description="[${fromPartyId}]"/> + <sub-hyperlink target="viewprofile" description="[${fromPartyId}]"> + <parameter param-name="partyId" from-field="fromPartyId"/> + </sub-hyperlink> </display-entity> </field> <field name="custRequestName"><display/></field> @@ -115,7 +117,9 @@ </field> <field name="phaseName"><display description="${result.phaseName}"/></field> <field name="taskName"> - <hyperlink target="taskView?workEffortId=${workEffortId}" description="${workEffort.workEffortName}"/> + <hyperlink target="taskView" description="${workEffort.workEffortName}"> + <parameter param-name="workEffortId" from-field="workEffortId"/> + </hyperlink> </field> <field name="custRequestDate" title="${uiLabelMap.OrderRequestDate}"><display type="date"/></field> <field name="createdDate"><display type="date"/></field> @@ -173,7 +177,9 @@ <field name="createdDate"><display type="date"/></field> <field name="fromPartyId"> <display-entity entity-name="PartyNameView" description="${firstName} ${middleName} ${lastName} ${groupName}" key-field-name="partyId"> - <sub-hyperlink target="viewprofile?partyId=${fromPartyId}" description="[${fromPartyId}]"/> + <sub-hyperlink target="viewprofile" description="[${fromPartyId}]"> + <parameter param-name="partyId" from-field="fromPartyId"/> + </sub-hyperlink> </display-entity> </field> <field name="statusId"> Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml?rev=759680&r1=759679&r2=759680&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml (original) +++ ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml Sun Mar 29 13:33:53 2009 @@ -212,10 +212,10 @@ </field> <field name="phaseName" title="${uiLabelMap.ProjectMgrPhaseName}"><display description="${resultProject.phaseName}"/></field> <field name="projectName" title="${uiLabelMap.ProjectMgrProjectName}"> - <hyperlink target="projectView" description="${resultProject.projectName}"> - <parameter param-name="projectId" from-field="resultProject.projectId"/> - </hyperlink> - </field> + <hyperlink target="projectView" description="${resultProject.projectName}"> + <parameter param-name="projectId" from-field="resultProject.projectId"/> + </hyperlink> + </field> <!--field entry-name="result.taskInfo.currentStatusId" name="currentStatusId"><display-entity entity-name="StatusItem" key-field-name="statusId" description="${description}"/></field--> <field name="priority"><display/></field> <field name="estimatedStartDate"><display type="date"/></field> @@ -306,10 +306,10 @@ <field name="fromDate"><hidden/></field> <field name="workEffortId"><hidden/></field> <field name="workEffortIdFrom" title="${uiLabelMap.CommonName}"> - <hyperlink target="Dependencies" description="${r.taskInfo.taskName}"> - <parameter param-name="workEffortId" from-field="workEffortIdFrom"/> - </hyperlink> - </field> + <hyperlink target="Dependencies" description="${r.taskInfo.taskName}"> + <parameter param-name="workEffortId" from-field="workEffortIdFrom"/> + </hyperlink> + </field> <field name="workEffortParentId" entry-name="r.taskInfo.workEffortParentId" title="${uiLabelMap.ProjectMgrTaskPhase}"><display-entity entity-name="WorkEffort" key-field-name="workEffortId" description="${workEffortName}"/></field> <field name="currentStatusId" entry-name="r.taskInfo.currentStatusId" title="${uiLabelMap.CommonStatus}"><display-entity entity-name="StatusItem" key-field-name="statusId" description="${description}"/></field> <field name="estimatedStartDate" entry-name="r.taskInfo.estimatedStartDate" title="${uiLabelMap.WorkEffortEstimatedStartDate}"><display type="date"/></field> @@ -330,10 +330,10 @@ <field name="fromDate"><hidden/></field> <field name="workEffortId"><hidden/></field> <field name="workEffortIdTo" title="${uiLabelMap.CommonName}"> - <hyperlink target="Dependencies" description="${r.taskInfo.taskName}"> - <parameter param-name="workEffortId" from-field="workEffortIdTo"/> - </hyperlink> - </field> + <hyperlink target="Dependencies" description="${r.taskInfo.taskName}"> + <parameter param-name="workEffortId" from-field="workEffortIdTo"/> + </hyperlink> + </field> <field name="workEffortParentId" entry-name="r.taskInfo.workEffortParentId" title="${uiLabelMap.ProjectMgrTaskPhase}"><display-entity entity-name="WorkEffort" key-field-name="workEffortId" description="${workEffortName}"/></field> <field name="currentStatusId" entry-name="r.taskInfo.currentStatusId" title="${uiLabelMap.CommonStatus}"><display-entity entity-name="StatusItem" key-field-name="statusId" description="${description}"/></field> <field name="estimatedStartDate" entry-name="r.taskInfo.estimatedStartDate" title="${uiLabelMap.WorkEffortEstimatedStartDate}"><display type="date"/></field> @@ -420,10 +420,10 @@ <field name="timeEntryId"><hidden/></field> <field name="workEffortId"><hidden/></field> <field name="timesheetId"> - <hyperlink target="Timesheet" description="${timesheetId}"> - <parameter param-name="timesheetId" from-field="timesheetId"/> - </hyperlink> - </field> + <hyperlink target="Timesheet" description="${timesheetId}"> + <parameter param-name="timesheetId" from-field="timesheetId"/> + </hyperlink> + </field> <field name="partyId"> <drop-down allow-empty="false"> <entity-options entity-name="PartyRoleAndPartyDetail" description="${firstName} ${middleName} ${lastName}"> @@ -557,7 +557,9 @@ <form name="ListTaskParties" type="list" list-name="taskParties" odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <field name="partyId" title="${uiLabelMap.CommonName}"> - <hyperlink target="viewprofile?partyId=${partyId}" description="${partyName}"/> + <hyperlink target="viewprofile" description="${partyName}"> + <parameter param-name="partyId" from-field="partyId"/> + </hyperlink> </field> <field name="roleTypeId" title="${uiLabelMap.ProjectMgrPartyRoleTypeId}"><display-entity entity-name="RoleType" description="${description}"/></field> <field name="statusId" title="${uiLabelMap.CommonStatus}"><display-entity entity-name="StatusItem" description="${description}"/></field> @@ -595,10 +597,10 @@ </actions> <field name="workEffortId"><hidden/></field> <field name="custRequestId" widget-style="buttontext"> - <hyperlink description="${custRequestName} [${custRequestId}]" target="/projectmgr/control/ViewRequest" target-type="inter-app"> - <parameter param-name="custRequestId" from-field="custRequestId"/> - </hyperlink> - </field> + <hyperlink description="${custRequestName} [${custRequestId}]" target="/projectmgr/control/ViewRequest" target-type="inter-app"> + <parameter param-name="custRequestId" from-field="custRequestId"/> + </hyperlink> + </field> <field name="description"><display/></field> <field name="custRequestTypeDescription"><display/></field> <field name="statusItemDescription"><display/></field> @@ -619,10 +621,10 @@ <field name="fromDate"><hidden/></field> <field name="workEffortId"><hidden/></field> <field name="workEffortIdFrom" title="${uiLabelMap.CommonName}"> - <hyperlink target="Dependencies" description="${result.taskInfo.taskName}"> - <parameter param-name="workEffortId" from-field="workEffortIdFrom"/> - </hyperlink> - </field> + <hyperlink target="Dependencies" description="${result.taskInfo.taskName}"> + <parameter param-name="workEffortId" from-field="workEffortIdFrom"/> + </hyperlink> + </field> <field name="workEffortParentId" entry-name="result.taskInfo.workEffortParentId" title="${uiLabelMap.ProjectMgrTaskPhase}"><display-entity entity-name="WorkEffort" key-field-name="workEffortId" description="${workEffortName}"/></field> <field name="currentStatusId" entry-name="result.taskInfo.currentStatusId" title="${uiLabelMap.CommonStatus}"><display-entity entity-name="StatusItem" key-field-name="statusId" description="${description}"/></field> <field name="estimatedStartDate" entry-name="result.taskInfo.estimatedStartDate" title="${uiLabelMap.WorkEffortEstimatedStartDate}"><display type="date"/></field> @@ -646,10 +648,10 @@ <field name="fromDate"><hidden/></field> <field name="workEffortId"><hidden/></field> <field name="workEffortIdTo" title="${uiLabelMap.CommonName}"> - <hyperlink target="Dependencies" description="${result.taskInfo.taskName}"> - <parameter param-name="workEffortId" from-field="workEffortIdFrom"/> - </hyperlink> - </field> + <hyperlink target="Dependencies" description="${result.taskInfo.taskName}"> + <parameter param-name="workEffortId" from-field="workEffortIdFrom"/> + </hyperlink> + </field> <field name="workEffortParentId" entry-name="result.taskInfo.workEffortParentId" title="${uiLabelMap.ProjectMgrTaskPhase}"><display-entity entity-name="WorkEffort" key-field-name="workEffortId" description="${workEffortName}"/></field> <field name="currentStatusId" entry-name="result.taskInfo.currentStatusId" title="${uiLabelMap.CommonStatus}"><display-entity entity-name="StatusItem" key-field-name="statusId" description="${description}"/></field> <field name="estimatedStartDate" entry-name="result.taskInfo.estimatedStartDate" title="${uiLabelMap.WorkEffortEstimatedStartDate}"><display type="date"/></field> Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TimeSheetForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TimeSheetForms.xml?rev=759680&r1=759679&r2=759680&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TimeSheetForms.xml (original) +++ ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TimeSheetForms.xml Sun Mar 29 13:33:53 2009 @@ -39,7 +39,9 @@ <entity-order-by field-name="phaseName"/> <entity-order-by field-name="workEffortName"/> </entity-options> - <sub-hyperlink target="taskView?workEffortId=${result.taskId}" description="[${result.taskId}]"/> + <sub-hyperlink target="taskView" description="[${result.taskId}]"> + <parameter param-name="workEffortId" from-field="result.taskId"/> + </sub-hyperlink> </drop-down> </field> <field name="checkComplete" title="${uiLabelMap.ProjectMgrCheckComplete}"><check/></field> |
Free forum by Nabble | Edit this page |