This is an automated email from the ASF dual-hosted git repository.
jleroux pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/ofbiz-plugins.git The following commit(s) were added to refs/heads/trunk by this push: new 78bc570 Reverted: "Improved: Hyperlink target-type attribute is deprecated and should be replaced by url-mode (OFBIZ-12091)" 78bc570 is described below commit 78bc570ac82f330b08ac33505ed957a935f43713 Author: Jacques Le Roux <[hidden email]> AuthorDate: Fri Dec 18 11:04:16 2020 +0100 Reverted: "Improved: Hyperlink target-type attribute is deprecated and should be replaced by url-mode (OFBIZ-12091)" This reverts commit 17eb2e4cf7bfba4e6a6b62117aa8d64cd5774c5e. It does not work when using <<target="javascript:........>> I could change those cases but it's easier and safer to simply revert back to target-type! Thanks: James for report --- assetmaint/widget/forms/ProductForms.xml | 6 +++--- assetmaint/widget/ismgr/FieldLookupForms.xml | 4 ++-- ebay/widget/EbayForms.xml | 2 +- ebaystore/widget/EbaySellingManagerForms.xml | 10 +++++----- example/widget/example/ExampleFeatureForms.xml | 2 +- example/widget/example/ExampleForms.xml | 2 +- example/widget/example/FormWidgetExampleForms.xml | 2 +- projectmgr/widget/forms/CustRequestForms.xml | 2 +- projectmgr/widget/forms/ProjectForms.xml | 8 ++++---- projectmgr/widget/forms/ResourceForms.xml | 2 +- projectmgr/widget/forms/TaskForms.xml | 2 +- scrum/widget/CommunicationEventForms.xml | 6 +++--- scrum/widget/FieldLookupForms.xml | 2 +- scrum/widget/OpenTestForms.xml | 2 +- scrum/widget/TaskForms.xml | 2 +- scrum/widget/scrumForms.xml | 2 +- 16 files changed, 28 insertions(+), 28 deletions(-) diff --git a/assetmaint/widget/forms/ProductForms.xml b/assetmaint/widget/forms/ProductForms.xml index 95d69b5..769c4fe 100644 --- a/assetmaint/widget/forms/ProductForms.xml +++ b/assetmaint/widget/forms/ProductForms.xml @@ -74,7 +74,7 @@ <field name="brandName" title="${uiLabelMap.ProductBrandName}"><display/></field> <field name="internalName" title="${uiLabelMap.ProductInternalName}"><display/></field> <field name="searchVariants" title="" widget-style="buttontext" use-when="isVirtual!=null&&"${isVirtual}".equals("Y")"> - <hyperlink description="${uiLabelMap.ProductVariants}" target="LookupVariantProduct" also-hidden="false" url-mode="plain"> + <hyperlink description="${uiLabelMap.ProductVariants}" target="LookupVariantProduct" also-hidden="false" target-type="plain"> <parameter param-name="productId"/> </hyperlink> </field> @@ -101,13 +101,13 @@ </service> </actions> <field name="productId" title="${uiLabelMap.CommonId}" widget-style="buttontext"> - <hyperlink description="${productId}" target="javascript:set_values('${productId}', '${internalName}')" also-hidden="false" url-mode="plain"/> + <hyperlink description="${productId}" target="javascript:set_values('${productId}', '${internalName}')" also-hidden="false" target-type="plain"/> </field> <field name="brandName" title="${uiLabelMap.ProductBrandName}"><display/></field> <field name="internalName" title="${uiLabelMap.ProductInternalName}"><display/></field> <field name="primaryProductCategoryId" title="${uiLabelMap.ProductPrimaryCategory}"><display/></field> <field name="searchVariants" title="" widget-style="buttontext" use-when="isVirtual!=null&&"${isVirtual}".equals("Y")"> - <hyperlink description="${uiLabelMap.ProductVariants}" target="LookupVariantProduct" also-hidden="false" url-mode="plain"> + <hyperlink description="${uiLabelMap.ProductVariants}" target="LookupVariantProduct" also-hidden="false" target-type="plain"> <parameter param-name="productId"/> </hyperlink> </field> diff --git a/assetmaint/widget/ismgr/FieldLookupForms.xml b/assetmaint/widget/ismgr/FieldLookupForms.xml index d83a250..899219d 100644 --- a/assetmaint/widget/ismgr/FieldLookupForms.xml +++ b/assetmaint/widget/ismgr/FieldLookupForms.xml @@ -50,7 +50,7 @@ under the License. </service> </actions> <field name="fixedAssetId" title="${uiLabelMap.AccountingFixedAssetId}" widget-style="buttontext"> - <hyperlink description="${fixedAssetId}" target="javascript:set_value('${fixedAssetId}')" also-hidden="false" url-mode="plain"/> + <hyperlink description="${fixedAssetId}" target="javascript:set_value('${fixedAssetId}')" also-hidden="false" target-type="plain"/> </field> <field name="fixedAssetName" title="${uiLabelMap.CommonName}"><display/></field> <field name="classEnumId"><display-entity entity-name="Enumeration" key-field-name="enumId"/></field> @@ -85,7 +85,7 @@ under the License. </service> </actions> <field name="fixedAssetId" title="${uiLabelMap.AccountingFixedAssetId}" widget-style="buttontext"> - <hyperlink description="${fixedAssetId}" target="javascript:set_value('${fixedAssetId}')" also-hidden="false" url-mode="plain"/> + <hyperlink description="${fixedAssetId}" target="javascript:set_value('${fixedAssetId}')" also-hidden="false" target-type="plain"/> </field> <field name="fixedAssetName" title="${uiLabelMap.CommonName}"><display/></field> <field name="classEnumId"><display-entity entity-name="Enumeration" key-field-name="enumId"/></field> diff --git a/ebay/widget/EbayForms.xml b/ebay/widget/EbayForms.xml index 666ab84..1c50606 100644 --- a/ebay/widget/EbayForms.xml +++ b/ebay/widget/EbayForms.xml @@ -113,7 +113,7 @@ under the License. <field name="externalId" title="${uiLabelMap.EbayEbayOrderIdOrTransactionId}" use-when="${isEbayOrder}" tooltip="eBay Order"><display/></field> <field name="externalId" title="${uiLabelMap.EbayEbayOrderIdOrTransactionId}" use-when="${isEbayTransaction}" tooltip="eBay Transaction"><display/></field> <field name="orderId"> - <hyperlink description="${orderId}" target="/ordermgr/control/orderview" also-hidden="false" url-mode="inter-app"> + <hyperlink description="${orderId}" target="/ordermgr/control/orderview" also-hidden="false" target-type="inter-app"> <parameter param-name="orderId"/> </hyperlink> </field> diff --git a/ebaystore/widget/EbaySellingManagerForms.xml b/ebaystore/widget/EbaySellingManagerForms.xml index d9e348b..af04e19 100644 --- a/ebaystore/widget/EbaySellingManagerForms.xml +++ b/ebaystore/widget/EbaySellingManagerForms.xml @@ -473,7 +473,7 @@ under the License. <field name="itemId"><display/></field> <field name="SKU" title="Product ID"><display/></field> <field name="title"> - <hyperlink description="${title}" target="${viewItemURL}" url-mode="plain" target-window="_BLANK"/> + <hyperlink description="${title}" target="${viewItemURL}" target-type="plain" target-window="_BLANK"/> </field> <field name="buyItNowPrice"><display/></field> <field name="reservePrice"><display/></field> @@ -483,7 +483,7 @@ under the License. <field name="quantity"><display/></field> <field name="listingType"><display/></field> <field name="EditItem"> - <hyperlink description="Edit" target="getItemProduct?productStoreId=${parameters.productStoreId}&itemId=${itemId}" url-mode="plain" target-window="_BLANK"/> + <hyperlink description="Edit" target="getItemProduct?productStoreId=${parameters.productStoreId}&itemId=${itemId}" target-type="plain" target-window="_BLANK"/> </field> </grid> <!-- Unsold Listing --> @@ -704,7 +704,7 @@ under the License. <field name="itemId" title="Item ID" sort-field="true"><display description="${itemId}"/></field> <field name="SKU" title="Product ID"><display description="${SKU}"/></field> <field name="title"> - <hyperlink description="${title}" target="${viewItemURL}" url-mode="plain" target-window="_BLANK"/> + <hyperlink description="${title}" target="${viewItemURL}" target-type="plain" target-window="_BLANK"/> </field> <field name="sellingStatus" title="Status"><display description="${sellingStatus}"/></field> <field name="endTime" title="Closing Time"><display description="${endTime}"/></field> @@ -721,7 +721,7 @@ under the License. <field name="_rowSubmit" position="1" title="${uiLabelMap.CommonSelect}"><check/></field> <field name="productStoreId"><hidden value="${productStoreId}"/></field> <field name="orderId" title="Order ID"> - <hyperlink description="${orderId}" target="https://localhost:8443/ordermgr/control/orderview?orderId=${orderId}" url-mode="plain" target-window="_BLANK"/> + <hyperlink description="${orderId}" target="https://localhost:8443/ordermgr/control/orderview?orderId=${orderId}" target-type="plain" target-window="_BLANK"/> </field> <field name="externalId" title="Transaction ID"><display description="${externalId}"/></field> <field name="ebayUserIdBuyer" title="Winner Bidder"><display description="${ebayUserIdBuyer}"/></field> @@ -762,7 +762,7 @@ under the License. <field name="productStoreId"><hidden value="${productStoreId}"/></field> <field name="_rowSubmit" position="1" title="${uiLabelMap.CommonSelect}" use-when="${groovy:String prev=(String)previousItem.get("externalId");return new Boolean(!(prev!=null&&prev.equals(externalId)));}"><check/></field> <field name="orderId" position="1" title="Order ID" use-when="${groovy:String prev=(String)previousItem.get("externalId");return new Boolean(!(prev!=null&&prev.equals(externalId)));}"> - <hyperlink description="${orderId}" target="https://localhost:8443/ordermgr/control/orderview?orderId=${orderId}" url-mode="plain" target-window="_BLANK"/> + <hyperlink description="${orderId}" target="https://localhost:8443/ordermgr/control/orderview?orderId=${orderId}" target-type="plain" target-window="_BLANK"/> </field> <field name="externalId" title="External ID" position="1" use-when="${groovy:String prev=(String)previousItem.get("externalId");return new Boolean(!(prev!=null&&prev.equals(externalId)));}"><display description="${externalId}"></display></field> <field name="ebayUserIdBuyer" title="Winning Bidder" position="1" use-when="${groovy:String prev=(String)previousItem.get("externalId");return new Boolean(!(prev!=null&&prev.equals(externalId)));}"><display description="${ebayUserIdBuyer}"></display></field> diff --git a/example/widget/example/ExampleFeatureForms.xml b/example/widget/example/ExampleFeatureForms.xml index 86ab1be..7456842 100644 --- a/example/widget/example/ExampleFeatureForms.xml +++ b/example/widget/example/ExampleFeatureForms.xml @@ -162,7 +162,7 @@ under the License. </actions> <!--<auto-fields-entity entity-name="ExampleFeature" default-field-type="display"/>--> <field name="exampleFeatureId" title="${uiLabelMap.ExampleExampleFeatureId}" widget-style="buttontext"> - <hyperlink description="${exampleFeatureId}" target="javascript:set_value('${exampleFeatureId}')" also-hidden="false" url-mode="plain"/> + <hyperlink description="${exampleFeatureId}" target="javascript:set_value('${exampleFeatureId}')" also-hidden="false" target-type="plain"/> </field> <field name="featureSourceEnumId" title="${uiLabelMap.ExampleFeatureSource}"> <display-entity entity-name="Enumeration" key-field-name="enumId" description="${description} [${enumCode}]" also-hidden="false"/> diff --git a/example/widget/example/ExampleForms.xml b/example/widget/example/ExampleForms.xml index 8b37940..0129351 100644 --- a/example/widget/example/ExampleForms.xml +++ b/example/widget/example/ExampleForms.xml @@ -46,7 +46,7 @@ under the License. </field> <field name="searchButton"><submit/></field> <field name="exportButton" position="2" widget-style="smallSubmit" title=" "> - <hyperlink also-hidden="false" url-mode="plain" description="${uiLabelMap.CommonExport}" + <hyperlink also-hidden="false" target-type="plain" description="${uiLabelMap.CommonExport}" target="javascript: document.FindExamples.action='ListExampleExport'; document.FindExamples.submit();"/> </field> </form> diff --git a/example/widget/example/FormWidgetExampleForms.xml b/example/widget/example/FormWidgetExampleForms.xml index 9702e4a..1134bc0 100644 --- a/example/widget/example/FormWidgetExampleForms.xml +++ b/example/widget/example/FormWidgetExampleForms.xml @@ -445,7 +445,7 @@ under the License. <hyperlink description="${uiLabelMap.CommonDelete}" target="FormWidgetExamples" also-hidden="false" confirmation-message="Are you sure you want to perform this action?"/> </field> <field name="targetUrlButton" title="${uiLabelMap.SignedInAuthToAnotherDomain}" widget-style="buttontext" tooltip="${uiLabelMap.SignedInAuthToAnotherDomainTooltip}"> - <hyperlink also-hidden="false" url-mode="plain" description="${uiLabelMap.TargetURL}" target="${targetUrl}"/> + <hyperlink also-hidden="false" target-type="plain" description="${uiLabelMap.TargetURL}" target="${targetUrl}"/> </field> </form> diff --git a/projectmgr/widget/forms/CustRequestForms.xml b/projectmgr/widget/forms/CustRequestForms.xml index 441dc7f..a2a73f8 100644 --- a/projectmgr/widget/forms/CustRequestForms.xml +++ b/projectmgr/widget/forms/CustRequestForms.xml @@ -23,7 +23,7 @@ under the License. <form name="ListRequests" type="list" extends="ListRequestList" extends-resource="component://order/widget/ordermgr/CustRequestForms.xml" paginate-target="requestlist" > <field name="createTaskFromRequest" title="${uiLabelMap.ProjectMgrCreateTaskFromRequest}" widget-style="buttontext"> - <hyperlink description="${uiLabelMap.ProjectMgrCreateTaskFromRequest}" target="/projectmgr/control/EditTaskFromRequest" url-mode="inter-app"> + <hyperlink description="${uiLabelMap.ProjectMgrCreateTaskFromRequest}" target="/projectmgr/control/EditTaskFromRequest" target-type="inter-app"> <parameter param-name="custRequestId"/> </hyperlink> </field> diff --git a/projectmgr/widget/forms/ProjectForms.xml b/projectmgr/widget/forms/ProjectForms.xml index 8bc1168..be6094a 100644 --- a/projectmgr/widget/forms/ProjectForms.xml +++ b/projectmgr/widget/forms/ProjectForms.xml @@ -457,7 +457,7 @@ </form> <form name="ListOrderInfo" target="EditProjectOrders?projectId=${projectId}" type="list" list-name="listOrderAssoProject" odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <field name="orderId"> - <hyperlink description="${orderId}" target="/ordermgr/control/orderview" url-mode="inter-app"> + <hyperlink description="${orderId}" target="/ordermgr/control/orderview" target-type="inter-app"> <parameter param-name="orderId"/> </hyperlink> </field> @@ -482,7 +482,7 @@ </service> </row-actions> <field name="projectName" map-name="resultProject.projectInfo" title="${uiLabelMap.ProjectMgrProjectName}" widget-style="buttontext"> - <hyperlink description="${resultProject.projectInfo.projectName}" url-mode="inter-app" target="/projectmgr/control/projectView"> + <hyperlink description="${resultProject.projectInfo.projectName}" target-type="inter-app" target="/projectmgr/control/projectView"> <parameter param-name="projectId" from-field="resultProject.projectInfo.projectId"/> </hyperlink> </field> @@ -873,14 +873,14 @@ <form name="ListContents" extends="ListWorkEffortContents" extends-resource="component://workeffort/widget/WorkEffortForms.xml" default-entity-name="WorkEffortContent"> <field name="contentId" use-when="headerItem.equals("EditProjectContents")"> <display-entity entity-name="Content" key-field-name="contentId" description="${contentName}" also-hidden="true"> - <sub-hyperlink target="EditProjectContents" description="${contentId}" link-style="buttontext" url-mode="inter-app"> + <sub-hyperlink target="EditProjectContents" description="${contentId}" link-style="buttontext" target-type="inter-app"> <auto-parameters-entity/> </sub-hyperlink> </display-entity> </field> <field name="contentId" use-when="headerItem.equals("EditTaskContents")"> <display-entity entity-name="Content" key-field-name="contentId" description="${contentName}" also-hidden="true"> - <sub-hyperlink target="EditTaskContents" description="${contentId}" link-style="buttontext" url-mode="inter-app"> + <sub-hyperlink target="EditTaskContents" description="${contentId}" link-style="buttontext" target-type="inter-app"> <auto-parameters-entity/> </sub-hyperlink> </display-entity> diff --git a/projectmgr/widget/forms/ResourceForms.xml b/projectmgr/widget/forms/ResourceForms.xml index 9bdf015..1bce5a8 100644 --- a/projectmgr/widget/forms/ResourceForms.xml +++ b/projectmgr/widget/forms/ResourceForms.xml @@ -37,7 +37,7 @@ </field> <field name="roleTypeId"><hidden/></field> <field name="emailAddress" title="${uiLabelMap.PartyEmailAddress}"> - <hyperlink description="${emailResult.emailAddress}" target="/partymgr/control/EditCommunicationEvent" url-mode="inter-app"> + <hyperlink description="${emailResult.emailAddress}" target="/partymgr/control/EditCommunicationEvent" target-type="inter-app"> <parameter param-name="partyIdFrom" from-field="userLogin.partyId"/> <parameter param-name="partyIdTo" from-field="partyId"/> <parameter param-name="communicationEventTypeId" value="EMAIL_COMMUNICATION"/> diff --git a/projectmgr/widget/forms/TaskForms.xml b/projectmgr/widget/forms/TaskForms.xml index b7d4c14..b5f457d 100644 --- a/projectmgr/widget/forms/TaskForms.xml +++ b/projectmgr/widget/forms/TaskForms.xml @@ -633,7 +633,7 @@ </actions> <field name="workEffortId"><hidden/></field> <field name="custRequestId" widget-style="buttontext"> - <hyperlink description="${custRequestName} [${custRequestId}]" target="/projectmgr/control/ViewRequest" url-mode="inter-app"> + <hyperlink description="${custRequestName} [${custRequestId}]" target="/projectmgr/control/ViewRequest" target-type="inter-app"> <parameter param-name="custRequestId"/> </hyperlink> </field> diff --git a/scrum/widget/CommunicationEventForms.xml b/scrum/widget/CommunicationEventForms.xml index e6cd020..d120b5f 100644 --- a/scrum/widget/CommunicationEventForms.xml +++ b/scrum/widget/CommunicationEventForms.xml @@ -105,7 +105,7 @@ under the License. <field name="uploadedFile" title="${uiLabelMap.ContentFile}"><file/></field> <field name="send" title=" " widget-style="buttontext"> <hyperlink also-hidden="true" - url-mode="plain" description="${uiLabelMap.CommonUpload}" + target-type="plain" description="${uiLabelMap.CommonUpload}" target="javascript: (document.uploadContent.datetimeStarted.value=document.EditEmail.datetimeStarted.value), (document.uploadContent.partyId.value=document.EditEmail.partyIdFrom.value), @@ -181,7 +181,7 @@ under the License. <field name="subject" tooltip="Do not remove the "PD#${product.productId}" number"><text size="74" maxlength="255" default-value="PD#${product.productId} - ${product.internalName}"/></field> <field name="send" title=" " position="1" widget-style="buttontext" use-when=""${communicationEvent.statusId}"!="COM_COMPLETE"&&"${communicationEvent.statusId}"!="COM_IN_PROGRESS""> - <hyperlink description="${uiLabelMap.CommonSend}" target="javascript:(document.EditEmailForProduct.form.value='list'),(document.EditEmailForProduct.statusId.value='COM_IN_PROGRESS'),(document.EditEmailForProduct.submit())" also-hidden="false" url-mode="plain"/> + <hyperlink description="${uiLabelMap.CommonSend}" target="javascript:(document.EditEmailForProduct.form.value='list'),(document.EditEmailForProduct.statusId.value='COM_IN_PROGRESS'),(document.EditEmailForProduct.submit())" also-hidden="false" target-type="plain"/> </field> </form> <form name="ViewEmailForProduct" type="single" extends="EditEmail" target="${target}" default-map-name="communicationEvent" id="updateEmailForProduct"> @@ -207,7 +207,7 @@ under the License. <field name="partyId"><hidden value="${userLogin.partyId}"/> </field> <field name="send" title=" " widget-style="buttontext"> <hyperlink also-hidden="true" - url-mode="plain" description="${uiLabelMap.CommonUpload}" + target-type="plain" description="${uiLabelMap.CommonUpload}" target="javascript: (document.UploadContentForProduct.datetimeStarted.value=document.EditEmailForProduct.datetimeStarted.value), (document.UploadContentForProduct.partyIdTo.value=document.EditEmailForProduct.partyIdTo.value), diff --git a/scrum/widget/FieldLookupForms.xml b/scrum/widget/FieldLookupForms.xml index 11227c5..9039fa8 100644 --- a/scrum/widget/FieldLookupForms.xml +++ b/scrum/widget/FieldLookupForms.xml @@ -49,7 +49,7 @@ under the License. </service> </actions> <field name="custRequestId" widget-style="buttontext" title="Product Backlog Item Id"> - <hyperlink description="${custRequestId}" target="javascript:set_value('${custRequestId}')" also-hidden="false" url-mode="plain"/> + <hyperlink description="${custRequestId}" target="javascript:set_value('${custRequestId}')" also-hidden="false" target-type="plain"/> </field> <field name="description" title="Product Backlog Item"><display/></field> <field name="parentCustRequestId" title="Parent Product Backlog Item"><display/></field> diff --git a/scrum/widget/OpenTestForms.xml b/scrum/widget/OpenTestForms.xml index d8984b3..4c3230f 100644 --- a/scrum/widget/OpenTestForms.xml +++ b/scrum/widget/OpenTestForms.xml @@ -220,7 +220,7 @@ </actions> <field name="contentId"> <display-entity entity-name="Content" key-field-name="contentId" description="${contentName}" also-hidden="true"> - <sub-hyperlink target="/content/control/ViewSimpleContent" description="[${contentId}]" link-style="buttontext" url-mode="inter-app"> + <sub-hyperlink target="/content/control/ViewSimpleContent" description="[${contentId}]" link-style="buttontext" target-type="inter-app"> <parameter param-name="contentId"/> </sub-hyperlink> </display-entity> diff --git a/scrum/widget/TaskForms.xml b/scrum/widget/TaskForms.xml index e7066f4..929d539 100644 --- a/scrum/widget/TaskForms.xml +++ b/scrum/widget/TaskForms.xml @@ -832,7 +832,7 @@ <property-to-field resource="revision" property="revision.url" field="url"/> </row-actions> <field name="contentName" title="${uiLabelMap.ScrumRevision}" widget-style="buttontext"> - <hyperlink description="${contentName}" target="RevisionInfo?repository=${url}${drObjectInfo}" link-type="anchor" target-window="_BLANK" url-mode="plain"/> + <hyperlink description="${contentName}" target="RevisionInfo?repository=${url}${drObjectInfo}" link-type="anchor" target-window="_BLANK" target-type="plain"/> </field> <field name="description" title="${uiLabelMap.CommonMessage}"><display description="${groovy:description.toString().substring(0,Math.min(description.toString().length(),100))}"/></field> <field name="partyId" title="${uiLabelMap.ScrumCommitter}"> diff --git a/scrum/widget/scrumForms.xml b/scrum/widget/scrumForms.xml index ee14222..e49f733 100644 --- a/scrum/widget/scrumForms.xml +++ b/scrum/widget/scrumForms.xml @@ -2764,7 +2764,7 @@ under the License. <set field="taskName" from-field="resultTask.workEffortName"/> </row-actions> <field name="taskId" title="${uiLabelMap.ScrumTask}" parameter-name="workEffortId"> - <hyperlink description="${taskName} [${taskId}]" target="taskView" link-type="hidden-form" target-window="_BLANK" url-mode="intra-app"> + <hyperlink description="${taskName} [${taskId}]" target="taskView" link-type="hidden-form" target-window="_BLANK" target-type="intra-app"> <parameter param-name="taskId" from-field="taskId"/> </hyperlink> </field> |
Free forum by Nabble | Edit this page |