Modified: ofbiz/trunk/applications/marketing/webapp/marketing/campaign/MarketingCampaignForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/webapp/marketing/campaign/MarketingCampaignForms.xml?rev=759666&r1=759665&r2=759666&view=diff ============================================================================== --- ofbiz/trunk/applications/marketing/webapp/marketing/campaign/MarketingCampaignForms.xml (original) +++ ofbiz/trunk/applications/marketing/webapp/marketing/campaign/MarketingCampaignForms.xml Sun Mar 29 11:00:00 2009 @@ -18,7 +18,7 @@ under the License. --> -<forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" +<forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-form.xsd"> <form name="EditMarketingCampaign" type="single" target="updateMarketingCampaign" title="" default-map-name="marketingCampaign" header-row-style="header-row" default-table-style="basic-table"> @@ -27,7 +27,7 @@ </actions> <alt-target use-when="marketingCampaign==null" target="createMarketingCampaign"/> <auto-fields-entity entity-name="MarketingCampaign"/> - + <field use-when="marketingCampaign!=null" name="marketingCampaignId" title="${uiLabelMap.MarketingCampaignId}" tooltip="${uiLabelMap.CommonNotModifRecreat}"><display/></field> <field use-when="marketingCampaign==null&&marketingCampaignId==null" name="marketingCampaignId" title="${uiLabelMap.MarketingCampaignId}"><ignored/></field> <field use-when="marketingCampaign==null&&marketingCampaignId!=null" name="marketingCampaignId" title="${uiLabelMap.MarketingCampaignId}" tooltip="${uiLabelMap.CommonCannotBeFound}: [${marketingCampaignId}]"><display/></field> @@ -47,7 +47,7 @@ <entity-options description="${description}" entity-name="StatusItem"> <entity-constraint name="statusTypeId" value="MKTG_CAMP_STATUS"/> <entity-order-by field-name="sequenceId"/> - </entity-options> + </entity-options> </drop-down> </field> <field name="currencyUomId" title="${uiLabelMap.CommonCurrency}"> @@ -61,7 +61,7 @@ <field name="DONE_PAGE"> <hidden value="${donePage}"/> </field> - + <field name="submitButton" title="${uiLabelMap.CommonSave}" widget-style="buttontext"><submit button-type="text-link"/></field> <field name="cancelLink" widget-style="buttontext" title="${uiLabelMap.CommonCancel}"><hyperlink target="${donePage}" also-hidden="false" description="${uiLabelMap.CommonCancelDone}" target-type="inter-app"/></field> </form> @@ -72,7 +72,9 @@ <entity-condition entity-name="MarketingCampaign"/> </actions> <field name="marketingCampaignId" widget-style="buttontext" title="${uiLabelMap.MarketingCampaignId}"> - <hyperlink target="EditMarketingCampaign?marketingCampaignId=${marketingCampaignId}" description="${marketingCampaignId}" also-hidden="false"/> + <hyperlink target="EditMarketingCampaign" description="${marketingCampaignId}" also-hidden="false"> + <parameter param-name="marketingCampaignId" from-field="marketingCampaignId"/> + </hyperlink> </field> <field name="campaignName" title="${uiLabelMap.MarketingCampaignName}"><display/></field> <field name="parentCampaignId" title="${uiLabelMap.MarketingParentCampaignId}"> @@ -96,19 +98,25 @@ </field> <field name="partyId" title="${uiLabelMap.PartyPartyId}" use-when=""${lastName}"!=null"> <display-entity entity-name="PartyNameView" description="${firstName} ${lastName}" also-hidden="true"> - <sub-hyperlink target="/partymgr/control/viewprofile?partyId=${partyId}" description="${partyId}" link-style="buttontext" target-type="inter-app"/> + <sub-hyperlink target="/partymgr/control/viewprofile" description="${partyId}" link-style="buttontext" target-type="inter-app"> + <parameter param-name="partyId" from-field="partyId"/> + </sub-hyperlink> </display-entity> </field> <!-- Currently not working for PartyGroup <field name="partyId" title="${uiLabelMap.PartyPartyId}" use-when=""${groupName}"!=null"> <display-entity entity-name="PartyNameView" description="${groupName}" also-hidden="true"> - <sub-hyperlink target="/partymgr/control/viewProfile?partyId=${partyId}" description="${partyId}" link-style="buttontext"/> + <sub-hyperlink target="/partymgr/control/viewProfile" description="${partyId}" link-style="buttontext"> + <parameter param-name="partyId" from-field="partyId"/> + </sub-hyperlink> </display-entity> </field> --> <field name="roleTypeId" title="${uiLabelMap.PartyRoleTypeId}"> <display-entity entity-name="RoleType" description="${description}" also-hidden="true"/> -<!-- <sub-hyperlink target="/partymgr/control/viewProfile?partyId=${partyId}" description="${partyId}" link-style="buttontext"/> + <!--<sub-hyperlink target="/partymgr/control/viewProfile" description="${partyId}" link-style="buttontext"> + <parameter param-name="partyId" from-field="partyId"/> + </sub-hyperlink> </display-entity>--> </field> <field name="editLink" title="&nbsp;" widget-style="buttontext"> @@ -128,7 +136,7 @@ header-row-style="header-row" default-table-style="basic-table"> <alt-target use-when="marketingCampaignRole==null" target="createMarketingCampaignRole"/> <auto-fields-service service-name="updateMarketingCampaignRole"/> - + <field use-when="marketingCampaign!=null" name="marketingCampaignId" title="${uiLabelMap.MarketingCampaignId}" tooltip="${uiLabelMap.CommonNotModifRecreat}"><display/></field> <field use-when="marketingCampaign==null&&marketingCampaignId==null" name="marketingCampaignId" title="${uiLabelMap.MarketingCampaignId}"><ignored/></field> <field use-when="marketingCampaign==null&&marketingCampaignId!=null" name="marketingCampaignId" title="${uiLabelMap.MarketingCampaignId}" tooltip="${uiLabelMap.CommonCannotBeFound}: [${marketingCampaignId}]"><display/></field> @@ -144,9 +152,9 @@ </field> <field name="submitButton" title="${uiLabelMap.CommonSave}" widget-style="buttontext"><submit button-type="text-link"/></field> <field name="cancelLink" widget-style="buttontext" title="${uiLabelMap.CommonCancel}"> - <hyperlink target="${donePage}" also-hidden="false" description="${uiLabelMap.CommonCancelDone}"> - <parameter param-name="marketingCampaignId" from-field="marketingCampaignId"/> - </hyperlink> - </field> + <hyperlink target="${donePage}" also-hidden="false" description="${uiLabelMap.CommonCancelDone}"> + <parameter param-name="marketingCampaignId" from-field="marketingCampaignId"/> + </hyperlink> + </field> </form> </forms> \ No newline at end of file Modified: ofbiz/trunk/applications/marketing/webapp/marketing/contact/ContactListForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/webapp/marketing/contact/ContactListForms.xml?rev=759666&r1=759665&r2=759666&view=diff ============================================================================== --- ofbiz/trunk/applications/marketing/webapp/marketing/contact/ContactListForms.xml (original) +++ ofbiz/trunk/applications/marketing/webapp/marketing/contact/ContactListForms.xml Sun Mar 29 11:00:00 2009 @@ -119,7 +119,9 @@ </service> </actions> <field name="contactListId" widget-style="buttontext" title="${uiLabelMap.MarketingContactListContactListId}"> - <hyperlink target="EditContactList?contactListId=${contactListId}" description="${contactListId}" also-hidden="false"/> + <hyperlink target="EditContactList" description="${contactListId}" also-hidden="false"> + <parameter param-name="contactListId" from-field="contactListId"/> + </hyperlink> </field> <field name="contactListName" title="${uiLabelMap.MarketingContactListContactListName}"><display/></field> <field name="isPublic" title="${uiLabelMap.MarketingContactListIsPublic}"><display/></field> @@ -130,7 +132,9 @@ <field name="marketingCampaignId" title="${uiLabelMap.MarketingCampaignId}"><display-entity entity-name="MarketingCampaign" description="${campaignName}"/></field> <!-- deleting contact lists is a bit more complicated than this... don't like have a link like this for top level entities <field name="deleteLink" title="&nbsp;" widget-style="buttontext"> - <hyperlink target="removeContactList?contactListId=${contactListId}" description="${uiLabelMap.CommonDelete}" also-hidden="false"/> + <hyperlink target="removeContactList" description="${uiLabelMap.CommonDelete}" also-hidden="false"> + <parameter param-name="contactListId" from-field="contactListId"/> + </hyperlink> </field> --> </form> Modified: ofbiz/trunk/applications/marketing/webapp/marketing/datasource/DataSourceForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/webapp/marketing/datasource/DataSourceForms.xml?rev=759666&r1=759665&r2=759666&view=diff ============================================================================== --- ofbiz/trunk/applications/marketing/webapp/marketing/datasource/DataSourceForms.xml (original) +++ ofbiz/trunk/applications/marketing/webapp/marketing/datasource/DataSourceForms.xml Sun Mar 29 11:00:00 2009 @@ -48,12 +48,16 @@ <entity-condition entity-name="DataSource"/> </actions> <field name="dataSourceId" widget-style="buttontext" title="${uiLabelMap.DataSourceDataSourceId}"> - <hyperlink target="EditDataSource?dataSourceId=${dataSourceId}" description="${dataSourceId}" also-hidden="false"/> + <hyperlink target="EditDataSource" description="${dataSourceId}" also-hidden="false"> + <parameter param-name="dataSourceId" from-field="dataSourceId"/> + </hyperlink> </field> <field name="description" title="${uiLabelMap.CommonDescription}"><display/></field> <field name="dataSourceTypeId" title="${uiLabelMap.DataSourceDataSourceTypeId}"><display-entity entity-name="DataSourceType"/></field> <field name="deleteLink" title="&nbsp;" widget-style="buttontext"> - <hyperlink target="deleteDataSource?dataSourceId=${dataSourceId}" description="${uiLabelMap.CommonDelete}" also-hidden="false"/> + <hyperlink target="deleteDataSource" description="${uiLabelMap.CommonDelete}" also-hidden="false"> + <parameter param-name="dataSourceId" from-field="dataSourceId"/> + </hyperlink> </field> </form> @@ -93,7 +97,9 @@ description="${uiLabelMap.CommonEdit}" also-hidden="false"/> </field> <field name="deleteLink" title="&nbsp;" widget-style="buttontext"> - <hyperlink target="deleteDataSourceType?dataSourceTypeId=${dataSourceTypeId}" description="${uiLabelMap.CommonDelete}" also-hidden="false"/> + <hyperlink target="deleteDataSourceType" description="${uiLabelMap.CommonDelete}" also-hidden="false"> + <parameter param-name="dataSourceTypeId" from-field="dataSourceTypeId"/> + </hyperlink> </field> </form> Modified: ofbiz/trunk/applications/marketing/webapp/marketing/segment/SegmentForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/webapp/marketing/segment/SegmentForms.xml?rev=759666&r1=759665&r2=759666&view=diff ============================================================================== --- ofbiz/trunk/applications/marketing/webapp/marketing/segment/SegmentForms.xml (original) +++ ofbiz/trunk/applications/marketing/webapp/marketing/segment/SegmentForms.xml Sun Mar 29 11:00:00 2009 @@ -18,7 +18,7 @@ under the License. --> -<forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" +<forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-form.xsd"> <form name="FindSegmentGroup" list-name="listIt" target="" title="" type="list" paginate-target="FindSegmentGroup" @@ -37,14 +37,16 @@ <field name="description" title="${uiLabelMap.CommonDescription}"><display/></field> <field name="productStoreId" title="${uiLabelMap.MarketingSegmentGroupProductStoreId}"><display/></field> <field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext"> - <hyperlink target="deleteSegmentGroup?segmentGroupId=${segmentGroupId}" description="${uiLabelMap.CommonDelete}" also-hidden="false"/> + <hyperlink target="deleteSegmentGroup" description="${uiLabelMap.CommonDelete}" also-hidden="false"> + <parameter param-name="segmentGroupId" from-field="segmentGroupId"/> + </hyperlink> </field> </form> <form name="EditSegmentGroup" type="single" target="updateSegmentGroup" title="" default-map-name="segmentGroup" header-row-style="header-row" default-table-style="basic-table"> <alt-target use-when="segmentGroup==null" target="createSegmentGroup"/> - + <field use-when="segmentGroup!=null" name="segmentGroupId" title="${uiLabelMap.MarketingSegmentGroupSegmentGroupId}" tooltip="${uiLabelMap.CommonNotModifRecreat}"><display/></field> <field use-when="segmentGroup==null&&segmentGroupId==null" name="segmentGroupId" title="${uiLabelMap.MarketingSegmentGroupSegmentGroupId}"><ignored/></field> <field use-when="segmentGroup==null&&segmentGroupId!=null" name="segmentGroupId" title="${uiLabelMap.MarketingSegmentGroupSegmentGroupId}" tooltip="${uiLabelMap.CommonCannotBeFound}: [${segmentGroupId}]"><display/></field> @@ -61,18 +63,20 @@ <entity-options entity-name="ProductStore" description="${storeName} [${productStoreId}]"> <entity-order-by field-name="storeName"/> </entity-options> - <sub-hyperlink target="/catalog/control/EditProductStore?productStoreId=${segmentGroup.productStoreId}" target-type="inter-app" description="${segmentGroup.productStoreId}" link-style="buttontext"/> + <sub-hyperlink target="/catalog/control/EditProductStore" target-type="inter-app" description="${segmentGroup.productStoreId}" link-style="buttontext"> + <parameter param-name="productStoreId" from-field="segmentGroup.productStoreId"/> + </sub-hyperlink> </drop-down> </field> <field name="description" title="${uiLabelMap.CommonDescription}"><text size="55"/></field> - + <field name="submitButton" title="${uiLabelMap.CommonSave}" widget-style="buttontext"><submit button-type="text-link"/></field> </form> <form name="AddSegmentGroupClass" type="single" target="createSegmentGroupClassification" title="" default-map-name="segmentGroupClass" header-row-style="header-row" default-table-style="basic-table"> <auto-fields-service service-name="createSegmentGroupClassification"/> - + <field name="segmentGroupId"><hidden/></field> <field name="partyClassificationGroupId"> @@ -94,13 +98,13 @@ description="${uiLabelMap.CommonDelete}" also-hidden="false"/> </field> </form> - + <form name="AddSegmentGroupGeo" type="single" target="createSegmentGroupGeo" title="" default-map-name="segmentGroupGeo" header-row-style="header-row" default-table-style="basic-table"> <auto-fields-service service-name="createSegmentGroupGeo"/> - + <field name="segmentGroupId"><hidden/></field> - + <field name="geoId" title="${uiLabelMap.CommonSegmentGroupGeoId}"><lookup target-form-name="LookupGeo"/></field> <field name="submitButton" title="${uiLabelMap.CommonSave}" widget-style="buttontext"><submit button-type="text-link"/></field> </form> @@ -122,9 +126,9 @@ <form name="AddSegmentGroupRole" type="single" target="createSegmentGroupRole" title="" default-map-name="segmentGroupRole" header-row-style="header-row" default-table-style="basic-table"> <auto-fields-service service-name="createSegmentGroupRole"/> - + <field name="segmentGroupId"><hidden/></field> - + <field name="partyId" title="${uiLabelMap.PartyPartyId}"><lookup target-form-name="LookupPartyName"/></field> <field name="roleTypeId"> <drop-down> @@ -147,7 +151,9 @@ <field name="segmentGroupId"><hidden/></field> <field name="partyId" title="${uiLabelMap.PartyPartyId}"> <display-entity entity-name="PartyNameView" description="${firstName} ${lastName} ${groupName}"> - <sub-hyperlink target="/partymgr/control/viewprofile?partyId=${partyId}" description="${partyId}" link-style="buttontext" target-type="inter-app"/> + <sub-hyperlink target="/partymgr/control/viewprofile" description="${partyId}" link-style="buttontext" target-type="inter-app"> + <parameter param-name="partyId" from-field="partyId"/> + </sub-hyperlink> </display-entity> </field> <field name="roleTypeId" title="${uiLabelMap.PartyRoleTypeId}"><display-entity entity-name="RoleType"/></field> Modified: ofbiz/trunk/applications/marketing/webapp/marketing/trackingcode/TrackingCodeForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/webapp/marketing/trackingcode/TrackingCodeForms.xml?rev=759666&r1=759665&r2=759666&view=diff ============================================================================== --- ofbiz/trunk/applications/marketing/webapp/marketing/trackingcode/TrackingCodeForms.xml (original) +++ ofbiz/trunk/applications/marketing/webapp/marketing/trackingcode/TrackingCodeForms.xml Sun Mar 29 11:00:00 2009 @@ -73,7 +73,9 @@ <entity-condition entity-name="TrackingCode"/> </actions> <field name="trackingCodeId" widget-style="buttontext" title="${uiLabelMap.MarketingTrackingCodeTrackingCodeId}"> - <hyperlink target="EditTrackingCode?trackingCodeId=${trackingCodeId}" description="${trackingCodeId}" also-hidden="false"/> + <hyperlink target="EditTrackingCode" description="${trackingCodeId}" also-hidden="false"> + <parameter param-name="trackingCodeId" from-field="trackingCodeId"/> + </hyperlink> </field> <field name="description" title="${uiLabelMap.MarketingTrackingCodeDescription}"><display/></field> <field name="trackingCodeTypeId" title="${uiLabelMap.MarketingTrackingCodeTrackingCodeTypeId}"><display-entity entity-name="TrackingCodeType"/></field> @@ -81,7 +83,9 @@ <field name="prodCatalogId"><display-entity description="${catalogName}" entity-name="ProdCatalog"/></field> <field name="deleteLink" title="&nbsp;" widget-style="buttontext"> - <hyperlink target="deleteTrackingCode?trackingCodeId=${trackingCodeId}" description="${uiLabelMap.CommonDelete}" also-hidden="false"/> + <hyperlink target="deleteTrackingCode" description="${uiLabelMap.CommonDelete}" also-hidden="false"> + <parameter param-name="trackingCodeId" from-field="trackingCodeId"/> + </hyperlink> </field> </form> <!-- UNUSED FORM @@ -294,12 +298,16 @@ <entity-condition entity-name="TrackingCodeType"/> </actions> <field name="trackingCodeTypeId" widget-style="buttontext" title="${uiLabelMap.MarketingTrackingCodeTrackingCodeTypeId}"> - <hyperlink target="EditTrackingCodeType?trackingCodeTypeId=${trackingCodeTypeId}" description="${trackingCodeTypeId}" also-hidden="false"/> + <hyperlink target="EditTrackingCodeType" description="${trackingCodeTypeId}" also-hidden="false"> + <parameter param-name="trackingCodeTypeId" from-field="trackingCodeTypeId"/> + </hyperlink> </field> <field name="description" title="${uiLabelMap.MarketingTrackingCodeTypeDescription}"><display/></field> <field name="deleteLink" title="&nbsp;" widget-style="buttontext"> - <hyperlink target="deleteTrackingCodeType?trackingCodeTypeId=${trackingCodeTypeId}" description="${uiLabelMap.CommonDelete}" also-hidden="false"/> + <hyperlink target="deleteTrackingCodeType" description="${uiLabelMap.CommonDelete}" also-hidden="false"> + <parameter param-name="trackingCodeTypeId" from-field="trackingCodeTypeId"/> + </hyperlink> </field> </form> <form name="LookupTrackingCodeType" default-map-name="trackingCode" target="LookupTrackingCodeType" title="" type="single" Modified: ofbiz/trunk/applications/marketing/widget/sfa/forms/AccountForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/sfa/forms/AccountForms.xml?rev=759666&r1=759665&r2=759666&view=diff ============================================================================== --- ofbiz/trunk/applications/marketing/widget/sfa/forms/AccountForms.xml (original) +++ ofbiz/trunk/applications/marketing/widget/sfa/forms/AccountForms.xml Sun Mar 29 11:00:00 2009 @@ -27,7 +27,9 @@ <entity-one entity-name="PartyGroup" value-field="partyGroup"/> </row-actions> <field name="partyId" title="${uiLabelMap.PartyPartyId}"> - <hyperlink target="viewprofile?partyId=${partyId}" description="${partyId}" target-type="inter-app"/> + <hyperlink target="viewprofile" description="${partyId}" target-type="inter-app"> + <parameter param-name="partyId" from-field="partyId"/> + </hyperlink> </field> <field name="partyName" title="${uiLabelMap.PartyName}"><display description="${partyGroup.groupName}"/></field> <field name="partyTypeId" title="${uiLabelMap.PartyType}"><display-entity entity-name="PartyType"/></field> Modified: ofbiz/trunk/applications/marketing/widget/sfa/forms/ForecastForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/sfa/forms/ForecastForms.xml?rev=759666&r1=759665&r2=759666&view=diff ============================================================================== --- ofbiz/trunk/applications/marketing/widget/sfa/forms/ForecastForms.xml (original) +++ ofbiz/trunk/applications/marketing/widget/sfa/forms/ForecastForms.xml Sun Mar 29 11:00:00 2009 @@ -36,7 +36,9 @@ </actions> <auto-fields-entity entity-name="SalesForecast" default-field-type="display"/> <field name="salesForecastId" widget-style="buttontext"> - <hyperlink target="EditSalesForecast?salesForecastId=${salesForecastId}" description="${salesForecastId}" also-hidden="false"/> + <hyperlink target="EditSalesForecast" description="${salesForecastId}" also-hidden="false"> + <parameter param-name="salesForecastId" from-field="salesForecastId"/> + </hyperlink> </field> <field name="percentOfQuotaForecast"><hidden/></field> <field name="percentOfQuotaClosed"><hidden/></field> Modified: ofbiz/trunk/applications/order/webapp/ordermgr/request/RequestForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/request/RequestForms.xml?rev=759666&r1=759665&r2=759666&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/request/RequestForms.xml (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/request/RequestForms.xml Sun Mar 29 11:00:00 2009 @@ -170,12 +170,16 @@ <form name="ListCommEvents" extends="ListCommEvents" extends-resource="component://party/webapp/partymgr/communication/CommForms.xml"> <field name="partyIdFrom" title="${uiLabelMap.CommonPartyID} ${uiLabelMap.CommonFrom}"> <display-entity description="${firstName} ${middleName} ${lastName} ${groupName}" entity-name="PartyNameView" key-field-name="partyId"> - <sub-hyperlink target="/partymgr/control/viewprofile?partyId=${partyIdFrom}" target-type="inter-app" description="[${partyIdFrom}]"/> + <sub-hyperlink target="/partymgr/control/viewprofile" target-type="inter-app" description="[${partyIdFrom}]"> + <parameter param-name="partyId" from-field="partyIdFrom"/> + </sub-hyperlink> </display-entity> </field> <field name="partyIdTo" title="${uiLabelMap.CommonPartyID} ${uiLabelMap.CommonTo}"> <display-entity description="${firstName} ${middleName} ${lastName} ${groupName}" entity-name="PartyNameView" key-field-name="partyId"> - <sub-hyperlink target="/partymgr/control/viewprofile?partyId=${partyIdTo}" target-type="inter-app" description="[${partyIdTo}]"/> + <sub-hyperlink target="/partymgr/control/viewprofile" target-type="inter-app" description="[${partyIdTo}]"> + <parameter param-name="partyId" from-field="partyIdTo"/> + </sub-hyperlink> </display-entity> </field> </form> @@ -183,7 +187,9 @@ <form name="ViewRequestWorkEfforts" type="list" list-name="requestWorkEfforts" odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <field name="workEffortId"> - <hyperlink target="/workeffort/control/WorkEffortSummary?workEffortId=${workEffortId}" description="${workEffortName} [${workEffortId}]" target-type="inter-app"/> + <hyperlink target="/workeffort/control/WorkEffortSummary" description="${workEffortName} [${workEffortId}]" target-type="inter-app"> + <parameter param-name="workEffortId" from-field="workEffortId"/> + </hyperlink> </field> <field name="currentStatusId"><display-entity entity-name="StatusItem" key-field-name="statusId" description="${description}"/></field> <field name="startDate"><display type="date"/></field> @@ -447,7 +453,9 @@ <field name="custRequestItemSeqId"><hidden/></field> <field name="workEffortId"> <display-entity entity-name="WorkEffort" description="${workEffortName}"> - <sub-hyperlink description="[${workEffortId}]" target="/workeffort/control/EditWorkEffort?workEffortId=${workEffortId}" target-type="inter-app" link-style="buttontext"/> + <sub-hyperlink description="[${workEffortId}]" target="/workeffort/control/EditWorkEffort" target-type="inter-app" link-style="buttontext"> + <parameter param-name="workEffortId" from-field="workEffortId"/> + </sub-hyperlink> </display-entity> </field> @@ -484,10 +492,10 @@ <field name="custRequestTypeId" title="${uiLabelMap.CommonType}"><display-entity entity-name="CustRequestType" description="${description}"/></field> <field name="statusId" title="${uiLabelMap.CommonStatus}"><display-entity entity-name="StatusItem" description="${description}"/></field> <field name="fromPartyId" title="${uiLabelMap.PartyPartyId}"> - <hyperlink target="/partymgr/control/viewprofile" target-type="inter-app" description="${partyNameResultTo.fullName} [${custRequest.fromPartyId}]"> - <parameter param-name="partyId" from-field="custRequest.fromPartyId"/> - </hyperlink> - </field> + <hyperlink target="/partymgr/control/viewprofile" target-type="inter-app" description="${partyNameResultTo.fullName} [${custRequest.fromPartyId}]"> + <parameter param-name="partyId" from-field="custRequest.fromPartyId"/> + </hyperlink> + </field> <field name="custRequestName" title="${uiLabelMap.CommonName}"><display/></field> <field name="description" title="${uiLabelMap.CommonDescription}"><display/></field> <field name="productStoreId" title="${uiLabelMap.ProductProductStore}"><display-entity entity-name="ProductStore" description="${storeName}"/></field> @@ -562,7 +570,9 @@ <field name="custRequestId"><hidden/></field> <field name="contentId"> <display-entity entity-name="Content" key-field-name="contentId" description="${contentName}" also-hidden="true"> - <sub-hyperlink target="/content/control/ViewSimpleContent?contentId=${contentId}" description="[${contentId}]" link-style="buttontext" target-type="inter-app"/> + <sub-hyperlink target="/content/control/ViewSimpleContent" description="[${contentId}]" link-style="buttontext" target-type="inter-app"> + <parameter param-name="contentId" from-field="contentId"/> + </sub-hyperlink> </display-entity> </field> <field name="mimeTypeId"><display/></field> Modified: ofbiz/trunk/applications/order/webapp/ordermgr/return/ReturnForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/return/ReturnForms.xml?rev=759666&r1=759665&r2=759666&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/return/ReturnForms.xml (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/return/ReturnForms.xml Sun Mar 29 11:00:00 2009 @@ -18,7 +18,7 @@ under the License. --> -<forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" +<forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-form.xsd"> <form name="EditReturn" type="single" target="updateReturn" default-map-name="returnHeader" id="editReturn" header-row-style="header-row" default-table-style="basic-table"> @@ -27,8 +27,8 @@ <field-map field-name="statusId" from-field="returnHeader.statusId"/> </entity-one> </actions> - <alt-target use-when="returnHeader==null" target="createReturn"/> - <auto-fields-service service-name="updateReturnHeader"/> + <alt-target use-when="returnHeader==null" target="createReturn"/> + <auto-fields-service service-name="updateReturnHeader"/> <field use-when="returnHeader!=null" name="returnId" tooltip="${uiLabelMap.OrderReturnCannotBeChanged}"><display/></field> <field use-when="returnHeader==null&&returnId!=null" name="returnId" tooltip="${uiLabelMap.OrderReturnCannotBeFound} ${returnId}"><text size="20" maxlength="20"/></field> <field use-when="returnHeader==null&&returnId==null" name="returnId"><ignored/></field> @@ -94,7 +94,9 @@ </drop-down> </field> <field name="newCreditCard" widget-style="buttontext" use-when="returnHeader!=null&&returnHeader.getString("fromPartyId")!=null"> - <hyperlink also-hidden="false" target="/partymgr/control/editcreditcard?partyId=${returnHeader.fromPartyId}${externalKeyParam}" target-window="partymgr" description="${uiLabelMap.AccountingCreateNewCreditCard}" target-type="inter-app"/> + <hyperlink also-hidden="false" target="/partymgr/control/editcreditcard" target-window="partymgr" description="${uiLabelMap.AccountingCreateNewCreditCard}" target-type="inter-app"> + <parameter param-name="partyId" value="=${returnHeader.fromPartyId}${externalKeyParam}"/> + </hyperlink> </field> <field name="needsInventoryReceive" tooltip="${uiLabelMap.OrderReturnNecessaryReceiveInventoryMessage}"> <drop-down no-current-selected-key="N"><option key="N"/><option key="Y"/></drop-down> @@ -103,7 +105,7 @@ <field name="submitButton" title="${uiLabelMap.CommonSubmit}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> <!-- UNUSED FORM - <form name="ReturnItems" type="multi" list-name="orderItems" target="createReturnItem" + <form name="ReturnItems" type="multi" list-name="orderItems" target="createReturnItem" odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <auto-fields-service service-name="createReturnItem"/> <field name="itemDescription"><display/></field> @@ -162,7 +164,7 @@ <display-entity entity-name="PartyNameView" key-field-name="partyId" description="${groupName} ${firstName} ${lastName}"> <sub-hyperlink link-style="buttontext" target-type="inter-app" description="${fromPartyId}" target="/partymgr/control/viewprofile?partyId=${fromPartyId}${externalKeyParam}"/> </display-entity> - </field> + </field> <field name="destinationFacilityId" widget-style="buttontext" title="${uiLabelMap.OrderReturnDestinationFacility}"> <hyperlink target-type="inter-app" description="${destinationFacilityId}" target="/facility/control/EditFacility?facilityId=${destinationFacilityId}${externalKeyParam}"/> </field> Modified: ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryForms.xml?rev=759666&r1=759665&r2=759666&view=diff ============================================================================== --- ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryForms.xml (original) +++ ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryForms.xml Sun Mar 29 11:00:00 2009 @@ -108,10 +108,14 @@ </field> <field name="description" title="${uiLabelMap.CommonDescription}"><display/></field> <field name="addFromList" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext"> - <hyperlink target="addFromShoppingList?shoppingListId=${shoppingListId}" description="${uiLabelMap.OrderToAddSelectedItemsToShoppingList}" also-hidden="false"/> + <hyperlink target="addFromShoppingList" description="${uiLabelMap.OrderToAddSelectedItemsToShoppingList}" also-hidden="false"> + <parameter param-name="shoppingListId" from-field="shoppingListId"/> + </hyperlink> </field> <field name="addAllFromList" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext"> - <hyperlink target="addAllFromShoppingList?shoppingListId=${shoppingListId}" description="${uiLabelMap.OrderQuickAdd}" also-hidden="false"/> + <hyperlink target="addAllFromShoppingList" description="${uiLabelMap.OrderQuickAdd}" also-hidden="false"> + <parameter param-name="shoppingListId" from-field="shoppingListId"/> + </hyperlink> </field> </form> <form name="AddFromShoppingList" type="list" list-name="shoppinglistitems" target="" @@ -127,7 +131,9 @@ </form> <form name="AddFromShoppingListAll" type="single" target=""> <field name="addAllFromList" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext"> - <hyperlink target="addAllFromShoppingList?shoppingListId=${shoppingListId}" description="${uiLabelMap.OrderQuickAdd}" also-hidden="false"/> + <hyperlink target="addAllFromShoppingList" description="${uiLabelMap.OrderQuickAdd}" also-hidden="false"> + <parameter param-name="shoppingListId" from-field="shoppingListId"/> + </hyperlink> </field> <field name="returnToOrderEntry" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext"> <hyperlink target="orderentry" description="${uiLabelMap.OrderOrderReturn}" also-hidden="false"/> Modified: ofbiz/trunk/applications/party/webapp/partymgr/communication/CommForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/communication/CommForms.xml?rev=759666&r1=759665&r2=759666&view=diff ============================================================================== --- ofbiz/trunk/applications/party/webapp/partymgr/communication/CommForms.xml (original) +++ ofbiz/trunk/applications/party/webapp/partymgr/communication/CommForms.xml Sun Mar 29 11:00:00 2009 @@ -26,7 +26,9 @@ <field name="communicationEventId" use-when="communicationEvent!=null"><display/></field> <field name="parentCommEventId" position="2"> <lookup target-form-name="LookupCommEvent"> - <sub-hyperlink link-style="buttontext" target="EditCommunicationEvent?communicationEventId=${parentCommEventId}" description="${uiLabelMap.PartyGoToParent}" use-when="communicationEvent!=null&&communicationEvent.get("parentCommEventId")!=null"/> + <sub-hyperlink link-style="buttontext" target="EditCommunicationEvent" description="${uiLabelMap.PartyGoToParent}" use-when="communicationEvent!=null&&communicationEvent.get("parentCommEventId")!=null"> + <parameter param-name="communicationEventId" from-field="parentCommEventId"/> + </sub-hyperlink> </lookup> </field> <field name="communicationEventTypeId" > @@ -87,7 +89,9 @@ <!-- contact list --> <field name="contactListId"> <lookup size="20" target-form-name="LookupContactList"> - <sub-hyperlink target="/marketing/control/EditContactList?contactListId=${communicationEvent.contactListId}" target-type="inter-app" link-style="smallSubmit"/> + <sub-hyperlink target="/marketing/control/EditContactList" target-type="inter-app" link-style="smallSubmit"> + <parameter param-name="contactListId" from-field="communicationEvent.contactListId"/> + </sub-hyperlink> </lookup> </field> <field name="datetimeStarted" title="${uiLabelMap.CommonStartDate}"><date-time/></field> @@ -419,7 +423,9 @@ </actions> <field name="workEffortId" title="${uiLabelMap.WorkEffort}"> <display-entity entity-name="WorkEffort" description="${workEffortName}"> - <sub-hyperlink description="${workEffortId}" target="/workeffort/control/WorkEffortSummary?workEffortId=${workEffortId}" target-type="inter-app" link-style="smallSubmit"/> + <sub-hyperlink description="${workEffortId}" target="/workeffort/control/WorkEffortSummary" target-type="inter-app" link-style="smallSubmit"> + <parameter param-name="workEffortId" from-field="workEffortId"/> + </sub-hyperlink> </display-entity> </field> </form> @@ -481,7 +487,9 @@ <field name="communicationEventId"><hidden/></field> <field name="partyId" title="${uiLabelMap.PartyPartyId}"> <display-entity description="${firstName} ${middleName} ${lastName} ${groupName}" entity-name="PartyNameView"> - <sub-hyperlink target="viewprofile?partyId=${partyId}" link-style="smallSubmit" description="${partyId}"/> + <sub-hyperlink target="viewprofile" link-style="smallSubmit" description="${partyId}"> + <parameter param-name="partyId" from-field="partyId"/> + </sub-hyperlink> </display-entity> </field> <field name="contactMechId"><display-entity description="${infoString}" entity-name="ContactMech"/></field> @@ -620,7 +628,9 @@ </field> <field name="surveyResponseLink" map-name="dummy" widget-style="smallSubmit" use-when=""DOCUMENT".equals(contentTypeId) && dataResource!=null && dataResource.get("relatedDetailId")==null && templateDataResource!=null && templateDataResource.get("relatedDetailId")!=null"> - <hyperlink description="Create Response (for Survey ${templateDataResource.relatedDetailId})" target="EditSurveyResponse?surveyId=${templateDataResource.relatedDetailId}" also-hidden="false" target-window="_blank"/> + <hyperlink description="Create Response (for Survey ${templateDataResource.relatedDetailId})" target="EditSurveyResponse" also-hidden="false" target-window="_blank"> + <parameter param-name="surveyId" from-field="templateDataResource.relatedDetailId"/> + </hyperlink> </field> --> <!-- Modified: ofbiz/trunk/applications/party/webapp/partymgr/contactlist/PartyContactListForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/contactlist/PartyContactListForms.xml?rev=759666&r1=759665&r2=759666&view=diff ============================================================================== --- ofbiz/trunk/applications/party/webapp/partymgr/contactlist/PartyContactListForms.xml (original) +++ ofbiz/trunk/applications/party/webapp/partymgr/contactlist/PartyContactListForms.xml Sun Mar 29 11:00:00 2009 @@ -29,7 +29,9 @@ <field name="partyId"><hidden/></field> <field name="contactListId" title="${uiLabelMap.PartyContactLists}"> <display-entity entity-name="ContactList" description="${contactListName}"> - <sub-hyperlink target="/marketing/control/EditContactList?contactListId=${contactListId}" description="${contactListId}" target-type="inter-app" link-style="smallSubmit"/> + <sub-hyperlink target="/marketing/control/EditContactList" description="${contactListId}" target-type="inter-app" link-style="smallSubmit"> + <parameter param-name="contactListId" from-field="contactListId"/> + </sub-hyperlink> </display-entity> </field> <field name="fromDate"><display/></field> Modified: ofbiz/trunk/applications/party/webapp/partymgr/party/PartyForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/party/PartyForms.xml?rev=759666&r1=759665&r2=759666&view=diff ============================================================================== --- ofbiz/trunk/applications/party/webapp/partymgr/party/PartyForms.xml (original) +++ ofbiz/trunk/applications/party/webapp/partymgr/party/PartyForms.xml Sun Mar 29 11:00:00 2009 @@ -83,10 +83,10 @@ </field> <field name="submitButton" title="${uiLabelMap.CommonSave}"><submit button-type="button"/></field> <field name="cancelLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="smallSubmit"> - <hyperlink target="${donePage}" also-hidden="false" description="${uiLabelMap.CommonCancelDone}"> - <parameter param-name="partyId" from-field="partyId"/> - </hyperlink> - </field> + <hyperlink target="${donePage}" also-hidden="false" description="${uiLabelMap.CommonCancelDone}"> + <parameter param-name="partyId" from-field="partyId"/> + </hyperlink> + </field> </form> <form name="EditPartyGroup" type="single" target="updatePartyGroup" default-map-name="partyGroup" @@ -118,10 +118,10 @@ </field> <field name="submitButton" title="${uiLabelMap.CommonSave}"><submit button-type="button"/></field> <field name="cancelLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="smallSubmit"> - <hyperlink target="${donePage}" also-hidden="false" description="${uiLabelMap.CommonCancelDone}"> - <parameter param-name="partyId" from-field="partyId"/> - </hyperlink> - </field> + <hyperlink target="${donePage}" also-hidden="false" description="${uiLabelMap.CommonCancelDone}"> + <parameter param-name="partyId" from-field="partyId"/> + </hyperlink> + </field> </form> <form name="ViewPartyGroup" type="single" default-map-name="lookupGroup"> @@ -182,10 +182,10 @@ <field name="newPasswordVerify"><password/></field> <field name="submitButton" title="${uiLabelMap.CommonSave}" widget-style="smallSubmit"><submit button-type="text-link"/></field> <field name="cancelLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="smallSubmit"> - <hyperlink target="${donePage}" also-hidden="false" description="${uiLabelMap.CommonCancelDone}"> - <parameter param-name="partyId" from-field="partyId"/> - </hyperlink> - </field> + <hyperlink target="${donePage}" also-hidden="false" description="${uiLabelMap.CommonCancelDone}"> + <parameter param-name="partyId" from-field="partyId"/> + </hyperlink> + </field> </form> <form name="updateUserLoginSecurity" type="single" target="updateUserLoginSecurity" default-map-name="editUserLogin" @@ -200,10 +200,10 @@ <field name="userLdapDn" use-when="!"true".equals(ldapEnabled)"><ignored/></field> <field name="submitButton" title="${uiLabelMap.CommonSave}" widget-style="smallSubmit"><submit button-type="text-link"/></field> <field name="cancelLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="smallSubmit"> - <hyperlink target="${donePage}" also-hidden="false" description="${uiLabelMap.CommonCancelDone}"> - <parameter param-name="partyId" from-field="partyId"/> - </hyperlink> - </field> + <hyperlink target="${donePage}" also-hidden="false" description="${uiLabelMap.CommonCancelDone}"> + <parameter param-name="partyId" from-field="partyId"/> + </hyperlink> + </field> </form> <form name="EditVendor" type="single" target="updateVendor" default-map-name="vendor" @@ -298,7 +298,9 @@ <field name="taxAuthGeoId"><display-entity entity-name="Geo" key-field-name="geoId" description="[${geoId}] ${geoName}" also-hidden="true"/></field> <field name="taxAuthPartyId"> <display-entity entity-name="PartyNameView" key-field-name="partyId" description="${firstName} ${middleName} ${lastName} ${groupName}" also-hidden="true"> - <sub-hyperlink target="viewprofile?partyId=${taxAuthPartyId}" description="${taxAuthPartyId}" link-style="smallSubmit"/> + <sub-hyperlink target="viewprofile" description="${taxAuthPartyId}" link-style="smallSubmit"> + <parameter param-name="partyId" from-field="taxAuthPartyId"/> + </sub-hyperlink> </display-entity> </field> <field name="fromDate" title="${uiLabelMap.CommonFromDateTime}"><display/></field> @@ -324,10 +326,10 @@ <field name="note"><textarea cols="70" rows="10"/></field> <field name="submitButton" title="${uiLabelMap.CommonSave}" widget-style="smallSubmit"><submit button-type="text-link"/></field> <field name="cancelLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="smallSubmit"> - <hyperlink target="${donePage}" also-hidden="false" description="${uiLabelMap.CommonCancelDone}"> - <parameter param-name="partyId" from-field="partyId"/> - </hyperlink> - </field> + <hyperlink target="${donePage}" also-hidden="false" description="${uiLabelMap.CommonCancelDone}"> + <parameter param-name="partyId" from-field="partyId"/> + </hyperlink> + </field> </form> <!-- PartyRate --> @@ -471,7 +473,9 @@ </actions> <field name="segmentGroupId" title="${uiLabelMap.PartySegmentGroupId}"> <display-entity entity-name="SegmentGroup"> - <sub-hyperlink description="${segmentGroupId}" target="/marketing/control/viewSegmentGroup?segmentGroupId=${segmentGroupId}" target-type="inter-app" link-style="smallSubmit"/> + <sub-hyperlink description="${segmentGroupId}" target="/marketing/control/viewSegmentGroup" target-type="inter-app" link-style="smallSubmit"> + <parameter param-name="segmentGroupId" from-field="segmentGroupId"/> + </sub-hyperlink> </display-entity> </field> <field name="roleTypeId" title="${uiLabelMap.PartyRole}"> @@ -498,10 +502,10 @@ </field> <field name="submitButton" title="${uiLabelMap.CommonSave}" widget-style="smallSubmit"><submit button-type="text-link"/></field> <!-- <field name="cancelLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="smallSubmit"> - <hyperlink target="${donePage}" also-hidden="false" description="${uiLabelMap.CommonCancelDone}"> - <parameter param-name="segmentGroupId" from-field="segmentGroupId"/> - </hyperlink> - </field> --> + <hyperlink target="${donePage}" also-hidden="false" description="${uiLabelMap.CommonCancelDone}"> + <parameter param-name="segmentGroupId" from-field="segmentGroupId"/> + </hyperlink> + </field> --> </form> <form name="EditPartyAttribute" type="single" target="updatePartyAttribute" default-map-name="attribute" @@ -596,9 +600,9 @@ <field name="contentName"> <display-entity entity-name="Content" description="${contentName}" key-field-name="contentId"> <sub-hyperlink target="EditPartyContents" description="${contentId}" link-style="smallSubmit"> - <parameter param-name="contentId" from-field="contentId"/> - <parameter param-name="partyId" from-field="partyId"/> - </sub-hyperlink> + <parameter param-name="contentId" from-field="contentId"/> + <parameter param-name="partyId" from-field="partyId"/> + </sub-hyperlink> </display-entity> </field> <field name="partyContentTypeId"><display-entity entity-name="PartyContentType"/></field> @@ -704,7 +708,9 @@ <field name="description"><display/></field> <field name="productId"> <display-entity entity-name="Product" description="${productName}"> - <sub-hyperlink target="/catalog/control/EditProduct?productId=${productId}" target-type="inter-app" description="${productId}" link-style="buttontext"/> + <sub-hyperlink target="/catalog/control/EditProduct" target-type="inter-app" description="${productId}" link-style="buttontext"> + <parameter param-name="productId" from-field="productId"/> + </sub-hyperlink> </display-entity> </field> <field name="fromDate"><display/></field> @@ -846,7 +852,9 @@ </row-actions> <field name="invoiceId"> <display-entity entity-name="Invoice" description=" " also-hidden="true"> - <sub-hyperlink target="/accounting/control/invoiceOverview?invoiceId=${invoiceId}" description="[${invoiceId}]" target-type="inter-app"/> + <sub-hyperlink target="/accounting/control/invoiceOverview" description="[${invoiceId}]" target-type="inter-app"> + <parameter param-name="invoiceId" from-field="invoiceId"/> + </sub-hyperlink> </display-entity> </field> <field name="invoiceTypeId"><display-entity entity-name="InvoiceType" description="${description}"/></field> @@ -856,7 +864,9 @@ <field name="amountApplied"><display type="currency" currency="${actualCurrencyUomId}"/></field> <field name="paymentId"> <display-entity entity-name="Payment" description=" " also-hidden="true"> - <sub-hyperlink target="/accounting/control/paymentOverview?paymentId=${paymentId}" description="[${paymentId}]" target-type="inter-app"/> + <sub-hyperlink target="/accounting/control/paymentOverview" description="[${paymentId}]" target-type="inter-app"> + <parameter param-name="paymentId" from-field="paymentId"/> + </sub-hyperlink> </display-entity> </field> <field name="pmEffectiveDate" title="${uiLabelMap.AccountingEffectiveDate}"><display type="date"/></field> @@ -872,7 +882,9 @@ </actions> <field name="invoiceId"> <display-entity entity-name="Invoice" description="${description}"> - <sub-hyperlink target="/accounting/control/invoiceOverview?invoiceId=${invoiceId}" description="[${invoiceId}]" target-type="inter-app"/> + <sub-hyperlink target="/accounting/control/invoiceOverview" description="[${invoiceId}]" target-type="inter-app"> + <parameter param-name="invoiceId" from-field="invoiceId"/> + </sub-hyperlink> </display-entity> </field> <field name="invoiceParentTypeId"> @@ -892,7 +904,9 @@ <field name="paymentId"><hidden/></field> <field name="paymentId"> <display-entity entity-name="Payment" description=" "> - <sub-hyperlink target="/accounting/control/paymentOverview?paymentId=${paymentId}" description="[${paymentId}]" target-type="inter-app"/> + <sub-hyperlink target="/accounting/control/paymentOverview" description="[${paymentId}]" target-type="inter-app"> + <parameter param-name="paymentId" from-field="paymentId"/> + </sub-hyperlink> </display-entity> </field> <field name="effectiveDate"><display type="date"/></field> Modified: ofbiz/trunk/applications/party/widget/partymgr/PartyClassificationForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/PartyClassificationForms.xml?rev=759666&r1=759665&r2=759666&view=diff ============================================================================== --- ofbiz/trunk/applications/party/widget/partymgr/PartyClassificationForms.xml (original) +++ ofbiz/trunk/applications/party/widget/partymgr/PartyClassificationForms.xml Sun Mar 29 11:00:00 2009 @@ -93,10 +93,10 @@ <field name="thruDate" title="${uiLabelMap.CommonThruDate}"><date-time/></field> <field name="submitButton" title="${uiLabelMap.CommonSave}" widget-style="smallSubmit"><submit button-type="text-link"/></field> <!-- <field name="cancelLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="smallSubmit"> - <hyperlink target="${donePage}" also-hidden="false" description="${uiLabelMap.CommonCancelDone}"> - <parameter param-name="segmentGroupId" from-field="segmentGroupId"/> - </hyperlink> - </field> --> + <hyperlink target="${donePage}" also-hidden="false" description="${uiLabelMap.CommonCancelDone}"> + <parameter param-name="segmentGroupId" from-field="segmentGroupId"/> + </hyperlink> + </field> --> </form> <form name="AddPartyClassificationParty" type="single" target="createPartyClassificationParty" default-map-name="partyClassification" @@ -109,10 +109,10 @@ <field name="thruDate" title="${uiLabelMap.CommonThruDate}"><date-time/></field> <field name="submitButton" title="${uiLabelMap.CommonSave}" widget-style="smallSubmit"><submit button-type="text-link"/></field> <!-- <field name="cancelLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="smallSubmit"> - <hyperlink target="${donePage}" also-hidden="false" description="${uiLabelMap.CommonCancelDone}"> - <parameter param-name="segmentGroupId" from-field="segmentGroupId"/> - </hyperlink> - </field> --> + <hyperlink target="${donePage}" also-hidden="false" description="${uiLabelMap.CommonCancelDone}"> + <parameter param-name="segmentGroupId" from-field="segmentGroupId"/> + </hyperlink> + </field> --> </form> <form name="ListPartyClassificationGroupParties" type="list" target="updatePartyClassificationParty" @@ -127,7 +127,9 @@ </field> <field name="partyId" title="${uiLabelMap.Party}"> <display-entity entity-name="PartyNameView" key-field-name="partyId" description="${firstName} ${lastName} ${groupName}"> - <sub-hyperlink target="viewprofile?partyId=${partyId}" description="${partyId}" link-style="smallSubmit"/> + <sub-hyperlink target="viewprofile" description="${partyId}" link-style="smallSubmit"> + <parameter param-name="partyId" from-field="partyId"/> + </sub-hyperlink> </display-entity> </field> <field name="fromDate" title="${uiLabelMap.CommonFromDate}"><display/></field> Modified: ofbiz/trunk/applications/party/widget/partymgr/PartyInvitationForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/PartyInvitationForms.xml?rev=759666&r1=759665&r2=759666&view=diff ============================================================================== --- ofbiz/trunk/applications/party/widget/partymgr/PartyInvitationForms.xml (original) +++ ofbiz/trunk/applications/party/widget/partymgr/PartyInvitationForms.xml Sun Mar 29 11:00:00 2009 @@ -99,7 +99,9 @@ </field> <field name="partyId" widget-style="buttontext" entry-name="partyIdTo"> <display-entity entity-name="PartyNameView" description="${firstName} ${middleName} ${lastName} ${groupName}"> - <sub-hyperlink target="/partymgr/control/viewprofile?partyId=${partyIdTo}" target-type="inter-app" description="${partyIdTo}" link-style="buttontext"/> + <sub-hyperlink target="/partymgr/control/viewprofile" target-type="inter-app" description="${partyIdTo}" link-style="buttontext"> + <parameter param-name="partyId" from-field="partyIdTo"/> + </sub-hyperlink> </display-entity> </field> <field name="remove" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext"> Modified: ofbiz/trunk/applications/party/widget/partymgr/SecurityForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/SecurityForms.xml?rev=759666&r1=759665&r2=759666&view=diff ============================================================================== --- ofbiz/trunk/applications/party/widget/partymgr/SecurityForms.xml (original) +++ ofbiz/trunk/applications/party/widget/partymgr/SecurityForms.xml Sun Mar 29 11:00:00 2009 @@ -101,7 +101,9 @@ <field name="thruDate" title="${uiLabelMap.CommonThruDate}"><date-time/></field> <field name="partyId" title="${uiLabelMap.PartyParty}"> <display-entity entity-name="PartyNameView" also-hidden="false" description="${firstName} ${middleName} ${lastName} ${groupName}"> - <sub-hyperlink target="viewprofile?partyId=${partyId}" description="${partyId}" link-style="buttontext"/> + <sub-hyperlink target="viewprofile" description="${partyId}" link-style="buttontext"> + <parameter param-name="partyId" from-field="partyId"/> + </sub-hyperlink> </display-entity> </field> <field name="submitButton" title="${uiLabelMap.CommonUpdate}"><submit button-type="button"/></field> @@ -134,7 +136,9 @@ <field name="partyId"><hidden value="${partyId}"/></field> <field name="groupId" title="${uiLabelMap.CommonGroup}"> <display-entity entity-name="SecurityGroup"> - <sub-hyperlink target="EditSecurityGroup?groupId=${groupId}" description="${groupId}" link-style="buttontext"/> + <sub-hyperlink target="EditSecurityGroup" description="${groupId}" link-style="buttontext"> + <parameter param-name="groupId" from-field="groupId"/> + </sub-hyperlink> </display-entity> </field> <field name="userLoginId"><hidden/></field> Modified: ofbiz/trunk/applications/product/webapp/catalog/category/CategoryForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/category/CategoryForms.xml?rev=759666&r1=759665&r2=759666&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/catalog/category/CategoryForms.xml (original) +++ ofbiz/trunk/applications/product/webapp/catalog/category/CategoryForms.xml Sun Mar 29 11:00:00 2009 @@ -98,7 +98,9 @@ <field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field> --> <field name="editLink" title="${uiLabelMap.ProductEditContent}" widget-style="buttontext"> - <hyperlink target="/content/control/EditContent?contentId=${contentId}" target-type="inter-app" description="${contentId}"/> + <hyperlink target="/content/control/EditContent" target-type="inter-app" description="${contentId}"> + <parameter param-name="contentId" from-field="contentId"/> + </hyperlink> </field> <field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext"> <hyperlink target="removeContentFromCategory?productCategoryId=${productCategoryId}&contentId=${contentId}&prodCatContentTypeId=${prodCatContentTypeId}&fromDate=${fromDate}" @@ -195,9 +197,9 @@ <field name="submitButton" use-when="productCategoryLink==null" title="${uiLabelMap.CommonAdd}"><submit button-type="button"/></field> <field name="submitButton" use-when="productCategoryLink!=null" title="${uiLabelMap.CommonUpdate}"><submit button-type="button"/></field> <field name="clearFormButton" title="${uiLabelMap.CommonEmptyHeader}" use-when="productCategoryLink!=null"> - <hyperlink target="EditProductCategoryLinks" target-type="intra-app" description="${uiLabelMap.CommonClear}"> - <parameter param-name="productCategoryId" from-field="productCategoryId"/> - </hyperlink> - </field> + <hyperlink target="EditProductCategoryLinks" target-type="intra-app" description="${uiLabelMap.CommonClear}"> + <parameter param-name="productCategoryId" from-field="productCategoryId"/> + </hyperlink> + </field> </form> </forms> Modified: ofbiz/trunk/applications/product/webapp/catalog/price/PriceForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/price/PriceForms.xml?rev=759666&r1=759665&r2=759666&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/catalog/price/PriceForms.xml (original) +++ ofbiz/trunk/applications/product/webapp/catalog/price/PriceForms.xml Sun Mar 29 11:00:00 2009 @@ -32,7 +32,9 @@ </service> </actions> <field name="productPriceRuleId" title="${uiLabelMap.ProductPriceRuleNameId}" widget-style="buttontext"> - <hyperlink target="EditProductPriceRules?productPriceRuleId=${productPriceRuleId}" description="${ruleName}[${productPriceRuleId}]" /> + <hyperlink target="EditProductPriceRules" description="${ruleName}[${productPriceRuleId}]" > + <parameter param-name="productPriceRuleId" from-field="productPriceRuleId"/> + </hyperlink> </field> <field name="isSale" title="${uiLabelMap.ProductSaleRule}?"><display/></field> <field name="fromDate" title="${uiLabelMap.CommonFromDate}"><display/></field> |
Free forum by Nabble | Edit this page |