Author: jleroux
Date: Sun Mar 29 13:33:53 2009 New Revision: 759680 URL: http://svn.apache.org/viewvc?rev=759680&view=rev Log: 20th set of changes explained in https://issues.apache.org/jira/browse/OFBIZ-2243 In hyperlink and sub-hyperlink elements, replacement of target parameters by parameter sub-elements Modified: ofbiz/trunk/applications/accounting/webapp/accounting/fixedasset/FixedAssetForms.xml ofbiz/trunk/applications/accounting/webapp/accounting/invoice/InvoiceForms.xml ofbiz/trunk/applications/accounting/webapp/accounting/payment/PaymentForms.xml ofbiz/trunk/applications/accounting/widget/GlForms.xml ofbiz/trunk/applications/accounting/widget/GlSetupForms.xml ofbiz/trunk/applications/accounting/widget/GlobalGlAccountsForms.xml ofbiz/trunk/applications/content/webapp/content/cms/CMSForms.xml ofbiz/trunk/applications/content/webapp/content/datasetup/DataSetupForms.xml ofbiz/trunk/applications/content/webapp/content/survey/SurveyForms.xml ofbiz/trunk/applications/content/webapp/content/website/WebSiteForms.xml ofbiz/trunk/applications/content/widget/content/ContentForms.xml ofbiz/trunk/applications/content/widget/forum/ForumForms.xml ofbiz/trunk/applications/humanres/widget/forms/EmplPositionForms.xml ofbiz/trunk/applications/marketing/widget/sfa/forms/ContactForms.xml ofbiz/trunk/applications/marketing/widget/sfa/forms/LeadForms.xml ofbiz/trunk/applications/marketing/widget/sfa/forms/OpportunityForms.xml ofbiz/trunk/applications/order/webapp/ordermgr/order/OrderForms.xml ofbiz/trunk/applications/order/webapp/ordermgr/request/RequestForms.xml ofbiz/trunk/applications/order/webapp/ordermgr/requirement/RequirementForms.xml ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryForms.xml ofbiz/trunk/applications/order/widget/ordermgr/ReportForms.xml ofbiz/trunk/applications/party/webapp/partymgr/communication/CommForms.xml ofbiz/trunk/applications/party/webapp/partymgr/party/PartyForms.xml ofbiz/trunk/applications/product/webapp/catalog/catalog/ProdCatalogForms.xml ofbiz/trunk/applications/product/webapp/catalog/config/ConfigForms.xml ofbiz/trunk/applications/product/webapp/catalog/feature/FeatureForms.xml ofbiz/trunk/applications/product/webapp/catalog/price/PriceForms.xml ofbiz/trunk/applications/product/webapp/catalog/product/ProductForms.xml ofbiz/trunk/applications/product/webapp/catalog/store/ProductStoreForms.xml ofbiz/trunk/applications/product/webapp/facility/facility/FacilityForms.xml ofbiz/trunk/applications/product/webapp/facility/group/FacilityGroupForms.xml ofbiz/trunk/applications/product/widget/catalog/SubscriptionForms.xml ofbiz/trunk/applications/workeffort/widget/TimesheetForms.xml ofbiz/trunk/applications/workeffort/widget/WorkEffortForms.xml ofbiz/trunk/applications/workeffort/widget/WorkEffortQuoteForms.xml ofbiz/trunk/applications/workeffort/widget/WorkEffortRequestForms.xml ofbiz/trunk/specialpurpose/assetmaint/widget/ismgr/FixedAssetForms.xml ofbiz/trunk/specialpurpose/ebay/widget/EbayForms.xml ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml ofbiz/trunk/specialpurpose/projectmgr/widget/forms/RequestForms.xml ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TimeSheetForms.xml Modified: ofbiz/trunk/applications/accounting/webapp/accounting/fixedasset/FixedAssetForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/fixedasset/FixedAssetForms.xml?rev=759680&r1=759679&r2=759680&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/webapp/accounting/fixedasset/FixedAssetForms.xml (original) +++ ofbiz/trunk/applications/accounting/webapp/accounting/fixedasset/FixedAssetForms.xml Sun Mar 29 13:33:53 2009 @@ -38,7 +38,9 @@ <field name="fixedAssetTypeId"><display-entity entity-name="FixedAssetType"/></field> <field name="parentFixedAssetId"> <display-entity entity-name="FixedAsset" key-field-name="fixedAssetId" description="${fixedAssetName}"> - <sub-hyperlink target="EditFixedAsset?fixedAssetId=${parentFixedAssetId}" description="${parentFixedAssetId}"/> + <sub-hyperlink target="EditFixedAsset" 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/applications/accounting/webapp/accounting/invoice/InvoiceForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/invoice/InvoiceForms.xml?rev=759680&r1=759679&r2=759680&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/webapp/accounting/invoice/InvoiceForms.xml (original) +++ ofbiz/trunk/applications/accounting/webapp/accounting/invoice/InvoiceForms.xml Sun Mar 29 13:33:53 2009 @@ -160,10 +160,10 @@ </hyperlink> </field> <field name="overrideGlAccountId" widget-area-style="align-text"> - <hyperlink target="GlAccountNavigate" description="${overrideGlAccountId}"> - <parameter param-name="glAccountId" from-field="overrideGlAccountId"/> - </hyperlink> - </field> + <hyperlink target="GlAccountNavigate" description="${overrideGlAccountId}"> + <parameter param-name="glAccountId" from-field="overrideGlAccountId"/> + </hyperlink> + </field> </form> <form name="invoiceRoles" type="list" use-row-submit="true" title="" list-name="invoiceRoles" paginate-target="invoiceRoles" @@ -192,10 +192,10 @@ <field name="total" widget-area-style="align-text"><display type="currency" currency="${invoice.currencyUomId}"/></field> <field name="invoiceId"><hidden/></field> <field name="paymentId" widget-style="linktext"> - <hyperlink target="paymentOverview" description="${paymentId}"> - <parameter param-name="paymentId" from-field="paymentId"/> - </hyperlink> - </field> + <hyperlink target="paymentOverview" description="${paymentId}"> + <parameter param-name="paymentId" from-field="paymentId"/> + </hyperlink> + </field> <field name="billingAccountId"><hidden/></field> <field name="paymentApplicationId"><hidden/></field> <field name="amountApplied" widget-area-style="align-text"><display type="currency" currency="${invoice.currencyUomId}"/></field> @@ -460,10 +460,10 @@ odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <field name="invoiceId"><hidden/></field> <field name="paymentId" widget-style="buttontext"> - <hyperlink target="paymentOverview" description="[${paymentId}]"> - <parameter param-name="paymentId" from-field="paymentId"/> - </hyperlink> - </field> + <hyperlink target="paymentOverview" description="[${paymentId}]"> + <parameter param-name="paymentId" from-field="paymentId"/> + </hyperlink> + </field> <field name="amount"><display type="currency" currency="${currencyUomId}"/></field> <field name="effectiveDate"><display type="date"/></field> <field name="amountApplied" parameter-name="dummy"><display type="currency" currency="${currencyUomId}"/></field> @@ -577,7 +577,9 @@ <field name="rateTypeId"><display-entity entity-name="RateType" description="${description}"/></field> <field name="workEffortId"> <display-entity entity-name="WorkEffort" description="${workEffortName} [${workEffortId}]"> - <sub-hyperlink description=" [${workEffortId}]" target="/workeffort/control/WorkEffortSummary?workEffortId=${workEffortId}" target-type="inter-app"/> + <sub-hyperlink description=" [${workEffortId}]" target="/workeffort/control/WorkEffortSummary" target-type="inter-app"> + <parameter param-name="workEffortId" from-field="workEffortId"/> + </sub-hyperlink> </display-entity> </field> <field name="fromDate"><display type="date"/></field> Modified: ofbiz/trunk/applications/accounting/webapp/accounting/payment/PaymentForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/payment/PaymentForms.xml?rev=759680&r1=759679&r2=759680&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/webapp/accounting/payment/PaymentForms.xml (original) +++ ofbiz/trunk/applications/accounting/webapp/accounting/payment/PaymentForms.xml Sun Mar 29 13:33:53 2009 @@ -257,7 +257,9 @@ <field name="paymentId"><hidden/></field> <field name="invoiceId"> <display-entity entity-name="Invoice" description="${description}"> - <sub-hyperlink target="invoiceOverview?invoiceId=${invoiceId}" description="[${invoiceId}]"/> + <sub-hyperlink target="invoiceOverview" description="[${invoiceId}]"> + <parameter param-name="invoiceId" from-field="invoiceId"/> + </sub-hyperlink> </display-entity> </field> <field name="invoiceItemSeqId"><display/></field> @@ -317,10 +319,10 @@ odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <field name="paymentId"><hidden/></field> <field name="invoiceId" widget-style="buttontext"> - <hyperlink target="invoiceOverview" description="${invoiceId}"> - <parameter param-name="invoiceId" from-field="invoiceId"/> - </hyperlink> - </field> + <hyperlink target="invoiceOverview" description="${invoiceId}"> + <parameter param-name="invoiceId" from-field="invoiceId"/> + </hyperlink> + </field> <field name="description"><display/></field> <field name="invoiceDate"><display type="date"/></field> <field name="amount"><display type="currency" currency="${currencyUomId}"/></field> @@ -339,10 +341,10 @@ odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <field name="paymentId"><hidden/></field> <field name="toPaymentId" widget-style="buttontext"> - <hyperlink target="paymentOverview" description="[${toPaymentId}]"> - <parameter param-name="paymentId" from-field="toPaymentId"/> - </hyperlink> - </field> + <hyperlink target="paymentOverview" description="[${toPaymentId}]"> + <parameter param-name="paymentId" from-field="toPaymentId"/> + </hyperlink> + </field> <field name="effectiveDate"><display/></field> <field name="amount"><display type="currency" currency="${currencyUomId}"/></field> <field name="amountApplied" parameter-name="dummy"><display type="currency" currency="${currencyUomId}"/></field> @@ -434,10 +436,10 @@ <field name="paymentApplicationId"><hidden/></field> <field name="paymentId"><hidden/></field> <field name="invoiceId" widget-style="buttontext"> - <hyperlink target="invoiceOverview" description="${invoiceId}"> - <parameter param-name="invoiceId" from-field="invoiceId"/> - </hyperlink> - </field> + <hyperlink target="invoiceOverview" description="${invoiceId}"> + <parameter param-name="invoiceId" from-field="invoiceId"/> + </hyperlink> + </field> <field name="invoiceItemSeqId" widget-style="buttontext"> <hyperlink target="listInvoiceItems" description="${invoiceItemSeqId}"> <parameter param-name="invoiceId" from-field="invoiceId"/> @@ -445,15 +447,15 @@ </hyperlink> </field> <field name="toPaymentId" widget-style="buttontext"> - <hyperlink target="paymentOverview" description="${toPaymentId}"> - <parameter param-name="paymentId" from-field="toPaymentId"/> - </hyperlink> - </field> + <hyperlink target="paymentOverview" description="${toPaymentId}"> + <parameter param-name="paymentId" from-field="toPaymentId"/> + </hyperlink> + </field> <field name="billingAccountId" widget-style="buttontext"> - <hyperlink target="EditBillingAccount" description="${billingAccountId}"> - <parameter param-name="billingAccountId" from-field="billingAccountId"/> - </hyperlink> - </field> + <hyperlink target="EditBillingAccount" description="${billingAccountId}"> + <parameter param-name="billingAccountId" from-field="billingAccountId"/> + </hyperlink> + </field> <field name="taxAuthGeoId"><display-entity entity-name="Geo" key-field-name="geoId" description="${geoName}"></display-entity></field> <field name="amountApplied"><display type="currency" currency="${payment.currencyUomId}"/></field> </form> @@ -473,7 +475,9 @@ <form name="ListChecksToPrint" type="multi" list-name="payments" target="printChecks" separate-columns="true" odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <field name="paymentId"> - <hyperlink target="paymentOverview?paymentId=${paymentId}" description="${paymentId}"/> + <hyperlink target="paymentOverview" description="${paymentId}"> + <parameter param-name="paymentId" from-field="paymentId"/> + </hyperlink> </field> <field name="partyIdTo" title="${uiLabelMap.PartyPartyTo}"> <display-entity description="${firstName} ${middleName} ${lastName} ${groupName}" entity-name="PartyNameView" key-field-name="partyId"/> @@ -489,7 +493,9 @@ odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <field name="paymentId"><hidden/></field> <field name="paymentId"> - <hyperlink target="paymentOverview?paymentId=${paymentId}" description="${paymentId}"/> + <hyperlink target="paymentOverview" description="${paymentId}"> + <parameter param-name="paymentId" from-field="paymentId"/> + </hyperlink> </field> <field name="partyIdTo" title="${uiLabelMap.PartyPartyTo}"> <display-entity description="${firstName} ${middleName} ${lastName} ${groupName}" entity-name="PartyNameView" key-field-name="partyId"/> @@ -538,10 +544,10 @@ <form name="ListInvoicesByDueDate" type="list" list-name="invoicePaymentInfoList" odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <field name="invoiceId" widget-style="buttontext"> - <hyperlink target="invoiceOverview" description="${invoiceId}"> - <parameter param-name="invoiceId" from-field="invoiceId"/> - </hyperlink> - </field> + <hyperlink target="invoiceOverview" description="${invoiceId}"> + <parameter param-name="invoiceId" from-field="invoiceId"/> + </hyperlink> + </field> <field name="termTypeId"> <display-entity entity-name="TermType" description="${description}"/> </field> Modified: ofbiz/trunk/applications/accounting/widget/GlForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/GlForms.xml?rev=759680&r1=759679&r2=759680&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/widget/GlForms.xml (original) +++ ofbiz/trunk/applications/accounting/widget/GlForms.xml Sun Mar 29 13:33:53 2009 @@ -114,17 +114,23 @@ </field> <field name="paymentId" use-when="paymentId==null"><display/></field> <field name="workEffortId" use-when="workEffortId!=null" widget-style="buttontext"> - <hyperlink also-hidden="false" description="${workEffortId}" target="/workeffort/control/EditWorkEffort?workEffortId=${workEffortId}" target-type="inter-app"/> + <hyperlink also-hidden="false" description="${workEffortId}" target="/workeffort/control/EditWorkEffort" target-type="inter-app"> + <parameter param-name="workEffortId" from-field="workEffortId"/> + </hyperlink> </field> <field name="workEffortId" use-when="workEffortId==null"><display/></field> <field name="shipmentId" use-when="shipmentId!=null" widget-style="buttontext"> - <hyperlink also-hidden="false" description="${shipmentId}" target="/facility/control/EditShipment?shipmentId=${shipmentId}" target-type="inter-app"/> + <hyperlink also-hidden="false" description="${shipmentId}" target="/facility/control/EditShipment" target-type="inter-app"> + <parameter param-name="shipmentId" from-field="shipmentId"/> + </hyperlink> </field> <field name="shipmentId" use-when="shipmentId==null"><display/></field> <field name="isPosted"><display/></field> <field name="postedDate"><display/></field> <field name="postAcctgTrans" title="${uiLabelMap.CommonEmptyHeader}" use-when=""N".equals(isPosted)" widget-style="buttontext"> - <hyperlink target="postAcctgTrans?acctgTransId=${acctgTransId}" description="${uiLabelMap.AccountingPostTransaction}"/> + <hyperlink target="postAcctgTrans" description="${uiLabelMap.AccountingPostTransaction}"> + <parameter param-name="acctgTransId" from-field="acctgTransId"/> + </hyperlink> </field> <field name="postAcctgTrans" title="${uiLabelMap.CommonEmptyHeader}" use-when="!"N".equals(isPosted)"><display/></field> </form> @@ -281,19 +287,27 @@ </field> <field name="paymentId" position="2" use-when="paymentId==null"><display/></field> <field name="workEffortId" position="2" use-when="workEffortId!=null" widget-style="buttontext"> - <hyperlink also-hidden="false" description="${workEffortId}" target="/workeffort/control/EditWorkEffort?workEffortId=${workEffortId}" target-type="inter-app"/> + <hyperlink also-hidden="false" description="${workEffortId}" target="/workeffort/control/EditWorkEffort" target-type="inter-app"> + <parameter param-name="workEffortId" from-field="workEffortId"/> + </hyperlink> </field> <field name="workEffortId" position="2" use-when="workEffortId==null"><display/></field> <field name="shipmentId" position="2" use-when="shipmentId!=null" widget-style="buttontext"> - <hyperlink also-hidden="false" description="${shipmentId}" target="/facility/control/EditShipment?shipmentId=${shipmentId}" target-type="inter-app"/> + <hyperlink also-hidden="false" description="${shipmentId}" target="/facility/control/EditShipment" target-type="inter-app"> + <parameter param-name="shipmentId" from-field="shipmentId"/> + </hyperlink> </field> <field name="shipmentId" position="2" use-when="shipmentId==null"><display/></field> <field name="partyId" position="2" use-when="partyId!=null" widget-style="buttontext"> - <hyperlink also-hidden="false" description="${partyId}" target="/partymgr/control/viewprofile?partyId=${partyId}" target-type="inter-app"/> + <hyperlink also-hidden="false" description="${partyId}" target="/partymgr/control/viewprofile" target-type="inter-app"> + <parameter param-name="partyId" from-field="partyId"/> + </hyperlink> </field> <field name="partyId" position="2" use-when="partyId==null"><display/></field> <field name="productId" position="2" use-when="productId!=null" widget-style="buttontext"> - <hyperlink also-hidden="false" description="${productId}" target="/catalog/control/EditProduct?productId=${productId}" target-type="inter-app"/> + <hyperlink also-hidden="false" description="${productId}" target="/catalog/control/EditProduct" target-type="inter-app"> + <parameter param-name="productId" from-field="productId"/> + </hyperlink> </field> <field name="productId" position="2" use-when="productId==null"><display/></field> <field name="isPosted" position="2"><display/></field> @@ -352,19 +366,27 @@ </field> <field name="paymentId" use-when="paymentId==null"><display/></field> <field name="workEffortId" use-when="workEffortId!=null" widget-style="buttontext"> - <hyperlink also-hidden="false" description="${workEffortId}" target="/workeffort/control/EditWorkEffort?workEffortId=${workEffortId}" target-type="inter-app"/> + <hyperlink also-hidden="false" description="${workEffortId}" target="/workeffort/control/EditWorkEffort" target-type="inter-app"> + <parameter param-name="workEffortId" from-field="workEffortId"/> + </hyperlink> </field> <field name="workEffortId" use-when="workEffortId==null"><display/></field> <field name="shipmentId" use-when="shipmentId!=null" widget-style="buttontext"> - <hyperlink also-hidden="false" description="${shipmentId}" target="/facility/control/EditShipment?shipmentId=${shipmentId}" target-type="inter-app"/> + <hyperlink also-hidden="false" description="${shipmentId}" target="/facility/control/EditShipment" target-type="inter-app"> + <parameter param-name="shipmentId" from-field="shipmentId"/> + </hyperlink> </field> <field name="shipmentId" use-when="shipmentId==null"><display/></field> <field name="partyId" use-when="partyId!=null" widget-style="buttontext"> - <hyperlink also-hidden="false" description="${partyId}" target="/partymgr/control/viewprofile?partyId=${partyId}" target-type="inter-app"/> + <hyperlink also-hidden="false" description="${partyId}" target="/partymgr/control/viewprofile" target-type="inter-app"> + <parameter param-name="partyId" from-field="partyId"/> + </hyperlink> </field> <field name="partyId" use-when="partyId==null"><display/></field> <field name="productId" use-when="productId!=null" widget-style="buttontext"> - <hyperlink also-hidden="false" description="${productId}" target="/catalog/control/EditProduct?productId=${productId}" target-type="inter-app"/> + <hyperlink also-hidden="false" description="${productId}" target="/catalog/control/EditProduct" target-type="inter-app"> + <parameter param-name="productId" from-field="productId"/> + </hyperlink> </field> <field name="productId" use-when="productId==null"><display/></field> <field name="isPosted"><display/></field> Modified: ofbiz/trunk/applications/accounting/widget/GlSetupForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/GlSetupForms.xml?rev=759680&r1=759679&r2=759680&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/widget/GlSetupForms.xml (original) +++ ofbiz/trunk/applications/accounting/widget/GlSetupForms.xml Sun Mar 29 13:33:53 2009 @@ -25,15 +25,15 @@ odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <field name="partyId" title="${uiLabelMap.AccountingCompanies}"><display-entity entity-name="PartyGroup" description="${groupName}"/></field> <field name="setup" title="${uiLabelMap.CommonEmptyHeader}" use-when="hasPrefPermission" widget-style="buttontext"> - <hyperlink target="AdminMain" description="${uiLabelMap.AccountingSetup}"> - <parameter param-name="organizationPartyId" from-field="partyId"/> - </hyperlink> - </field> + <hyperlink target="AdminMain" description="${uiLabelMap.AccountingSetup}"> + <parameter param-name="organizationPartyId" from-field="partyId"/> + </hyperlink> + </field> <field name="accounting" title="${uiLabelMap.CommonEmptyHeader}" use-when="hasBasicPermission" widget-style="buttontext"> - <hyperlink target="PartyAccountsSummary" description="${uiLabelMap.AccountingAccounting}"> - <parameter param-name="organizationPartyId" from-field="partyId"/> - </hyperlink> - </field> + <hyperlink target="PartyAccountsSummary" description="${uiLabelMap.AccountingAccounting}"> + <parameter param-name="organizationPartyId" from-field="partyId"/> + </hyperlink> + </field> </form> <form name="ListGlAccountOrganization" list-name="listIt" target="" title="" type="list" view-size="50" Modified: ofbiz/trunk/applications/accounting/widget/GlobalGlAccountsForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/GlobalGlAccountsForms.xml?rev=759680&r1=759679&r2=759680&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/widget/GlobalGlAccountsForms.xml (original) +++ ofbiz/trunk/applications/accounting/widget/GlobalGlAccountsForms.xml Sun Mar 29 13:33:53 2009 @@ -147,7 +147,9 @@ <field name="acctgTransEntrySeqId"><display/></field> <field name="glAccountId"> <display-entity entity-name="GlAccount" description="${accountName}"> - <sub-hyperlink target="ListGlAccountEntries?glAccountId=${glAccountId}" description="[${glAccountId}]"/> + <sub-hyperlink target="ListGlAccountEntries" description="[${glAccountId}]"> + <parameter param-name="glAccountId" from-field="glAccountId"/> + </sub-hyperlink> </display-entity> </field> <field name="description"><display/></field> Modified: ofbiz/trunk/applications/content/webapp/content/cms/CMSForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/webapp/content/cms/CMSForms.xml?rev=759680&r1=759679&r2=759680&view=diff ============================================================================== --- ofbiz/trunk/applications/content/webapp/content/cms/CMSForms.xml (original) +++ ofbiz/trunk/applications/content/webapp/content/cms/CMSForms.xml Sun Mar 29 13:33:53 2009 @@ -513,10 +513,16 @@ </field> <field name="dataResourceId"> <lookup target-form-name="LookupDataResource"> - <sub-hyperlink use-when=""${currentValue.dataResourceId}".length()>0" link-style="buttontext" target-type="intra-app" target="gotoDataResource?dataResourceId=${currentValue.dataResourceId}" description="${uiLabelMap.ContentGoToDataResource}"/> + <sub-hyperlink use-when=""${currentValue.dataResourceId}".length()>0" link-style="buttontext" target-type="intra-app" target="gotoDataResource" description="${uiLabelMap.ContentGoToDataResource}"> + <parameter param-name="dataResourceId" from-field="currentValue.dataResourceId"/> + </sub-hyperlink> <!-- - <sub-hyperlink link-style="buttontext" target-type="intra-app" target="gotoDataResource?dataResourceId=${currentValue.dataResourceId}" description="${uiLabelMap.ContentGoToDataResource}"/> - <sub-hyperlink use-when=""${currentValue.dataResourceId}".length()>0" link-style="buttontext" target-type="intra-app" target="gotoDataResource?dataResourceId=${currentValue.dataResourceId}" description="${uiLabelMap.ContentGoToDataResource}"/> + <sub-hyperlink link-style="buttontext" target-type="intra-app" target="gotoDataResource" description="${uiLabelMap.ContentGoToDataResource}"> + <parameter param-name="dataResourceId" from-field="currentValue.dataResourceId"/> + </sub-hyperlink> + <sub-hyperlink use-when=""${currentValue.dataResourceId}".length()>0" link-style="buttontext" target-type="intra-app" target="gotoDataResource" description="${uiLabelMap.ContentGoToDataResource}"> + <parameter param-name="dataResourceId" from-field="currentValue.dataResourceId"/> + </sub-hyperlink> --> </lookup> </field> Modified: ofbiz/trunk/applications/content/webapp/content/datasetup/DataSetupForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/webapp/content/datasetup/DataSetupForms.xml?rev=759680&r1=759679&r2=759680&view=diff ============================================================================== --- ofbiz/trunk/applications/content/webapp/content/datasetup/DataSetupForms.xml (original) +++ ofbiz/trunk/applications/content/webapp/content/datasetup/DataSetupForms.xml Sun Mar 29 13:33:53 2009 @@ -249,7 +249,9 @@ </actions> <auto-fields-service service-name="updateMimeTypeHtmlTemplate"/> <field name="mimeTypeId" widget-style="tabletext"> - <hyperlink target-type="intra-app" target="editMimeType?mimeTypeId=${mimeTypeId}" description="${mimeTypeId}"/> + <hyperlink target-type="intra-app" target="editMimeType" description="${mimeTypeId}"> + <parameter param-name="mimeTypeId" from-field="mimeTypeId"/> + </hyperlink> </field> <field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"> <submit button-type="button"/> Modified: ofbiz/trunk/applications/content/webapp/content/survey/SurveyForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/webapp/content/survey/SurveyForms.xml?rev=759680&r1=759679&r2=759680&view=diff ============================================================================== --- ofbiz/trunk/applications/content/webapp/content/survey/SurveyForms.xml (original) +++ ofbiz/trunk/applications/content/webapp/content/survey/SurveyForms.xml Sun Mar 29 13:33:53 2009 @@ -45,7 +45,9 @@ </actions> <auto-fields-entity entity-name="Survey" default-field-type="display"/> <field name="surveyId" title="${uiLabelMap.ContentSurveySurveyId}" widget-style="buttontext"> - <hyperlink description="${surveyId}" target="EditSurvey?surveyId=${surveyId}" also-hidden="false"/> + <hyperlink description="${surveyId}" target="EditSurvey" also-hidden="false"> + <parameter param-name="surveyId" from-field="surveyId"/> + </hyperlink> </field> <on-event-update-area event-type="paginate" area-id="search-results" area-target="ListFindSurveySearchResults"/> </form> Modified: ofbiz/trunk/applications/content/webapp/content/website/WebSiteForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/webapp/content/website/WebSiteForms.xml?rev=759680&r1=759679&r2=759680&view=diff ============================================================================== --- ofbiz/trunk/applications/content/webapp/content/website/WebSiteForms.xml (original) +++ ofbiz/trunk/applications/content/webapp/content/website/WebSiteForms.xml Sun Mar 29 13:33:53 2009 @@ -43,7 +43,9 @@ <entity-options entity-name="ProductStore" description="${storeName}"> <entity-order-by field-name="storeName"/> </entity-options> - <sub-hyperlink use-when=""${webSite.productStoreId}".length()>0" link-style="buttontext" target-type="inter-app" target="/catalog/control/EditProductStore?productStoreId=${webSite.productStoreId}" description="${uiLabelMap.ContentEditProductStore}"/> + <sub-hyperlink use-when=""${webSite.productStoreId}".length()>0" link-style="buttontext" target-type="inter-app" target="/catalog/control/EditProductStore" description="${uiLabelMap.ContentEditProductStore}"> + <parameter param-name="productStoreId" from-field="webSite.productStoreId"/> + </sub-hyperlink> </drop-down> </field> <field name="visualThemeSetId"> @@ -58,7 +60,9 @@ <form name="ListWebSites" target="" title="" type="list" list-name="webSites" paginate-target="FindWebSite" paginate="true" odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <field name="webSiteId" title="${uiLabelMap.CommonId}" widget-style="buttontext"> - <hyperlink description="${webSiteId}" target="EditWebSite?webSiteId=${webSiteId}" also-hidden="false"/> + <hyperlink description="${webSiteId}" target="EditWebSite" also-hidden="false"> + <parameter param-name="webSiteId" from-field="webSiteId"/> + </hyperlink> </field> <field name="siteName" title="${uiLabelMap.CommonName}"><display/></field> <field name="httpHost"><display/></field> @@ -89,7 +93,9 @@ <field name="webSiteId"><display also-hidden="true"/></field> <!-- <field name="contentId" title="Content ID" widget-style="linktext"> - <hyperlink description="${contentId}" target="EditContent?contentId=${contentId}" also-hidden="true"/> + <hyperlink description="${contentId}" target="EditContent" also-hidden="true"> + <parameter param-name="contentId" from-field="contentId"/> + </hyperlink> </field> --> <field name="contentId"> Modified: ofbiz/trunk/applications/content/widget/content/ContentForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/content/ContentForms.xml?rev=759680&r1=759679&r2=759680&view=diff ============================================================================== --- ofbiz/trunk/applications/content/widget/content/ContentForms.xml (original) +++ ofbiz/trunk/applications/content/widget/content/ContentForms.xml Sun Mar 29 13:33:53 2009 @@ -140,13 +140,17 @@ </field> <field name="dataResourceId"> <lookup target-form-name="LookupDataResource"> - <sub-hyperlink link-style="buttontext" target="EditDataResource?dataResourceId=${currentValue.dataResourceId}" description="${uiLabelMap.ContentGoToDataResource}"/> + <sub-hyperlink link-style="buttontext" target="EditDataResource" description="${uiLabelMap.ContentGoToDataResource}"> + <parameter param-name="dataResourceId" from-field="currentValue.dataResourceId"/> + </sub-hyperlink> </lookup> </field> <field name="ownerContentId"><lookup target-form-name="LookupContent"/></field> <field name="decoratorContentId"> <lookup target-form-name="LookupContent"> - <sub-hyperlink use-when=""${currentValue.decoratorContentId}".length()>0" link-style="buttontext" target="EditContent?contentId=${currentValue.decoratorContentId}" description="${uiLabelMap.ContentGoToContent}"/> + <sub-hyperlink use-when=""${currentValue.decoratorContentId}".length()>0" link-style="buttontext" target="EditContent" description="${uiLabelMap.ContentGoToContent}"> + <parameter param-name="contentId" from-field="currentValue.decoratorContentId"/> + </sub-hyperlink> </lookup> </field> <field name="mimeTypeId"> Modified: ofbiz/trunk/applications/content/widget/forum/ForumForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/forum/ForumForms.xml?rev=759680&r1=759679&r2=759680&view=diff ============================================================================== --- ofbiz/trunk/applications/content/widget/forum/ForumForms.xml (original) +++ ofbiz/trunk/applications/content/widget/forum/ForumForms.xml Sun Mar 29 13:33:53 2009 @@ -23,10 +23,10 @@ <form name="ListForumGroups" type="list" list-name="forumGroups" separate-columns="true" odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar"> <field name="select" widget-style="buttontext" entry-name="contentId" parameter-name="contentId"> - <hyperlink target="findForums" description="${uiLabelMap.FormFieldTitle_forums}"> - <parameter param-name="forumGroupId" from-field="contentId"/> - </hyperlink> - </field> + <hyperlink target="findForums" description="${uiLabelMap.FormFieldTitle_forums}"> + <parameter param-name="forumGroupId" from-field="contentId"/> + </hyperlink> + </field> <field name="forumGroupName" entry-name="contentName" parameter-name="contentName"><text/></field> <field name="forumGroupDescription" entry-name="description" parameter-name="description"><text/></field> <field name="updateButton" title="${uiLabelMap.CommonUpdate}" widget-style="buttontext"><submit button-type="text-link"/></field> Modified: ofbiz/trunk/applications/humanres/widget/forms/EmplPositionForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/forms/EmplPositionForms.xml?rev=759680&r1=759679&r2=759680&view=diff ============================================================================== --- ofbiz/trunk/applications/humanres/widget/forms/EmplPositionForms.xml (original) +++ ofbiz/trunk/applications/humanres/widget/forms/EmplPositionForms.xml Sun Mar 29 13:33:53 2009 @@ -300,7 +300,9 @@ header-row-style="header-row" default-table-style="basic-table"> <auto-fields-service service-name="updateEmplPosition" default-field-type="display"/> <field name="emplPositionTypeId"><display-entity entity-name="EmplPositionType" description="${description}"> - <sub-hyperlink target="EditEmplPositionTypes?emplPositionTypeId=${emplPosition.emplPositionTypeId}" description="[${emplPosition.emplPositionTypeId}]"/> + <sub-hyperlink target="EditEmplPositionTypes" description="[${emplPosition.emplPositionTypeId}]"> + <parameter param-name="emplPositionTypeId" from-field="emplPosition.emplPositionTypeId"/> + </sub-hyperlink> </display-entity></field> </form> <form name="ListEmplPositionFulfilmentInfo" type="list" list-name="emplPositionFulfillments" Modified: ofbiz/trunk/applications/marketing/widget/sfa/forms/ContactForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/sfa/forms/ContactForms.xml?rev=759680&r1=759679&r2=759680&view=diff ============================================================================== --- ofbiz/trunk/applications/marketing/widget/sfa/forms/ContactForms.xml (original) +++ ofbiz/trunk/applications/marketing/widget/sfa/forms/ContactForms.xml Sun Mar 29 13:33:53 2009 @@ -32,11 +32,15 @@ </entity-one> </row-actions> <field name="partyId" title="${uiLabelMap.PartyPartyId}"> - <hyperlink target="viewprofile?partyId=${partyRow.partyId}" description="${partyRow.partyId}"/> + <hyperlink target="viewprofile" description="${partyRow.partyId}"> + <parameter param-name="partyId" from-field="partyRow.partyId"/> + </hyperlink> </field> <field name="partyName" title="${uiLabelMap.PartyName}"><display description="${person.lastName}, ${person.firstName}"/></field> <field name="export" title="${uiLabelMap.SfaVCard}"> - <hyperlink target="createVCardFromContact?partyId=${partyRow.partyId}" description="${uiLabelMap.SfaVCard}"/> + <hyperlink target="createVCardFromContact" description="${uiLabelMap.SfaVCard}"> + <parameter param-name="partyId" from-field="partyRow.partyId"/> + </hyperlink> </field> </form> <form name="CreateContact" type="single" target="createContact" header-row-style="header-row" default-table-style="basic-table"> Modified: ofbiz/trunk/applications/marketing/widget/sfa/forms/LeadForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/sfa/forms/LeadForms.xml?rev=759680&r1=759679&r2=759680&view=diff ============================================================================== --- ofbiz/trunk/applications/marketing/widget/sfa/forms/LeadForms.xml (original) +++ ofbiz/trunk/applications/marketing/widget/sfa/forms/LeadForms.xml Sun Mar 29 13:33:53 2009 @@ -33,7 +33,9 @@ <set field="statusId" from-field="partyRow.statusId"/> </row-actions> <field name="partyId" title="${uiLabelMap.PartyPartyId}"> - <hyperlink target="viewprofile?partyId=${partyRow.partyId}" description="${partyRow.partyId}"/> + <hyperlink target="viewprofile" description="${partyRow.partyId}"> + <parameter param-name="partyId" from-field="partyRow.partyId"/> + </hyperlink> </field> <field name="partyName" title="${uiLabelMap.PartyName}"><display description="${person.lastName}, ${person.firstName}"/></field> <field name="statusId" title="${uiLabelMap.CommonStatus}"><display-entity entity-name="StatusItem" description="${description}" key-field-name="statusId"/></field> Modified: ofbiz/trunk/applications/marketing/widget/sfa/forms/OpportunityForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/sfa/forms/OpportunityForms.xml?rev=759680&r1=759679&r2=759680&view=diff ============================================================================== --- ofbiz/trunk/applications/marketing/widget/sfa/forms/OpportunityForms.xml (original) +++ ofbiz/trunk/applications/marketing/widget/sfa/forms/OpportunityForms.xml Sun Mar 29 13:33:53 2009 @@ -54,13 +54,17 @@ </actions> <field name="salesOpportunityId"><hidden/></field> <field name="opportunityName" title="${uiLabelMap.SfaOpportunityName}"> - <hyperlink target="ViewOpportunity?salesOpportunityId=${salesOpportunityId}" description="${opportunityName}"/> + <hyperlink target="ViewOpportunity" description="${opportunityName}"> + <parameter param-name="salesOpportunityId" from-field="salesOpportunityId"/> + </hyperlink> </field> <field name="opportunityStageId" title="${uiLabelMap.SfaInitialStage}"><display/></field> <field name="estimatedAmount" title="${uiLabelMap.SfaEstimatedAmount}"><display/></field> <field name="estimatedCloseDate" title="${uiLabelMap.SfaCloseDate}"><display/></field> <field name="editButton" title="${uiLabelMap.CommonEdit}" widget-style="buttontext"> - <hyperlink target="EditOpportunity?salesOpportunityId=${salesOpportunityId}" description="${uiLabelMap.CommonEdit}"/> + <hyperlink target="EditOpportunity" description="${uiLabelMap.CommonEdit}"> + <parameter param-name="salesOpportunityId" from-field="salesOpportunityId"/> + </hyperlink> </field> </form> Modified: ofbiz/trunk/applications/order/webapp/ordermgr/order/OrderForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/order/OrderForms.xml?rev=759680&r1=759679&r2=759680&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/order/OrderForms.xml (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/order/OrderForms.xml Sun Mar 29 13:33:53 2009 @@ -88,7 +88,9 @@ </actions> <auto-fields-entity entity-name="OrderHeader" default-field-type="display"/> <field name="orderId" widget-style="buttontext"> - <hyperlink target="EditOrderHeader?orderId=${orderId}" description="[${orderId}]"/> + <hyperlink target="EditOrderHeader" description="[${orderId}]"> + <parameter param-name="orderId" from-field="orderId"/> + </hyperlink> </field> <field name="statusId"> <display-entity entity-name="StatusItem"/> </field> <field name="productStoreId"> <display-entity entity-name="ProductStore"/> </field> @@ -129,7 +131,9 @@ <field name="orderId"><hidden/></field> <field name="shipGroupSeqId"><hidden/></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="supplierProductId"><display/></field> <field name="supplierProductName"><display/></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=759680&r1=759679&r2=759680&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/request/RequestForms.xml (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/request/RequestForms.xml Sun Mar 29 13:33:53 2009 @@ -87,7 +87,9 @@ <field name="responseRequiredDate"><display/></field> <field name="fromPartyId"> <display-entity entity-name="PartyNameView" key-field-name="partyId" description="${firstName} ${middleName} ${lastName} ${groupName}"> - <sub-hyperlink description="[${fromPartyId}]" target="/partymgr/control/viewprofile?partyId=${fromPartyId}" target-type="inter-app"/> + <sub-hyperlink description="[${fromPartyId}]" target="/partymgr/control/viewprofile" target-type="inter-app"> + <parameter param-name="partyId" from-field="fromPartyId"/> + </sub-hyperlink> </display-entity> </field> <field name="statusId"> @@ -162,7 +164,9 @@ <form name="ViewRequestCommunicationEvents" type="list" extends="ListCommEvents"> <!-- extends-resource="component://party/webapp/partymgr/communication/CommForms.xml"--> <field name="subject"> - <hyperlink description="${subject}" target="/partymgr/control/ViewCommunicationEvent?communicationEventId=${communicationEventId}" target-type="inter-app"/> + <hyperlink description="${subject}" target="/partymgr/control/ViewCommunicationEvent" target-type="inter-app"> + <parameter param-name="communicationEventId" from-field="communicationEventId"/> + </hyperlink> </field> </form> Modified: ofbiz/trunk/applications/order/webapp/ordermgr/requirement/RequirementForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/requirement/RequirementForms.xml?rev=759680&r1=759679&r2=759680&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/requirement/RequirementForms.xml (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/requirement/RequirementForms.xml Sun Mar 29 13:33:53 2009 @@ -290,7 +290,9 @@ <hyperlink also-hidden="true" description="${requirementId}" target="EditRequirement?requirementId=${requirementId}"/> </field> <field name="productId" widget-style="buttontext"> - <hyperlink also-hidden="true" target-type="inter-app" description="${productId}" target="/catalog/control/EditProductInventoryItems?productId=${productId}" target-window="top"/> + <hyperlink also-hidden="true" target-type="inter-app" description="${productId}" target="/catalog/control/EditProductInventoryItems" target-window="top"> + <parameter param-name="productId" from-field="productId"/> + </hyperlink> </field> <field name="internalName" entry-name="productId"> <display-entity entity-name="Product" key-field-name="productId" description="${internalName}"/> @@ -315,7 +317,9 @@ <hyperlink also-hidden="true" description="${requirementId}" target="EditRequirement?requirementId=${requirementId}"/> </field> <field name="productId" widget-style="buttontext"> - <hyperlink also-hidden="true" target-type="inter-app" description="${productId}" target="/catalog/control/EditProductInventoryItems?productId=${productId}" target-window="top"/> + <hyperlink also-hidden="true" target-type="inter-app" description="${productId}" target="/catalog/control/EditProductInventoryItems" target-window="top"> + <parameter param-name="productId" from-field="productId"/> + </hyperlink> </field> <field name="facilityId"><hidden value="${parameters.facilityId}"/></field> <field name="internalName" entry-name="productId"> Modified: ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryForms.xml?rev=759680&r1=759679&r2=759680&view=diff ============================================================================== --- ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryForms.xml (original) +++ ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryForms.xml Sun Mar 29 13:33:53 2009 @@ -143,7 +143,9 @@ <form name="LookupBulkAddProducts" type="multi" use-row-submit="true" list-name="productList" title="" target="BulkAddProducts" odd-row-style="alternate-row" default-table-style="basic-table hover-bar" paginate-target="LookupBulkAddProducts"> <field name="productId" title="${uiLabelMap.ProductProductId}" 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="brandName" title="${uiLabelMap.ProductBrandName}"><display/></field> <field name="internalName"><display/></field> @@ -163,7 +165,9 @@ <form name="LookupBulkAddSupplierProducts" type="multi" use-row-submit="true" list-name="productList" title="" target="BulkAddProducts" odd-row-style="alternate-row" default-table-style="basic-table hover-bar" paginate-target="LookupBulkAddSupplierProducts"> <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="supplierProductId"><display/></field> <field name="supplierProductName"><display/></field> Modified: ofbiz/trunk/applications/order/widget/ordermgr/ReportForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/ReportForms.xml?rev=759680&r1=759679&r2=759680&view=diff ============================================================================== --- ofbiz/trunk/applications/order/widget/ordermgr/ReportForms.xml (original) +++ ofbiz/trunk/applications/order/widget/ordermgr/ReportForms.xml Sun Mar 29 13:33:53 2009 @@ -132,7 +132,9 @@ odd-row-style="alternate-row" default-table-style="basic-table hover-bar" paginate-target="OpenOrderItemsReport"> <field name="orderDate" title="${uiLabelMap.OrderDate}"><display/></field> <field name="orderId" title="${uiLabelMap.OrderOrderId}" widget-style="buttontext"> - <hyperlink target="orderview?orderId=${orderId}" description="${orderId}"/> + <hyperlink target="orderview" description="${orderId}"> + <parameter param-name="orderId" from-field="orderId"/> + </hyperlink> </field> <field name="productId" title="${uiLabelMap.ProductProduct}"><display/></field> <field name="itemDescription" title="${uiLabelMap.CommonDescription}"><display/></field> 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=759680&r1=759679&r2=759680&view=diff ============================================================================== --- ofbiz/trunk/applications/party/webapp/partymgr/communication/CommForms.xml (original) +++ ofbiz/trunk/applications/party/webapp/partymgr/communication/CommForms.xml Sun Mar 29 13:33:53 2009 @@ -38,7 +38,7 @@ </entity-options> </drop-down> </field> - + <!-- status --> <field name="statusId" title="${uiLabelMap.CommonStatus}" position="2"> <drop-down> @@ -55,13 +55,13 @@ <field name="partyIdTo" title="${uiLabelMap.PartyPartyTo}" position="2"> <lookup target-form-name="LookupPartyName"/> </field> - + <field name="contactMechTypeId"> <drop-down> <entity-options description="${description}" entity-name="ContactMechType"/> </drop-down> </field> - + <!-- this is an example of how to display different types of contact mech to the user --> <field name="contactMechIdFrom" title="${uiLabelMap.PartyFromContactMech}"> <lookup target-form-name="LookupPreferredContactMech" target-parameter="partyIdFrom"/> @@ -69,7 +69,7 @@ <field name="contactMechIdTo" title="${uiLabelMap.PartyToContactMech}" position="2"> <lookup target-form-name="LookupPreferredContactMech" target-parameter="partyIdTo"/> </field> - + <field name="roleTypeIdFrom"> <drop-down no-current-selected-key="_NA_"> <entity-options description="${description}" entity-name="RoleType" key-field-name="roleTypeId"> @@ -77,7 +77,7 @@ </entity-options> </drop-down> </field> - + <field name="roleTypeIdTo" position="2"> <drop-down no-current-selected-key="_NA_"> <entity-options description="${description}" entity-name="RoleType" key-field-name="roleTypeId"> @@ -85,7 +85,7 @@ </entity-options> </drop-down> </field> - + <!-- contact list --> <field name="contactListId"> <lookup size="20" target-form-name="LookupContactList"> @@ -96,9 +96,9 @@ </field> <field name="datetimeStarted" title="${uiLabelMap.CommonStartDate}"><date-time/></field> <field name="datetimeEnded" title="${uiLabelMap.CommonFinishDate}" position="2"><date-time/></field> - + <field name="subject"><text size="60"/></field> - + <field name="reasonEnumId" position="2"> <drop-down no-current-selected-key="" allow-empty="true"> <entity-options entity-name="Enumeration" description="${description}" key-field-name="enumId"> @@ -106,7 +106,7 @@ <entity-order-by field-name="sequenceId"/> </entity-options> </drop-down> - </field> + </field> <field name="contentMimeTypeId"> <drop-down no-current-selected-key="text/plain" allow-empty="false"> <entity-options description="${mimeTypeId}" entity-name="MimeType" key-field-name="mimeTypeId"> @@ -114,16 +114,16 @@ </entity-options> </drop-down> </field> - + <field name="content" title="${uiLabelMap.CommonContent}"><textarea cols="60" rows="10"/></field> - + <field name="note" title="${uiLabelMap.CommonNote}"><textarea cols="60" rows="3"/></field> <field name="messageId"><display/></field> <field name="submitButton" title="${uiLabelMap.CommonSave}"><submit button-type="button"/></field> </form> <form name="EditEmail" type="single" target="createCommunicationEvent" default-map-name="communicationEvent"> <actions> - <set field="nowDate" value="${bsh:org.ofbiz.base.util.UtilDateTime.nowDateString("yyyy-MM-dd HH:mm:ss.S")}" type="String"/> + <set field="nowDate" value="${bsh:org.ofbiz.base.util.UtilDateTime.nowDateString("yyyy-MM-dd HH:mm:ss.S")}" type="String"/> <entity-condition entity-name="PartyContactWithPurpose" list="emailAddresses"> <condition-list combine="and"> <condition-expr field-name="partyId" value="${userLogin.partyId}"/> @@ -144,7 +144,7 @@ </entity-condition> </actions> <alt-target use-when="communicationEvent!=null" target="updateCommunicationEvent"/> - <field name="communicationEventId"><hidden/></field> + <field name="communicationEventId"><hidden/></field> <field name="communicationEventTypeId"><hidden value="AUTO_EMAIL_COMM"/></field> <field name="statusId"><hidden value="COM_IN_PROGRESS"/></field> <field name="parentCommEventId" use-when="parentCommEventId != null"><hidden value="${parameters.parentCommEventId}"/></field> @@ -176,7 +176,7 @@ <script location="component://party/webapp/partymgr/WEB-INF/actions/communication/recentVisitor.groovy"/> </actions> <alt-target use-when="communicationEvent!=null" target="updateCommunicationEvent"/> - <field name="communicationEventId"><hidden/></field> + <field name="communicationEventId"><hidden/></field> <field name="communicationEventTypeId"><hidden value="COMMENT_NOTE"/></field> <field name="parentCommEventId"><hidden value="${parameters.parentCommEventId}"/></field> <field name="statusId"><hidden value="COM_PENDING"/></field> @@ -198,7 +198,7 @@ <field name="createButton" use-when="communicationEvent==null"><submit/></field> <field name="dummy" position="320"><hidden/></field> </form> - + <form name="ViewEmail" type="single" default-map-name="communicationEvent"> <actions> <entity-one entity-name="ContactMech" value-field="contactMechFrom"> @@ -214,12 +214,16 @@ <field name="communicationEventTypeId"><display-entity entity-name="CommunicationEventType" description="${description}"/></field> <field name="partyIdFrom"> <display-entity entity-name="PartyNameView" key-field-name="partyId" description="${firstName} ${middleName} ${lastName} ${groupName} (${contactMechFrom.infoString})"> - <sub-hyperlink description=" [${communicationEvent.partyIdFrom}]" target="/partymgr/control/viewprofile?partyId=${communicationEvent.partyIdFrom}" target-type="inter-app"/> + <sub-hyperlink description=" [${communicationEvent.partyIdFrom}]" target="/partymgr/control/viewprofile" target-type="inter-app"> + <parameter param-name="partyId" from-field="communicationEvent.partyIdFrom"/> + </sub-hyperlink> </display-entity> </field> <field name="partyIdTo"> <display-entity entity-name="PartyNameView" key-field-name="partyId" description="${firstName} ${middleName} ${lastName} ${groupName} (${contactMechTo.infoString})"> - <sub-hyperlink description=" [${communicationEvent.partyIdTo}]" target="/partymgr/control/viewprofile?partyId=${communicationEvent.partyIdTo}" target-type="inter-app"/> + <sub-hyperlink description=" [${communicationEvent.partyIdTo}]" target="/partymgr/control/viewprofile" target-type="inter-app"> + <parameter param-name="partyId" from-field="communicationEvent.partyIdTo"/> + </sub-hyperlink> </display-entity> </field> <field name="statusId"><display-entity description="${description}" entity-name="StatusItem" key-field-name="statusId"/></field> @@ -228,12 +232,24 @@ <field name="content" title="${uiLabelMap.CommonContent}"><display/></field> <field name="note" title="${uiLabelMap.CommonNote}"><display/></field> </form> - + <form name="ViewCommEvent" type="single" default-map-name="communicationEvent" header-row-style="header-row" default-table-style="basic-table"> <field name="communicationEventId"><display/></field> - <field name="partyIdFrom" use-when=""my"==void" title="${uiLabelMap.PartyPartyFrom}"><display-entity entity-name="PartyNameView" key-field-name="partyId" description="${firstName} ${middleName} ${lastName} ${groupName}"><sub-hyperlink target="viewprofile?partyId=${partyIdFrom}" description="[${partyIdFrom}]"/></display-entity></field> - <field name="partyIdTo" use-when=""my"==void" title="${uiLabelMap.PartyPartyTo}"><display-entity entity-name="PartyNameView" key-field-name="partyId" description="${firstName} ${middleName} ${lastName} ${groupName}"><sub-hyperlink target="viewprofile?partyId=${communicationEvent.partyIdTo}" description="[${communicationEvent.partyIdTo}]"/></display-entity></field> + <field name="partyIdFrom" use-when=""my"==void" title="${uiLabelMap.PartyPartyFrom}"> + <display-entity entity-name="PartyNameView" key-field-name="partyId" description="${firstName} ${middleName} ${lastName} ${groupName}"> + <sub-hyperlink target="viewprofile" description="[${partyIdFrom}]"> + <parameter param-name="partyId" from-field="partyIdFrom"/> + </sub-hyperlink> + </display-entity> + </field> + <field name="partyIdTo" use-when=""my"==void" title="${uiLabelMap.PartyPartyTo}"> + <display-entity entity-name="PartyNameView" key-field-name="partyId" description="${firstName} ${middleName} ${lastName} ${groupName}"> + <sub-hyperlink target="viewprofile" description="[${communicationEvent.partyIdTo}]"> + <parameter param-name="partyId" from-field="communicationEvent.partyIdTo"/> + </sub-hyperlink> + </display-entity> + </field> <field name="statusId"><display-entity description="${description}" entity-name="StatusItem" key-field-name="statusId"/></field> <field name="contactMechTypeId" use-when=""my"==void"><display-entity description="${description}" entity-name="ContactMechType" key-field-name="contactMechTypeId"/></field> <field name="contactMechIdFrom" use-when=""my"==void" title="${uiLabelMap.PartyFromContactMech}"><display/></field> @@ -250,7 +266,7 @@ <field name="content" title="${uiLabelMap.CommonContent}"><textarea cols="60" rows="10" read-only="true"/></field> </form> - <form name="findCommEvents" type="single" target="FindCommunicationEvents" paginate="true" focus-field-name="submitButton" + <form name="findCommEvents" type="single" target="FindCommunicationEvents" paginate="true" focus-field-name="submitButton" header-row-style="header-row" default-table-style="basic-table"> <field name="communicationEventId" position="1"><text-find/></field> <field name="parentCommEventId" position="2"><text-find/></field> @@ -295,10 +311,10 @@ <entity-order-by field-name="sequenceId"/> </entity-options> </drop-down> - </field--> + </field--> <field map-name="subjectMap" name="subject"><text-find default-option="like"/></field> - <field name="noConditionFind"><hidden value="Y"/><!-- if this isn't there then with all fields empty no query will be done --></field> + <field name="noConditionFind"><hidden value="Y"/><!-- if this isn't there then with all fields empty no query will be done --></field> <field name="submitButton" title="${uiLabelMap.CommonFind}"><submit button-type="button"/></field> </form> @@ -317,12 +333,16 @@ <field name="communicationEventTypeId" title="${uiLabelMap.CommonType}"><display-entity description="${description}" entity-name="CommunicationEventType" key-field-name="communicationEventTypeId"/></field> <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="viewprofile?partyId=${partyIdFrom}" description="[${partyIdFrom}]"/> + <sub-hyperlink target="viewprofile" 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="viewprofile?partyId=${partyIdTo}" description="[${partyIdTo}]"/> + <sub-hyperlink target="viewprofile" description="[${partyIdTo}]"> + <parameter param-name="partyId" from-field="partyIdTo"/> + </sub-hyperlink> </display-entity> </field> <field name="statusId"><display-entity description="${description}" entity-name="StatusItem" key-field-name="statusId"/></field> @@ -336,9 +356,9 @@ <field name="partyId"><hidden/></field> <field name="communicationEventId"><hidden/></field> <field name="roleTypeId"><hidden/></field> - <field name="deleteCommEventIfLast"><hidden value="Y"/></field> + <field name="deleteCommEventIfLast"><hidden value="Y"/></field> <field name="delContentDataResource"><hidden value="Y"/></field> - <field name="roleTypeId"><display-entity entity-name="RoleType" description="${description}"/></field> + <field name="roleTypeId"><display-entity entity-name="RoleType" description="${description}"/></field> <field name="removeButton" widget-style="smallSubmit"><submit/></field> <field name="subject" widget-style="buttontext" widget-area-style="fieldWidth300"> <hyperlink description="${subject} " target="ViewCommunicationEvent"> @@ -350,7 +370,7 @@ </field> <field name="statusId" entry-name="roleStatusId" widget-style="buttontext" widget-area-style="fieldWidth300"> <display-entity entity-name="StatusItem" description="${description}"> - <sub-hyperlink target="setCommunicationEventRoleStatus" + <sub-hyperlink target="setCommunicationEventRoleStatus" description="${uiLabelMap.${toComplete}}"> <parameter param-name="communicationEventId"/> <parameter param-name="partyId"/> @@ -412,7 +432,7 @@ </actions> <field name="removeLink" title="${uiLabelMap.CommonDelete}"><submit/></field> </form> - + <form name="ListCommWorkEfforts" type="list" paginate-target="ListCommWorkEfforts" odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <actions> @@ -463,7 +483,7 @@ </field> </form> - <form name="AddEventPurpose" type="single" target="createCommunicationEventPurpose" + <form name="AddEventPurpose" type="single" target="createCommunicationEventPurpose" header-row-style="header-row" default-table-style="basic-table"> <field name="communicationEventId"><hidden/></field> <field name="partyId"><hidden/></field> @@ -500,7 +520,7 @@ <form name="ViewCommRoles" extends="ListCommRoles"> <field name="removeButton"><ignored/></field> - </form> + </form> <form name="AddEventRole" type="single" target="createCommunicationEventRole" header-row-style="header-row" default-table-style="basic-table"> @@ -517,7 +537,7 @@ </field> <field name="submitButton" title="${uiLabelMap.PartyAddRole}"><submit button-type="button"/></field> </form> - + <form name="listCommContent" type="list" list-name="contentDataResourceList" paginate-target="/ListCommContent" odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <actions> @@ -531,17 +551,19 @@ <parameter param-name="dataResourceId" from-field="dataResourceId"/> <parameter param-name="communicationEventId" from-field="communicationEventId"/> <parameter param-name="fromDate" from-field="fromDate"/> - </hyperlink> + </hyperlink> </field> <field name="contentTypeId"><display-entity entity-name="ContentType" description="${description}"/></field> <field name="fromDate"><display/></field> <!-- field name="drDataResourceName" widget-style="smallSubmit"> - <hyperlink also-hidden="false" description="${drDataResourceName} [${drDataResourceId}]" target="/content/control/EditDataResource?dataResourceId=${drDataResourceId}" target-type="inter-app"/> + <hyperlink also-hidden="false" description="${drDataResourceName} [${drDataResourceId}]" target="/content/control/EditDataResource" target-type="inter-app"> + <parameter param-name="dataResourceId" from-field="drDataResourceId"/> + </hyperlink> </field--> <field name="drMimeTypeId"><display-entity entity-name="MimeType" description="${description}" key-field-name="mimeTypeId"/></field> </form> - <form name="addCommContent" type="single" target="createCommContentDataResource" + <form name="addCommContent" type="single" target="createCommContentDataResource" header-row-style="header-row" default-table-style="basic-table"> <field name="communicationEventId"><hidden/></field> <field name="contentId"><ignored/></field> @@ -573,7 +595,7 @@ </field> <field name="submitButton" title="${uiLabelMap.CommonSubmit}"><submit button-type="button"/></field> </form> - + <form name="editCommContent" type="single" target="updateCommContentDataResource" default-map-name="commEventContentDataResource" header-row-style="header-row" default-table-style="basic-table"> <field name="communicationEventId"><display/></field> @@ -615,18 +637,18 @@ <field name="relatedDetailId" map-name="dataResource" title="Survey ID" use-when="dataResource!=null && "SURVEY".equals(dataResource.getString("dataResourceTypeId"))"> <lookup target-form-name="LookupSurvey"> - <sub-hyperlink target="EditSurvey?surveyId=${dataResource.relatedDetailId}" description="Edit Survey" link-style="smallSubmit" + <sub-hyperlink target="EditSurvey?surveyId=${dataResource.relatedDetailId}" description="Edit Survey" link-style="smallSubmit" use-when="dataResource.get("relatedDetailId")!=null"/> </lookup> </field> - <field name="relatedDetailId" map-name="dataResource" title="Survey Response ID" - use-when="dataResource!=null && "SURVEY_RESPONSE".equals(dataResource.getString("dataResourceTypeId"))"> + <field name="relatedDetailId" map-name="dataResource" title="Survey Response ID" + use-when="dataResource!=null && "SURVEY_RESPONSE".equals(dataResource.getString("dataResourceTypeId"))"> <lookup target-form-name="LookupSurveyResponse"> - <sub-hyperlink target="EditSurveyResponse?surveyResponseId=${dataResource.relatedDetailId}" + <sub-hyperlink target="EditSurveyResponse?surveyResponseId=${dataResource.relatedDetailId}" description="Edit Survey Response" link-style="smallSubmit" use-when="dataResource!=null && dataResource.get("relatedDetailId")!=null"/> </lookup> </field> - <field name="surveyResponseLink" map-name="dummy" widget-style="smallSubmit" + <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" also-hidden="false" target-window="_blank"> <parameter param-name="surveyId" from-field="templateDataResource.relatedDetailId"/> @@ -634,7 +656,7 @@ </field> --> <!-- - <field name="objectInfo" title="Current File Name" map-name="dataResource" + <field name="objectInfo" title="Current File Name" map-name="dataResource" use-when="mimeTypeId!=null && !mimeTypeId.startsWith("text")"> <display also-hidden="false"/> </field> @@ -642,7 +664,7 @@ <field name="submitButton" title="${uiLabelMap.CommonSubmit}"><submit button-type="button"/></field> </form> - + <form name="uploadCommContent" type="upload" target="uploadCommEventContent" default-map-name="commEventContentDataResource"> <field name="contentId" map-name="contentAssoc"><hidden/></field> <field name="drDataResourceId"><hidden/></field> @@ -655,7 +677,7 @@ <field name="imageData" map-name="empty"><file/></field> <field name="submitButton" title="${uiLabelMap.CommonUpload}"><submit/></field> </form> - + <form name="editCommTextContent" type="single" target="uploadCommEventContent" default-map-name="commEventContentDataResource" header-row-style="header-row" default-table-style="basic-table"> <field name="contentId" ><hidden/></field> @@ -697,7 +719,7 @@ <submit /> </field> </form> - + <form name="allocateMsgToPartyForm" type="single" target="allocateMsgToParty" title="create a new party for a unknown incoming email address"> <actions> <script location="component://party/webapp/partymgr/WEB-INF/actions/communication/getPartyEmailFromCommEventInfo.groovy"/> @@ -737,10 +759,10 @@ </form> <form name="ListRequests" extends="ListRequests" extends-resource="component://order/webapp/ordermgr/request/RequestForms.xml"> <field name="custRequestName"> - <hyperlink description="${custRequestName} [${custRequestId}]" target="/ordermgr/control/ViewRequest" target-type="inter-app"> - <parameter param-name="custRequestId" from-field="custRequestId"/> - </hyperlink> - </field> + <hyperlink description="${custRequestName} [${custRequestId}]" target="/ordermgr/control/ViewRequest" target-type="inter-app"> + <parameter param-name="custRequestId" from-field="custRequestId"/> + </hyperlink> + </field> </form> <form name="EditPartyId" extends="CommonPortletEdit" extends-resource="component://common/widget/PortletEditForms.xml"> <field name="communicationPartyId" entry-name="attributeMap.communicationPartyId"> @@ -755,11 +777,11 @@ <entity-condition entity-name="CommunicationEvent" list="commEvents"> <condition-list combine="and"> <condition-expr field-name="statusId" operator="equals" value="COM_PENDING"/> - <condition-expr field-name="partyIdFrom" operator="equals" value="${partyId}"/> + <condition-expr field-name="partyIdFrom" operator="equals" value="${partyId}"/> </condition-list> <order-by field-name="-lastUpdatedStamp"/> </entity-condition> - </actions> + </actions> <field name="subject"> <hyperlink description="${subject}" target="EditCommunicationEvent"> <parameter param-name="communicationEventId" from-field="communicationEventId"/> 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=759680&r1=759679&r2=759680&view=diff ============================================================================== --- ofbiz/trunk/applications/party/webapp/partymgr/party/PartyForms.xml (original) +++ ofbiz/trunk/applications/party/webapp/partymgr/party/PartyForms.xml Sun Mar 29 13:33:53 2009 @@ -696,7 +696,9 @@ <form name="ListSubscriptions" type="list" list-name="subscriptionList" default-table-style="basic-table"> <field name="subscriptionId"> <display-entity entity-name="Subscription" description="${description}"> - <sub-hyperlink description="[${subscriptionId}]" target="/catalog/control/EditSubscription?subscriptionId=${subscriptionId}" target-type="inter-app"/> + <sub-hyperlink description="[${subscriptionId}]" target="/catalog/control/EditSubscription" target-type="inter-app"> + <parameter param-name="subscriptionId" from-field="subscriptionId"/> + </sub-hyperlink> </display-entity> </field> <field name="subscriptionTypeId" title="${uiLabelMap.ProductSubscription} ${uiLabelMap.CommonType}"> Modified: ofbiz/trunk/applications/product/webapp/catalog/catalog/ProdCatalogForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/catalog/ProdCatalogForms.xml?rev=759680&r1=759679&r2=759680&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/catalog/catalog/ProdCatalogForms.xml (original) +++ ofbiz/trunk/applications/product/webapp/catalog/catalog/ProdCatalogForms.xml Sun Mar 29 13:33:53 2009 @@ -73,7 +73,9 @@ <!-- three possibilities for the Party: person, partyGroup, neither... just print everything and if it's empty, no biggie --> <field name="partyId" title="${uiLabelMap.PartyParty}"> <display-entity entity-name="PartyNameView" description="${personalTitle} ${firstName} ${middleName} ${lastName} ${suffix} ${groupName}" also-hidden="true" cache="false"> - <sub-hyperlink target-type="inter-app" link-style="buttontext" target="/partymgr/control/viewprofile?party_id=${partyId}" description="${partyId}"/> + <sub-hyperlink target-type="inter-app" link-style="buttontext" target="/partymgr/control/viewprofile" description="${partyId}"> + <parameter param-name="party_id" from-field="partyId"/> + </sub-hyperlink> </display-entity> </field> <field name="roleTypeId" title="${uiLabelMap.PartyRole}"><display-entity entity-name="RoleType"/></field> @@ -104,7 +106,9 @@ <field name="prodCatalogId"><hidden/></field> <field name="productStoreId" title="${uiLabelMap.ProductStoreId}"> <display-entity entity-name="ProductStore" description="${storeName}" also-hidden="true" cache="true"> - <sub-hyperlink link-style="buttontext" target="EditProductStore?productStoreId=${productStoreId}" description="${productStoreId}"/> + <sub-hyperlink link-style="buttontext" target="EditProductStore" description="${productStoreId}"> + <parameter param-name="productStoreId" from-field="productStoreId"/> + </sub-hyperlink> </display-entity> </field> <field name="fromDate" title="${uiLabelMap.CommonFromDateTime}"><display/></field> @@ -121,7 +125,9 @@ <field name="prodCatalogId"><hidden/></field> <field name="productCategoryId" title="${uiLabelMap.ProductCategoryId}"> <display-entity entity-name="ProductCategory" description="${description}" also-hidden="true" cache="true"> - <sub-hyperlink link-style="buttontext" target="EditCategory?productCategoryId=${productCategoryId}" description="${productCategoryId}"/> + <sub-hyperlink link-style="buttontext" target="EditCategory" description="${productCategoryId}"> + <parameter param-name="productCategoryId" from-field="productCategoryId"/> + </sub-hyperlink> </display-entity> </field> <field name="prodCatalogCategoryTypeId" title="${uiLabelMap.ProductCatalogCategoryType}"><display-entity entity-name="ProdCatalogCategoryType" also-hidden="true" cache="true"/></field> Modified: ofbiz/trunk/applications/product/webapp/catalog/config/ConfigForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/config/ConfigForms.xml?rev=759680&r1=759679&r2=759680&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/catalog/config/ConfigForms.xml (original) +++ ofbiz/trunk/applications/product/webapp/catalog/config/ConfigForms.xml Sun Mar 29 13:33:53 2009 @@ -33,10 +33,10 @@ <set field="typeDescription" value="${bsh: return "SINGLE".equals(configItemTypeId) ? uiLabelMap.get("ProductSingleChoice") : uiLabelMap.get("ProductMultiChoice")}"/> </row-actions> <field name="configItemId" title="${uiLabelMap.ProductConfigItem}" widget-style="buttontext"> - <hyperlink target="EditProductConfigItem" description="${configItemId}"> - <parameter param-name="configItemId" from-field="configItemId"/> - </hyperlink> - </field> + <hyperlink target="EditProductConfigItem" description="${configItemId}"> + <parameter param-name="configItemId" from-field="configItemId"/> + </hyperlink> + </field> <field name="configItemName" title="${uiLabelMap.CommonName}"><display/></field> <field name="typeDescription" title="${uiLabelMap.CommonType}"> <display description="${typeDescription}"/> @@ -199,10 +199,10 @@ </actions> <auto-fields-entity entity-name="ProductConfigAndProduct" default-field-type="hidden"/> <field name="productId" widget-style="buttontext" > - <hyperlink target="EditProductConfigs" description="${productId}"> - <parameter param-name="productId" from-field="productId"/> - </hyperlink> - </field> + <hyperlink target="EditProductConfigs" description="${productId}"> + <parameter param-name="productId" from-field="productId"/> + </hyperlink> + </field> <field name="productName" title="${uiLabelMap.ProductName}"><display description="${productName}"/></field> <field name="piecesIncluded" title="${uiLabelMap.ProductPiecesIncluded}"><display description="${piecesIncluded}"/></field> </form> Modified: ofbiz/trunk/applications/product/webapp/catalog/feature/FeatureForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/feature/FeatureForms.xml?rev=759680&r1=759679&r2=759680&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/catalog/feature/FeatureForms.xml (original) +++ ofbiz/trunk/applications/product/webapp/catalog/feature/FeatureForms.xml Sun Mar 29 13:33:53 2009 @@ -122,16 +122,22 @@ </service> </actions> <field name="productFeatureTypeId" widget-style="buttontext"> - <hyperlink target="EditFeatureType?productFeatureTypeId=${productFeatureTypeId}" description="${productFeatureTypeId}"/> + <hyperlink target="EditFeatureType" description="${productFeatureTypeId}"> + <parameter param-name="productFeatureTypeId" from-field="productFeatureTypeId"/> + </hyperlink> </field> <field name="description"><display/></field> <field name="parentTypeId"> <display-entity entity-name="ProductFeatureType" description="${description}" key-field-name="productFeatureTypeId"> - <sub-hyperlink target="EditFeatureType?productFeatureTypeId=${parentTypeId}" description="${parentTypeId}"/> + <sub-hyperlink target="EditFeatureType" description="${parentTypeId}"> + <parameter param-name="productFeatureTypeId" from-field="parentTypeId"/> + </sub-hyperlink> </display-entity> </field> <field name="removeFeatureType" title="${uiLabelMap.CommonDelete}" widget-style="buttontext"> - <hyperlink target="removeProductFeatureType?productFeatureTypeId=${productFeatureTypeId}" description="${uiLabelMap.CommonDelete}"/> + <hyperlink target="removeProductFeatureType" description="${uiLabelMap.CommonDelete}"> + <parameter param-name="productFeatureTypeId" from-field="productFeatureTypeId"/> + </hyperlink> </field> </form> <form name="EditFeatureType" type="single" target="updateProductFeatureType" title="" default-map-name="productFeatureType" @@ -169,12 +175,16 @@ <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> @@ -291,7 +301,9 @@ </service> </actions> <field name="productFeatureCategoryId" title="${uiLabelMap.CommonId}" widget-style="buttontext"> - <hyperlink target="EditFeatureCategoryFeatures?productFeatureCategoryId=${productFeatureCategoryId}" description="${productFeatureCategoryId}"/> + <hyperlink target="EditFeatureCategoryFeatures" description="${productFeatureCategoryId}"> + <parameter param-name="productFeatureCategoryId" from-field="productFeatureCategoryId"/> + </hyperlink> </field> <field name="description" title="${uiLabelMap.CommonDescription}"><display/></field> 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=759680&r1=759679&r2=759680&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/catalog/price/PriceForms.xml (original) +++ ofbiz/trunk/applications/product/webapp/catalog/price/PriceForms.xml Sun Mar 29 13:33:53 2009 @@ -40,7 +40,9 @@ <field name="fromDate" title="${uiLabelMap.CommonFromDate}"><display/></field> <field name="thruDate" title="${uiLabelMap.CommonThruDate}"><display/></field> <field name="editLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext"> - <hyperlink target="EditProductPriceRules?productPriceRuleId=${productPriceRuleId}" description="${uiLabelMap.CommonEdit}"/> + <hyperlink target="EditProductPriceRules" description="${uiLabelMap.CommonEdit}"> + <parameter param-name="productPriceRuleId" from-field="productPriceRuleId"/> + </hyperlink> </field> </form> <form name="AddPriceRules" type="single" target="createProductPriceRule"> |
Free forum by Nabble | Edit this page |