Author: jleroux
Date: Sun Mar 29 11:14:57 2009 New Revision: 759667 URL: http://svn.apache.org/viewvc?rev=759667&view=rev Log: 19th 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/invoice/InvoiceForms.xml ofbiz/trunk/applications/accounting/webapp/accounting/payment/PaymentForms.xml ofbiz/trunk/applications/accounting/widget/GlSetupForms.xml ofbiz/trunk/applications/content/widget/forum/ForumForms.xml ofbiz/trunk/applications/party/webapp/partymgr/communication/CommForms.xml ofbiz/trunk/applications/product/webapp/catalog/config/ConfigForms.xml ofbiz/trunk/applications/product/webapp/catalog/product/ProductForms.xml ofbiz/trunk/applications/workeffort/widget/WorkEffortQuoteForms.xml ofbiz/trunk/applications/workeffort/widget/WorkEffortRequestForms.xml ofbiz/trunk/specialpurpose/ebay/widget/EbayForms.xml ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml 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=759667&r1=759666&r2=759667&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/webapp/accounting/invoice/InvoiceForms.xml (original) +++ ofbiz/trunk/applications/accounting/webapp/accounting/invoice/InvoiceForms.xml Sun Mar 29 11:14:57 2009 @@ -159,7 +159,11 @@ <parameter param-name="productId" from-field="productId"/> </hyperlink> </field> - <field name="overrideGlAccountId" widget-area-style="align-text"><hyperlink target="GlAccountNavigate?glAccountId=${overrideGlAccountId}" description="${overrideGlAccountId}"/></field> + <field name="overrideGlAccountId" widget-area-style="align-text"> + <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" @@ -187,7 +191,11 @@ <field name="description"><display/></field> <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?paymentId=${paymentId}" description="${paymentId}"/></field> + <field name="paymentId" widget-style="linktext"> + <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> @@ -451,7 +459,11 @@ <form name="ListPaymentsNotApplied" type="list" list-name="payments" target="updateInvoiceApplication" title="" 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?paymentId=${paymentId}" description="[${paymentId}]"/></field> + <field name="paymentId" widget-style="buttontext"> + <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> 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=759667&r1=759666&r2=759667&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/webapp/accounting/payment/PaymentForms.xml (original) +++ ofbiz/trunk/applications/accounting/webapp/accounting/payment/PaymentForms.xml Sun Mar 29 11:14:57 2009 @@ -316,7 +316,11 @@ <form name="listInvoicesNotApplied" type="list" list-name="invoices" target="updatePaymentApplication" title="" 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?invoiceId=${invoiceId}" description="${invoiceId}"/></field> + <field name="invoiceId" widget-style="buttontext"> + <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> @@ -334,7 +338,11 @@ <form name="listPaymentsNotApplied" type="list" list-name="payments" target="updatePaymentApplication" title="" 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?paymentId=${toPaymentId}" description="[${toPaymentId}]"/></field> + <field name="toPaymentId" widget-style="buttontext"> + <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> @@ -425,15 +433,27 @@ <auto-fields-entity entity-name="PaymentApplication" default-field-type="display"/> <field name="paymentApplicationId"><hidden/></field> <field name="paymentId"><hidden/></field> - <field name="invoiceId" widget-style="buttontext"><hyperlink target="invoiceOverview?invoiceId=${invoiceId}" description="${invoiceId}"/></field> + <field name="invoiceId" widget-style="buttontext"> + <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"/> <parameter param-name="invoiceItemSeqId" from-field="invoiceItemSeqId"/> </hyperlink> </field> - <field name="toPaymentId" widget-style="buttontext"><hyperlink target="paymentOverview?paymentId=${toPaymentId}" description="${toPaymentId}"/></field> - <field name="billingAccountId" widget-style="buttontext"><hyperlink target="EditBillingAccount?billingAccountId=${billingAccountId}" description="${billingAccountId}"/></field> + <field name="toPaymentId" widget-style="buttontext"> + <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> <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> @@ -517,7 +537,11 @@ </form> <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?invoiceId=${invoiceId}" description="${invoiceId}"/></field> + <field name="invoiceId" widget-style="buttontext"> + <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/GlSetupForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/GlSetupForms.xml?rev=759667&r1=759666&r2=759667&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/widget/GlSetupForms.xml (original) +++ ofbiz/trunk/applications/accounting/widget/GlSetupForms.xml Sun Mar 29 11:14:57 2009 @@ -24,8 +24,16 @@ <form name="ListCompanies" type="list" title="Internal Organizations" list-name="parties" 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?organizationPartyId=${partyId}" description="${uiLabelMap.AccountingSetup}"/></field> - <field name="accounting" title="${uiLabelMap.CommonEmptyHeader}" use-when="hasBasicPermission" widget-style="buttontext"><hyperlink target="PartyAccountsSummary?organizationPartyId=${partyId}" description="${uiLabelMap.AccountingAccounting}"/></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> + <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> </form> <form name="ListGlAccountOrganization" list-name="listIt" target="" title="" type="list" view-size="50" Modified: ofbiz/trunk/applications/content/widget/forum/ForumForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/forum/ForumForms.xml?rev=759667&r1=759666&r2=759667&view=diff ============================================================================== --- ofbiz/trunk/applications/content/widget/forum/ForumForms.xml (original) +++ ofbiz/trunk/applications/content/widget/forum/ForumForms.xml Sun Mar 29 11:14:57 2009 @@ -22,7 +22,11 @@ xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-form.xsd"> <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?forumGroupId=${contentId}" description="${uiLabelMap.FormFieldTitle_forums}"/></field> + <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> <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/party/webapp/partymgr/communication/CommForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/communication/CommForms.xml?rev=759667&r1=759666&r2=759667&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:14:57 2009 @@ -736,7 +736,11 @@ <field name="submit" title="${uiLabelMap.CommonCreate}" widget-style="smallSubmit"><submit button-type="button"/></field> </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?custRequestId=${custRequestId}" target-type="inter-app"/></field> + <field name="custRequestName"> + <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"> 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=759667&r1=759666&r2=759667&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/catalog/config/ConfigForms.xml (original) +++ ofbiz/trunk/applications/product/webapp/catalog/config/ConfigForms.xml Sun Mar 29 11:14:57 2009 @@ -32,7 +32,11 @@ <row-actions> <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?configItemId=${configItemId}" description="${configItemId}"/></field> + <field name="configItemId" title="${uiLabelMap.ProductConfigItem}" widget-style="buttontext"> + <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}"/> @@ -194,7 +198,11 @@ </entity-condition> </actions> <auto-fields-entity entity-name="ProductConfigAndProduct" default-field-type="hidden"/> - <field name="productId" widget-style="buttontext" ><hyperlink target="EditProductConfigs?productId=${productId}" description="${productId}"/></field> + <field name="productId" widget-style="buttontext" > + <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/product/ProductForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/product/ProductForms.xml?rev=759667&r1=759666&r2=759667&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/catalog/product/ProductForms.xml (original) +++ ofbiz/trunk/applications/product/webapp/catalog/product/ProductForms.xml Sun Mar 29 11:14:57 2009 @@ -690,7 +690,11 @@ <field name="useRoleTypeId" title="${uiLabelMap.ProductUseRole}"></field> <field name="description" title="${uiLabelMap.ProductProductDescription}" map-name="content"><text size="40"/></field> <field use-when="contentId == null" name="contentId" title="${uiLabelMap.ProductContentId}" tooltip="${uiLabelMap.ProductOptional}"><text maxlength="20"/></field> - <field use-when="contentId != null" name="contentId" title="${uiLabelMap.ProductContentId}" tooltip="${uiLabelMap.ProductNotModificationRecrationProductContentAssociation}" map-name="productContentData" ><hyperlink description="${contentId} ${contentName}" target="/content/control/editContent?contentId=${contentId}" target-type="inter-app"/></field> + <field use-when="contentId != null" name="contentId" title="${uiLabelMap.ProductContentId}" tooltip="${uiLabelMap.ProductNotModificationRecrationProductContentAssociation}" map-name="productContentData" > + <hyperlink description="${contentId} ${contentName}" target="/content/control/editContent" target-type="inter-app"> + <parameter param-name="contentId" from-field="contentId"/> + </hyperlink> + </field> <field name="imageData" title="${uiLabelMap.ProductFile}"><file/></field> <field name="fileDataResourceId" map-name="downloadData"><hidden/></field> <field name="productId"><hidden/></field> @@ -1172,7 +1176,11 @@ <form name="OutstandingPurchaseOrders" type="list" list-name="purchaseOrders" odd-row-style="alternate-row" default-table-style="basic-table"> <field name="orderDate"><display/></field> - <field name="orderId"><hyperlink also-hidden="false" description="${orderId}" target="/ordermgr/control/orderview?orderId=${orderId}" target-type="inter-app"/></field> + <field name="orderId"> + <hyperlink also-hidden="false" description="${orderId}" target="/ordermgr/control/orderview" target-type="inter-app"> + <parameter param-name="orderId" from-field="orderId"/> + </hyperlink> + </field> <field name="orderItemSeqId"><display/></field> <field name="quantity"><display/></field> <field name="cancelQuantity"><display/></field> Modified: ofbiz/trunk/applications/workeffort/widget/WorkEffortQuoteForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/widget/WorkEffortQuoteForms.xml?rev=759667&r1=759666&r2=759667&view=diff ============================================================================== --- ofbiz/trunk/applications/workeffort/widget/WorkEffortQuoteForms.xml (original) +++ ofbiz/trunk/applications/workeffort/widget/WorkEffortQuoteForms.xml Sun Mar 29 11:14:57 2009 @@ -28,7 +28,11 @@ </entity-and> </actions> <field name="workEffortId"><hidden/></field> - <field name="quoteId" widget-style="buttontext"><hyperlink description="${quoteId}" target="/ordermgr/control/EditQuote?quoteId=${quoteId}" target-type="inter-app"/></field> + <field name="quoteId" widget-style="buttontext"> + <hyperlink description="${quoteId}" target="/ordermgr/control/EditQuote" target-type="inter-app"> + <parameter param-name="quoteId" from-field="quoteId"/> + </hyperlink> + </field> <field name="quoteName"><display/></field> <field name="description"><display/></field> <field name="statusItemDescription"><display/></field> @@ -55,7 +59,11 @@ </entity-and> </actions> <field name="workEffortId"><hidden/></field> - <field name="quoteId" widget-style="buttontext"><hyperlink description="${quoteId}" target="/ordermgr/control/EditQuote?quoteId=${quoteId}" target-type="inter-app"/></field> + <field name="quoteId" widget-style="buttontext"> + <hyperlink description="${quoteId}" target="/ordermgr/control/EditQuote" target-type="inter-app"> + <parameter param-name="quoteId" from-field="quoteId"/> + </hyperlink> + </field> <field name="quoteItemSeqId" widget-style="buttontext"> <hyperlink description="${quoteItemSeqId}" target="/ordermgr/control/EditQuoteItem" target-type="inter-app"> <parameter param-name="workEffortId" from-field="workEffortId"/> Modified: ofbiz/trunk/applications/workeffort/widget/WorkEffortRequestForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/widget/WorkEffortRequestForms.xml?rev=759667&r1=759666&r2=759667&view=diff ============================================================================== --- ofbiz/trunk/applications/workeffort/widget/WorkEffortRequestForms.xml (original) +++ ofbiz/trunk/applications/workeffort/widget/WorkEffortRequestForms.xml Sun Mar 29 11:14:57 2009 @@ -28,7 +28,11 @@ </entity-and> </actions> <field name="workEffortId"><hidden/></field> - <field name="custRequestId" widget-style="buttontext"><hyperlink description="${custRequestId}" target="/ordermgr/control/EditRequest?custRequestId=${custRequestId}" target-type="inter-app"/></field> + <field name="custRequestId" widget-style="buttontext"> + <hyperlink description="${custRequestId}" target="/ordermgr/control/EditRequest" target-type="inter-app"> + <parameter param-name="custRequestId" from-field="custRequestId"/> + </hyperlink> + </field> <field name="description"><display/></field> <field name="custRequestTypeDescription"><display/></field> <field name="statusItemDescription"><display/></field> @@ -56,7 +60,11 @@ </entity-and> </actions> <field name="workEffortId"><hidden/></field> - <field name="custRequestId" widget-style="buttontext"><hyperlink description="${custRequestId}" target="/ordermgr/control/EditRequest?custRequestId=${custRequestId}" target-type="inter-app"/></field> + <field name="custRequestId" widget-style="buttontext"> + <hyperlink description="${custRequestId}" target="/ordermgr/control/EditRequest" target-type="inter-app"> + <parameter param-name="custRequestId" from-field="custRequestId"/> + </hyperlink> + </field> <field name="custRequestItemSeqId" widget-style="buttontext"><display/></field> <field name="statusItemDescription"><display/></field> <field name="priority"><display/></field> Modified: ofbiz/trunk/specialpurpose/ebay/widget/EbayForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebay/widget/EbayForms.xml?rev=759667&r1=759666&r2=759667&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ebay/widget/EbayForms.xml (original) +++ ofbiz/trunk/specialpurpose/ebay/widget/EbayForms.xml Sun Mar 29 11:14:57 2009 @@ -42,7 +42,11 @@ <field name="productStoreId"><hidden/></field> <field name="externalId" title="${uiLabelMap.EbayImportEbayItem}"><display/></field> <field name="transactionId"><display/></field> - <field name="orderId"><hyperlink target="orderview?orderId=${orderId}" description="${orderId}"/></field> + <field name="orderId"> + <hyperlink target="orderview" description="${orderId}"> + <parameter param-name="orderId" from-field="orderId"/> + </hyperlink> + </field> <field name="createdDate"><display/></field> <!-- <field name="productId" use-when="!${allowProductIdChange}"><display/></field> Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml?rev=759667&r1=759666&r2=759667&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml (original) +++ ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml Sun Mar 29 11:14:57 2009 @@ -267,7 +267,11 @@ </row-actions> <field name="workEffortId"><hidden value="${workEffortId}"/></field> <field name="projectId"><hidden/></field> - <field entry-name="workEffortName" name="taskName" parameter-name="workEffortName" title="${uiLabelMap.CommonName}"><hyperlink target="taskView?workEffortId=${workEffortId}" description="${workEffortName}"/></field> + <field entry-name="workEffortName" name="taskName" parameter-name="workEffortName" title="${uiLabelMap.CommonName}"> + <hyperlink target="taskView" description="${workEffortName}"> + <parameter param-name="workEffortId" from-field="workEffortId"/> + </hyperlink> + </field> <field name="currentStatusId" title="${uiLabelMap.CommonStatus}"><display-entity entity-name="StatusItem" key-field-name="statusId" description="${description}"></display-entity></field> <field name="plannedHours" title="${uiLabelMap.ProjectMgrPlannedHours}"><display/></field> <field name="actualHours" title="${uiLabelMap.ProjectMgrActualHours}"><display/></field> @@ -354,7 +358,11 @@ <form name="ListPhaseInfo" type="list" list-name="phases" odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <field name="projectId"><hidden value="parameters.projectId"/></field> - <field name="phase"><hyperlink target="FindPhase?projectId=${projectId}" description="${phaseName}"/></field> + <field name="phase"> + <hyperlink target="FindPhase" description="${phaseName}"> + <parameter param-name="projectId" from-field="projectId"/> + </hyperlink> + </field> <field name="currentStatusId"><display-entity entity-name="StatusItem" key-field-name="statusId" description="${description}"/></field> <field name="priority"><display/></field> <field name="startDate"><display type="date"/></field> @@ -365,7 +373,11 @@ <form name="ListTaskInfo" type="list" list-name="tasks" odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <field name="projectId"><hidden value="parameters.projectId"/></field> - <field name="task"><hyperlink target="taskView?workEffortId=${workEffortId}" description="${workEffortName}"/></field> + <field name="task"> + <hyperlink target="taskView" description="${workEffortName}"> + <parameter param-name="workEffortId" from-field="workEffortId"/> + </hyperlink> + </field> <field name="phaseName"><display/></field> <field name="currentStatusId"><display-entity entity-name="StatusItem" key-field-name="statusId" description="${description}"/></field> <field name="priority"><display/></field> @@ -593,7 +605,11 @@ <hyperlink also-hidden="false" description="${workEffortName}" target="taskView?workEffortId=${workEffortId}"/> </field> <field name="phaseName" title="${uiLabelMap.ProjectMgrPhaseName}"><display description="${resultProject.phaseName}"/></field> - <field name="projectName" title="${uiLabelMap.ProjectMgrProjectName}"><hyperlink target="projectView?projectId=${resultProject.projectId}" description="${resultProject.projectName}"/></field> + <field name="projectName" title="${uiLabelMap.ProjectMgrProjectName}"> + <hyperlink target="projectView" description="${resultProject.projectName}"> + <parameter param-name="projectId" from-field="resultProject.projectId"/> + </hyperlink> + </field> <field entry-name="currentStatusId" name="currentStatusId"><display-entity entity-name="StatusItem" key-field-name="statusId" description="${description}"/></field> <field entry-name="statusId" name="Status" title="${uiLabelMap.CommonStatus}"><display-entity entity-name="StatusItem" key-field-name="statusId" description="${description}"/></field> <field name="workEffortId"><hidden value="${workEffortId}"/></field> Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml?rev=759667&r1=759666&r2=759667&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml (original) +++ ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml Sun Mar 29 11:14:57 2009 @@ -211,7 +211,11 @@ <hyperlink also-hidden="false" description="${workEffortName}" target="taskView?workEffortId=${workEffortId}"/> </field> <field name="phaseName" title="${uiLabelMap.ProjectMgrPhaseName}"><display description="${resultProject.phaseName}"/></field> - <field name="projectName" title="${uiLabelMap.ProjectMgrProjectName}"><hyperlink target="projectView?projectId=${resultProject.projectId}" description="${resultProject.projectName}"/></field> + <field name="projectName" title="${uiLabelMap.ProjectMgrProjectName}"> + <hyperlink target="projectView" description="${resultProject.projectName}"> + <parameter param-name="projectId" from-field="resultProject.projectId"/> + </hyperlink> + </field> <!--field entry-name="result.taskInfo.currentStatusId" name="currentStatusId"><display-entity entity-name="StatusItem" key-field-name="statusId" description="${description}"/></field--> <field name="priority"><display/></field> <field name="estimatedStartDate"><display type="date"/></field> @@ -301,7 +305,11 @@ <field name="workEffortAssocTypeId"><hidden/></field> <field name="fromDate"><hidden/></field> <field name="workEffortId"><hidden/></field> - <field name="workEffortIdFrom" title="${uiLabelMap.CommonName}"><hyperlink target="Dependencies?workEffortId=${workEffortIdFrom}" description="${r.taskInfo.taskName}"/></field> + <field name="workEffortIdFrom" title="${uiLabelMap.CommonName}"> + <hyperlink target="Dependencies" description="${r.taskInfo.taskName}"> + <parameter param-name="workEffortId" from-field="workEffortIdFrom"/> + </hyperlink> + </field> <field name="workEffortParentId" entry-name="r.taskInfo.workEffortParentId" title="${uiLabelMap.ProjectMgrTaskPhase}"><display-entity entity-name="WorkEffort" key-field-name="workEffortId" description="${workEffortName}"/></field> <field name="currentStatusId" entry-name="r.taskInfo.currentStatusId" title="${uiLabelMap.CommonStatus}"><display-entity entity-name="StatusItem" key-field-name="statusId" description="${description}"/></field> <field name="estimatedStartDate" entry-name="r.taskInfo.estimatedStartDate" title="${uiLabelMap.WorkEffortEstimatedStartDate}"><display type="date"/></field> @@ -321,7 +329,11 @@ <field name="workEffortAssocTypeId"><hidden/></field> <field name="fromDate"><hidden/></field> <field name="workEffortId"><hidden/></field> - <field name="workEffortIdTo" title="${uiLabelMap.CommonName}"><hyperlink target="Dependencies?workEffortId=${workEffortIdTo}" description="${r.taskInfo.taskName}"/></field> + <field name="workEffortIdTo" title="${uiLabelMap.CommonName}"> + <hyperlink target="Dependencies" description="${r.taskInfo.taskName}"> + <parameter param-name="workEffortId" from-field="workEffortIdTo"/> + </hyperlink> + </field> <field name="workEffortParentId" entry-name="r.taskInfo.workEffortParentId" title="${uiLabelMap.ProjectMgrTaskPhase}"><display-entity entity-name="WorkEffort" key-field-name="workEffortId" description="${workEffortName}"/></field> <field name="currentStatusId" entry-name="r.taskInfo.currentStatusId" title="${uiLabelMap.CommonStatus}"><display-entity entity-name="StatusItem" key-field-name="statusId" description="${description}"/></field> <field name="estimatedStartDate" entry-name="r.taskInfo.estimatedStartDate" title="${uiLabelMap.WorkEffortEstimatedStartDate}"><display type="date"/></field> @@ -407,7 +419,11 @@ <field name="maintHistSeqId"><hidden/></field> <field name="timeEntryId"><hidden/></field> <field name="workEffortId"><hidden/></field> - <field name="timesheetId"><hyperlink target="Timesheet?timesheetId=${timesheetId}" description="${timesheetId}"/></field> + <field name="timesheetId"> + <hyperlink target="Timesheet" description="${timesheetId}"> + <parameter param-name="timesheetId" from-field="timesheetId"/> + </hyperlink> + </field> <field name="partyId"> <drop-down allow-empty="false"> <entity-options entity-name="PartyRoleAndPartyDetail" description="${firstName} ${middleName} ${lastName}"> @@ -578,7 +594,11 @@ </entity-and> </actions> <field name="workEffortId"><hidden/></field> - <field name="custRequestId" widget-style="buttontext"><hyperlink description="${custRequestName} [${custRequestId}]" target="/projectmgr/control/ViewRequest?custRequestId=${custRequestId}" target-type="inter-app"/></field> + <field name="custRequestId" widget-style="buttontext"> + <hyperlink description="${custRequestName} [${custRequestId}]" target="/projectmgr/control/ViewRequest" target-type="inter-app"> + <parameter param-name="custRequestId" from-field="custRequestId"/> + </hyperlink> + </field> <field name="description"><display/></field> <field name="custRequestTypeDescription"><display/></field> <field name="statusItemDescription"><display/></field> @@ -598,7 +618,11 @@ <field name="workEffortAssocTypeId"><hidden/></field> <field name="fromDate"><hidden/></field> <field name="workEffortId"><hidden/></field> - <field name="workEffortIdFrom" title="${uiLabelMap.CommonName}"><hyperlink target="Dependencies?workEffortId=${workEffortIdFrom}" description="${result.taskInfo.taskName}"/></field> + <field name="workEffortIdFrom" title="${uiLabelMap.CommonName}"> + <hyperlink target="Dependencies" description="${result.taskInfo.taskName}"> + <parameter param-name="workEffortId" from-field="workEffortIdFrom"/> + </hyperlink> + </field> <field name="workEffortParentId" entry-name="result.taskInfo.workEffortParentId" title="${uiLabelMap.ProjectMgrTaskPhase}"><display-entity entity-name="WorkEffort" key-field-name="workEffortId" description="${workEffortName}"/></field> <field name="currentStatusId" entry-name="result.taskInfo.currentStatusId" title="${uiLabelMap.CommonStatus}"><display-entity entity-name="StatusItem" key-field-name="statusId" description="${description}"/></field> <field name="estimatedStartDate" entry-name="result.taskInfo.estimatedStartDate" title="${uiLabelMap.WorkEffortEstimatedStartDate}"><display type="date"/></field> @@ -621,7 +645,11 @@ <field name="workEffortAssocTypeId"><hidden/></field> <field name="fromDate"><hidden/></field> <field name="workEffortId"><hidden/></field> - <field name="workEffortIdTo" title="${uiLabelMap.CommonName}"><hyperlink target="Dependencies?workEffortId=${workEffortIdFrom}" description="${result.taskInfo.taskName}"/></field> + <field name="workEffortIdTo" title="${uiLabelMap.CommonName}"> + <hyperlink target="Dependencies" description="${result.taskInfo.taskName}"> + <parameter param-name="workEffortId" from-field="workEffortIdFrom"/> + </hyperlink> + </field> <field name="workEffortParentId" entry-name="result.taskInfo.workEffortParentId" title="${uiLabelMap.ProjectMgrTaskPhase}"><display-entity entity-name="WorkEffort" key-field-name="workEffortId" description="${workEffortName}"/></field> <field name="currentStatusId" entry-name="result.taskInfo.currentStatusId" title="${uiLabelMap.CommonStatus}"><display-entity entity-name="StatusItem" key-field-name="statusId" description="${description}"/></field> <field name="estimatedStartDate" entry-name="result.taskInfo.estimatedStartDate" title="${uiLabelMap.WorkEffortEstimatedStartDate}"><display type="date"/></field> |
Free forum by Nabble | Edit this page |