Modified: ofbiz/trunk/framework/webtools/widget/ArtifactInfoForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/widget/ArtifactInfoForms.xml?rev=1768219&r1=1768218&r2=1768219&view=diff ============================================================================== --- ofbiz/trunk/framework/webtools/widget/ArtifactInfoForms.xml (original) +++ ofbiz/trunk/framework/webtools/widget/ArtifactInfoForms.xml Sat Nov 5 14:14:04 2016 @@ -23,7 +23,7 @@ <form name="ComponentList" type="list" separate-columns="true" title="Component List" list-name="componentList" target="" odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar"> <field name="compName"> - <hyperlink target="TestSuiteInfo?compName=${compName}" description="${compName}" ></hyperlink> + <hyperlink description="${compName}" target="TestSuiteInfo?compName=${compName}" ></hyperlink> </field> <field name="rootLocation"><display/></field> <field name="enabled"><display/></field> @@ -37,11 +37,11 @@ <field name="compName"><hidden value="${parameters.compName}"/></field> <field name="suiteName"><display/></field> <field name="runSuite" use-when="suiteName!=void"> - <hyperlink target="RunTest?compName=${parameters.compName}&suiteName=${suiteNameSave}" description="run suite"/> + <hyperlink description="run suite" target="RunTest?compName=${parameters.compName}&suiteName=${suiteNameSave}"/> </field> <field name="caseName"><display/></field> <field name="runCase"> - <hyperlink target="RunTest?compName=${parameters.compName}&suiteName=${suiteNameSave}&caseName=${caseName}" description="run case"/> + <hyperlink description="run case" target="RunTest?compName=${parameters.compName}&suiteName=${suiteNameSave}&caseName=${caseName}"/> </field> </form> </forms>
Modified: ofbiz/trunk/framework/webtools/widget/EntitySyncForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/widget/EntitySyncForms.xml?rev=1768219&r1=1768218&r2=1768219&view=diff ============================================================================== --- ofbiz/trunk/framework/webtools/widget/EntitySyncForms.xml (original) +++ ofbiz/trunk/framework/webtools/widget/EntitySyncForms.xml Sat Nov 5 14:14:04 2016 @@ -36,23 +36,23 @@ under the License. </field> <field use-when=""ESR_RUNNING".equals(runStatusId)" name="resetStatus" title=" " widget-style="smallSubmit"> - <hyperlink also-hidden="false" description="${uiLabelMap.WebtoolsSyncResetRunStatus}" target="resetEntitySyncStatusToNotStarted"> + <hyperlink description="${uiLabelMap.WebtoolsSyncResetRunStatus}" target="resetEntitySyncStatusToNotStarted" also-hidden="false"> <parameter param-name="entitySyncId"/> </hyperlink> </field> <field use-when=""ESR_NOT_STARTED".equals(runStatusId) || "ESR_COMPLETE".equals(runStatusId)" name="runOfflineSync" title=" " widget-style="smallSubmit"> - <hyperlink also-hidden="false" description="${uiLabelMap.WebtoolsSyncRunOffline}" target="runOfflineEntitySync"> + <hyperlink description="${uiLabelMap.WebtoolsSyncRunOffline}" target="runOfflineEntitySync" also-hidden="false"> <parameter param-name="entitySyncId"/> </hyperlink> </field> <field use-when=""ESR_PENDING".equals(runStatusId)" name="acceptOffline" title=" " widget-style="smallSubmit"> - <hyperlink also-hidden="false" description="${uiLabelMap.WebtoolsSyncAcceptOffline}" target="updateOfflineEntitySync"> + <hyperlink description="${uiLabelMap.WebtoolsSyncAcceptOffline}" target="updateOfflineEntitySync" also-hidden="false"> <parameter param-name="entitySyncId"/> <parameter param-name="updateType" value="ACCEPT"/> </hyperlink> </field> <field use-when=""ESR_PENDING".equals(runStatusId)" name="rejectOffline" title=" " widget-style="smallSubmit"> - <hyperlink also-hidden="false" description="${uiLabelMap.WebtoolsSyncRejectOffline}" target="updateOfflineEntitySync"> + <hyperlink description="${uiLabelMap.WebtoolsSyncRejectOffline}" target="updateOfflineEntitySync" also-hidden="false"> <parameter param-name="entitySyncId"/> <parameter param-name="updateType" value="REJECT"/> </hyperlink> Modified: ofbiz/trunk/framework/webtools/widget/GeoManagementForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/widget/GeoManagementForms.xml?rev=1768219&r1=1768218&r2=1768219&view=diff ============================================================================== --- ofbiz/trunk/framework/webtools/widget/GeoManagementForms.xml (original) +++ ofbiz/trunk/framework/webtools/widget/GeoManagementForms.xml Sat Nov 5 14:14:04 2016 @@ -60,7 +60,7 @@ </field> <field name="wellKnownText" title="${uiLabelMap.CommonGeoWellKnownText}"><display/></field> <field name="deleteLink" title=" " widget-style="buttontext"> - <hyperlink target="deleteGeo" description="${uiLabelMap.CommonRemove}"> + <hyperlink description="${uiLabelMap.CommonRemove}" target="deleteGeo"> <parameter param-name="geoId"/> <parameter param-name="noConditionFind" value="Y"/> </hyperlink> @@ -113,7 +113,7 @@ </form> <form name="ListLookupGeo" extends="ListGeos"> <field name="geoId" title="${uiLabelMap.CommonGeoId}" widget-style="buttontext"> - <hyperlink also-hidden="false" target-type="plain" description="${geoId}" target="javascript:set_value('${geoId}')"/> + <hyperlink description="${geoId}" target="javascript:set_value('${geoId}')" also-hidden="false" target-type="plain"/> </field> <field name="deleteLink"><ignored/></field> </form> Modified: ofbiz/trunk/framework/webtools/widget/GeoManagementScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/widget/GeoManagementScreens.xml?rev=1768219&r1=1768218&r2=1768219&view=diff ============================================================================== --- ofbiz/trunk/framework/webtools/widget/GeoManagementScreens.xml (original) +++ ofbiz/trunk/framework/webtools/widget/GeoManagementScreens.xml Sat Nov 5 14:14:04 2016 @@ -53,7 +53,7 @@ <set field="currentUrl" value="geoPoints"/> <set field="headerItem" value="Geos"/> <set field="tabButtonItem" value="GeoPoints"/> - <entity-one value-field="geoPoint" entity-name="GeoPoint"/> + <entity-one entity-name="GeoPoint" value-field="geoPoint"/> <script location="component://webtools/groovyScripts/geo/GetGeoLocation.groovy"/> </actions> <widgets> Modified: ofbiz/trunk/framework/webtools/widget/MiscForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/widget/MiscForms.xml?rev=1768219&r1=1768218&r2=1768219&view=diff ============================================================================== --- ofbiz/trunk/framework/webtools/widget/MiscForms.xml (original) +++ ofbiz/trunk/framework/webtools/widget/MiscForms.xml Sat Nov 5 14:14:04 2016 @@ -49,7 +49,7 @@ under the License. </field> <field name="submitButton" title="${uiLabelMap.CommonSave}"><submit button-type="button"/></field> <field name="cancelButton" title=" " widget-style="smallSubmit"> - <hyperlink target="${demoTargetUrl}" description="${uiLabelMap.CommonCancel}"></hyperlink> + <hyperlink description="${uiLabelMap.CommonCancel}" target="${demoTargetUrl}"></hyperlink> </field> </form> Modified: ofbiz/trunk/framework/webtools/widget/ServiceForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/widget/ServiceForms.xml?rev=1768219&r1=1768218&r2=1768219&view=diff ============================================================================== --- ofbiz/trunk/framework/webtools/widget/ServiceForms.xml (original) +++ ofbiz/trunk/framework/webtools/widget/ServiceForms.xml Sat Nov 5 14:14:04 2016 @@ -86,7 +86,7 @@ under the License. </actions> <field name="jobName" title="${uiLabelMap.WebtoolsJob}" sort-field="true"><display/></field> <field name="jobId" title="${uiLabelMap.CommonId}" sort-field="true"> - <hyperlink also-hidden="false" description="${jobId}" target="JobDetails"> + <hyperlink description="${jobId}" target="JobDetails" also-hidden="false"> <parameter param-name="jobId" from-field="jobId"/> </hyperlink> </field> @@ -94,14 +94,14 @@ under the License. <field name="runTime" title="${uiLabelMap.WebtoolsRunTime}" sort-field="true"><display/></field> <field name="startDateTime" title="${uiLabelMap.CommonStartDateTime}" sort-field="true"><display/></field> <field name="serviceName" title="${uiLabelMap.WebtoolsService}" sort-field="true"> - <hyperlink also-hidden="false" description="${serviceName}" target="ServiceList"> + <hyperlink description="${serviceName}" target="ServiceList" also-hidden="false"> <parameter param-name="sel_service_name" from-field="serviceName"/> </hyperlink> </field> <field name="statusId" title="${uiLabelMap.CommonStatus}" sort-field="true"><display-entity entity-name="StatusItem"/></field> <field name="finishDateTime" title="${uiLabelMap.CommonEndDateTime}" sort-field="true"><display/></field> <field name="cancelButton" title=" " use-when="startDateTime==null&&finishDateTime==null&&cancelDateTime==null" widget-style="buttontext"> - <hyperlink also-hidden="false" description="${uiLabelMap.WebtoolsCancelJob}" target="cancelJob"> + <hyperlink description="${uiLabelMap.WebtoolsCancelJob}" target="cancelJob" also-hidden="false"> <parameter param-name="jobId"/> </hyperlink> </field> @@ -179,7 +179,7 @@ under the License. <field name="reasonEnumId" sort-field="true" title="${uiLabelMap.CommonReason}"><display-entity entity-name="Enumeration" key-field-name="enumId" description="[${enumCode}] ${description}"/></field> <field name="comments"><display/></field> <field name="cancelButton" title=" " use-when="editable && cancelable" widget-style="buttontext"> - <hyperlink also-hidden="false" description="${uiLabelMap.CommonCancel}" target="updateJobManagerLock"> + <hyperlink description="${uiLabelMap.CommonCancel}" target="updateJobManagerLock" also-hidden="false"> <parameter param-name="instanceId"/> <parameter param-name="fromDate"/> <parameter param-name="thruDate" value="${nowTimestamp}"/> @@ -219,7 +219,7 @@ under the License. <field name="createdByUserLogin" title="${uiLabelMap.CommonBy}"><display/></field> <field name="reasonEnumId" title="${uiLabelMap.CommonReason}"><display-entity entity-name="Enumeration" key-field-name="enumId" description="[${enumCode}] ${description}"/></field> <field name="cancelButton" title=" " use-when="editable && cancelable" widget-style="buttontext"> - <hyperlink also-hidden="false" description="${uiLabelMap.CommonCancel}" target="updateJobManagerLock"> + <hyperlink description="${uiLabelMap.CommonCancel}" target="updateJobManagerLock" also-hidden="false"> <parameter param-name="instanceId"/> <parameter param-name="fromDate"/> <parameter param-name="thruDate" value="${nowTimestamp}"/> Modified: ofbiz/trunk/framework/webtools/widget/ServiceScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/widget/ServiceScreens.xml?rev=1768219&r1=1768218&r2=1768219&view=diff ============================================================================== --- ofbiz/trunk/framework/webtools/widget/ServiceScreens.xml (original) +++ ofbiz/trunk/framework/webtools/widget/ServiceScreens.xml Sat Nov 5 14:14:04 2016 @@ -271,10 +271,10 @@ under the License. <screen name="JobManagerLockEnable"> <section> <actions> - <entity-condition list="currentJobManagerLocks" entity-name="JobManagerLock" filter-by-date="true"> + <entity-condition entity-name="JobManagerLock" list="currentJobManagerLocks" filter-by-date="true"> <order-by field-name="fromDate"/> </entity-condition> - <entity-condition list="nextJobManagerLocks" entity-name="JobManagerLock" filter-by-date="false"> + <entity-condition entity-name="JobManagerLock" list="nextJobManagerLocks" filter-by-date="false"> <condition-list> <condition-expr field-name="fromDate" operator="greater" from-field="nowTimestamp"/> <condition-list combine="or"> Modified: ofbiz/trunk/framework/webtools/widget/TempExprScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/widget/TempExprScreens.xml?rev=1768219&r1=1768218&r2=1768219&view=diff ============================================================================== --- ofbiz/trunk/framework/webtools/widget/TempExprScreens.xml (original) +++ ofbiz/trunk/framework/webtools/widget/TempExprScreens.xml Sat Nov 5 14:14:04 2016 @@ -88,9 +88,9 @@ under the License. <actions> <set field="tabMenuItem" value="editExpression"/> <set field="titleProperty" value="${titleProperty}" default-value="TemporalExpressionMaintenance"/> - <entity-one value-field="temporalExpression" entity-name="TemporalExpression"/> + <entity-one entity-name="TemporalExpression" value-field="temporalExpression"/> <set field="fromTempExprId" from-field="parameters.tempExprId"/> - <entity-condition list="childExpressionList" entity-name="TemporalExpressionChild"> + <entity-condition entity-name="TemporalExpressionChild" list="childExpressionList"> <condition-expr field-name="fromTempExprId" from-field="fromTempExprId"/> </entity-condition> </actions> Modified: ofbiz/trunk/framework/webtools/widget/tempExprForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/widget/tempExprForms.xml?rev=1768219&r1=1768218&r2=1768219&view=diff ============================================================================== --- ofbiz/trunk/framework/webtools/widget/tempExprForms.xml (original) +++ ofbiz/trunk/framework/webtools/widget/tempExprForms.xml Sat Nov 5 14:14:04 2016 @@ -40,7 +40,7 @@ under the License. <form name="BasicExpressionList" type="list" default-table-style="basic-table hover-bar" odd-row-style="alternate-row" header-row-style="header-row-2"> <field name="tempExprId" title="${uiLabelMap.TemporalExpressionId}" sort-field="true"> - <hyperlink also-hidden="false" target-type="plain" description="${tempExprId}" target="editTemporalExpression"> + <hyperlink description="${tempExprId}" target="editTemporalExpression" also-hidden="false" target-type="plain"> <parameter param-name="tempExprId"/> </hyperlink> </field> @@ -70,7 +70,7 @@ under the License. <form name="ListChildExpressions" extends="BasicExpressionList" list-name="childExpressionList" paginate-target="editTemporalExpression?tempExprId=${tempExprId}"> <field name="exprAssocType"><display/></field> <field name="deleteButton" title=" " widget-style="buttontext"> - <hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="deleteTemporalExpressionAssoc"> + <hyperlink description="${uiLabelMap.CommonDelete}" target="deleteTemporalExpressionAssoc" also-hidden="false"> <parameter param-name="tempExprId" from-field="parameters.tempExprId"/> <parameter param-name="fromTempExprId"/> <parameter param-name="toTempExprId" from-field="tempExprId"/> Modified: ofbiz/trunk/specialpurpose/assetmaint/minilang/FixedAssetMaintServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/assetmaint/minilang/FixedAssetMaintServices.xml?rev=1768219&r1=1768218&r2=1768219&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/assetmaint/minilang/FixedAssetMaintServices.xml (original) +++ ofbiz/trunk/specialpurpose/assetmaint/minilang/FixedAssetMaintServices.xml Sat Nov 5 14:14:04 2016 @@ -48,7 +48,7 @@ <set-service-fields map="parameters" service-name="updateWorkEffort" to-map="updateWorkEffortCtx"/> <set from-field="parameters.scheduleWorkEffortId" field="updateWorkEffortCtx.workEffortId"/> <set from-field="parameters.scheduleWorkEffortId" field="workEffortId"/> - <entity-one value-field="workEffort" entity-name="WorkEffort"/> + <entity-one entity-name="WorkEffort" value-field="workEffort"/> <set field="updateWorkEffortCtx.actualCompletionDate" from-field="parameters.actualCompletionDate" default-value="${workEffort.actualCompletionDate}"/> <call-service service-name="updateWorkEffort" in-map-name="updateWorkEffortCtx"/> </simple-method> Modified: ofbiz/trunk/specialpurpose/assetmaint/widget/AssetmaintScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/assetmaint/widget/AssetmaintScreens.xml?rev=1768219&r1=1768218&r2=1768219&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/assetmaint/widget/AssetmaintScreens.xml (original) +++ ofbiz/trunk/specialpurpose/assetmaint/widget/AssetmaintScreens.xml Sat Nov 5 14:14:04 2016 @@ -288,7 +288,7 @@ <set field="maintHistSeqId" from-field="parameters.maintHistSeqId"/> <entity-one entity-name="FixedAsset" value-field="fixedAsset"/> <entity-one entity-name="FixedAssetMaint" value-field="fixedAssetMaint"/> - <entity-condition list="itemIssuanceList" entity-name="ProductInventoryItemAndItemIssuance"> + <entity-condition entity-name="ProductInventoryItemAndItemIssuance" list="itemIssuanceList"> <condition-expr field-name="quantity" operator="greater" value="0"/> </entity-condition> </actions> @@ -321,11 +321,11 @@ <entity-one entity-name="FixedAsset" value-field="fixedAsset"/> <set field="layoutSettings.documentTitle" from-field="uiLabelMap.AccountingFixedAssetMaintWorkEffortName"/> <entity-one entity-name="FixedAssetMaint" value-field="fixedAssetMaint"/> - <entity-condition list="itemIssuanceList" entity-name="ProductInventoryItemAndItemIssuance"> + <entity-condition entity-name="ProductInventoryItemAndItemIssuance" list="itemIssuanceList"> <condition-expr field-name="quantity" operator="greater" value="0"/> </entity-condition> <set field="workEffortId" from-field="fixedAssetMaint.scheduleWorkEffortId"/> - <entity-condition list="notes" entity-name="WorkEffortNoteAndData"> + <entity-condition entity-name="WorkEffortNoteAndData" list="notes"> <condition-expr field-name="workEffortId" from-field="workEffortId"/> <order-by field-name="noteId"/> </entity-condition> Modified: ofbiz/trunk/specialpurpose/assetmaint/widget/forms/FixedAssetForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/assetmaint/widget/forms/FixedAssetForms.xml?rev=1768219&r1=1768218&r2=1768219&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/assetmaint/widget/forms/FixedAssetForms.xml (original) +++ ofbiz/trunk/specialpurpose/assetmaint/widget/forms/FixedAssetForms.xml Sat Nov 5 14:14:04 2016 @@ -75,7 +75,7 @@ </service> </actions> <field name="maintHistSeqId" widget-style="linktext"> - <hyperlink also-hidden="false" description="${maintHistSeqId}" target="EditFixedAssetMaint"> + <hyperlink description="${maintHistSeqId}" target="EditFixedAssetMaint" also-hidden="false"> <parameter param-name="fixedAssetId"/> <parameter param-name="maintHistSeqId"/> </hyperlink> Modified: ofbiz/trunk/specialpurpose/assetmaint/widget/forms/ProductForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/assetmaint/widget/forms/ProductForms.xml?rev=1768219&r1=1768218&r2=1768219&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/assetmaint/widget/forms/ProductForms.xml (original) +++ ofbiz/trunk/specialpurpose/assetmaint/widget/forms/ProductForms.xml Sat Nov 5 14:14:04 2016 @@ -68,14 +68,14 @@ </service> </actions> <field name="productId" title="${uiLabelMap.CommonId}" widget-style="buttontext"> - <hyperlink also-hidden="false" description="${productId}" target="EditProduct"> + <hyperlink description="${productId}" target="EditProduct" also-hidden="false"> <parameter param-name="productId"/> </hyperlink> </field> <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 also-hidden="false" target-type="plain" description="${uiLabelMap.ProductVariants}" target="LookupVariantProduct"> + <hyperlink description="${uiLabelMap.ProductVariants}" target="LookupVariantProduct" also-hidden="false" target-type="plain"> <parameter param-name="productId"/> </hyperlink> </field> @@ -102,13 +102,13 @@ </service> </actions> <field name="productId" title="${uiLabelMap.CommonId}" widget-style="buttontext"> - <hyperlink also-hidden="false" target-type="plain" description="${productId}" target="javascript:set_values('${productId}', '${internalName}')"/> + <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 also-hidden="false" target-type="plain" description="${uiLabelMap.ProductVariants}" target="LookupVariantProduct"> + <hyperlink description="${uiLabelMap.ProductVariants}" target="LookupVariantProduct" also-hidden="false" target-type="plain"> <parameter param-name="productId"/> </hyperlink> </field> @@ -143,7 +143,7 @@ <field name="maintTemplateWorkEffortId"><lookup target-form-name="LookupWorkEffort"/></field> <field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field> <field name="deleteLink" title="${uiLabelMap.CommonDelete}" widget-style="buttontext"> - <hyperlink target="deleteProductMaint" description="${uiLabelMap.CommonDelete}" also-hidden="false"> + <hyperlink description="${uiLabelMap.CommonDelete}" target="deleteProductMaint" also-hidden="false"> <parameter param-name="fixedAssetId" from-field="parameters.fixedAssetId"/> <parameter param-name="productId"/> <parameter param-name="productMaintSeqId"/> Modified: ofbiz/trunk/specialpurpose/assetmaint/widget/forms/WorkEffortForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/assetmaint/widget/forms/WorkEffortForms.xml?rev=1768219&r1=1768218&r2=1768219&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/assetmaint/widget/forms/WorkEffortForms.xml (original) +++ ofbiz/trunk/specialpurpose/assetmaint/widget/forms/WorkEffortForms.xml Sat Nov 5 14:14:04 2016 @@ -163,7 +163,7 @@ </entity-condition> </actions> <field name="workEffortName" entry-name="workEffortToName" title="${uiLabelMap.CommonName}"> - <hyperlink also-hidden="false" description="${workEffortToName}" target="EditWorkEfforts"> + <hyperlink description="${workEffortToName}" target="EditWorkEfforts" also-hidden="false"> <parameter param-name="workEffortId" from-field="workEffortIdTo"/> <parameter param-name="workEffortIdFrom" from-field="workEffortId"/> <parameter param-name="fromDate"/> Modified: ofbiz/trunk/specialpurpose/assetmaint/widget/ismgr/FieldLookupForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/assetmaint/widget/ismgr/FieldLookupForms.xml?rev=1768219&r1=1768218&r2=1768219&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/assetmaint/widget/ismgr/FieldLookupForms.xml (original) +++ ofbiz/trunk/specialpurpose/assetmaint/widget/ismgr/FieldLookupForms.xml Sat Nov 5 14:14:04 2016 @@ -50,7 +50,7 @@ under the License. </service> </actions> <field name="fixedAssetId" title="${uiLabelMap.AccountingFixedAssetId}" widget-style="buttontext"> - <hyperlink also-hidden="false" target-type="plain" description="${fixedAssetId}" target="javascript:set_value('${fixedAssetId}')"/> + <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 also-hidden="false" target-type="plain" description="${fixedAssetId}" target="javascript:set_value('${fixedAssetId}')"/> + <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> Modified: ofbiz/trunk/specialpurpose/assetmaint/widget/ismgr/FixedAssetForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/assetmaint/widget/ismgr/FixedAssetForms.xml?rev=1768219&r1=1768218&r2=1768219&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/assetmaint/widget/ismgr/FixedAssetForms.xml (original) +++ ofbiz/trunk/specialpurpose/assetmaint/widget/ismgr/FixedAssetForms.xml Sat Nov 5 14:14:04 2016 @@ -119,7 +119,7 @@ under the License. </service> </actions> <field name="fixedAssetId" widget-style="linktext"> - <hyperlink also-hidden="false" description="${fixedAssetName} ${fixedAssetId}" target="EditComputerHardware"> + <hyperlink description="${fixedAssetName} ${fixedAssetId}" target="EditComputerHardware" also-hidden="false"> <parameter param-name="fixedAssetId"/> </hyperlink> </field> @@ -151,7 +151,7 @@ under the License. </service> </actions> <field name="fixedAssetId" widget-style="linktext"> - <hyperlink also-hidden="false" description="${fixedAssetName} ${fixedAssetId}" target="EditComputerSoftware"> + <hyperlink description="${fixedAssetName} ${fixedAssetId}" target="EditComputerSoftware" also-hidden="false"> <parameter param-name="fixedAssetId"/> </hyperlink> </field> @@ -180,7 +180,7 @@ under the License. </entity-condition> </actions> <field name="fixedAssetId" widget-style="linktext"> - <hyperlink also-hidden="false" description="${fixedAssetName} ${fixedAssetId}" target="EditComputerHardware"> + <hyperlink description="${fixedAssetName} ${fixedAssetId}" target="EditComputerHardware" also-hidden="false"> <parameter param-name="fixedAssetId"/> </hyperlink> </field> Modified: ofbiz/trunk/specialpurpose/bi/minilang/FactServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/bi/minilang/FactServices.xml?rev=1768219&r1=1768218&r2=1768219&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/bi/minilang/FactServices.xml (original) +++ ofbiz/trunk/specialpurpose/bi/minilang/FactServices.xml Sat Nov 5 14:14:04 2016 @@ -288,7 +288,7 @@ under the License. </condition-list> <order-by field-name="-statusDatetime"/> </entity-condition> - <first-from-list entry="orderStatus" list="orderStatusList"/> + <first-from-list list="orderStatusList" entry="orderStatus"/> <if-not-empty field="orderStatus.statusDatetime"> <clear-field field="inMap"/> <set field="inMap.dimensionEntityName" value="DateDimension"/> @@ -403,7 +403,7 @@ under the License. </condition-list> </entity-condition> <if-not-empty field="costs"> - <first-from-list entry="cost" list="costs"/> + <first-from-list list="costs" entry="cost"/> <set field="convertUomCurrencyMap.uomId" from-field="cost.currencyUomId"/> <set field="convertUomCurrencyMap.uomIdTo" value="USD"/> @@ -461,7 +461,7 @@ under the License. <entity-and entity-name="ProductPromoCode" list="productPromo"> <field-map field-name="productPromoId" from-field="discount.productPromoId"/> </entity-and> - <first-from-list entry="productPromoCode" list="productPromo"/> + <first-from-list list="productPromo" entry="productPromoCode"/> <if-not-empty field="productPromoCode"> <set field="fact.productPromoCode" from-field="productPromoCode.productPromoCodeId"/> <else> @@ -627,7 +627,7 @@ under the License. <call-service service-name="loadDateDimension" in-map-name="inMap"/> <check-errors/> - <entity-condition list="orderStatusList" entity-name="OrderStatus"> + <entity-condition entity-name="OrderStatus" list="orderStatusList"> <condition-list combine="and"> <condition-expr field-name="statusId" value="ORDER_APPROVED"/> <condition-expr field-name="statusDatetime" operator="greater-equals" from-field="parameters.fromDate"/> @@ -657,7 +657,7 @@ under the License. <order-by field-name="-fromDate"/> </entity-condition> <if-not-empty field="UomConversionDatedList"> - <first-from-list entry="UomConversion" list="UomConversionDatedList"/> + <first-from-list list="UomConversionDatedList" entry="UomConversion"/> <field-to-result field="UomConversion.conversionFactor" result-name="conversionFactor"/> <else> <entity-condition entity-name="UomConversionDated" list="UomConversionDatedLastestList"> @@ -668,7 +668,7 @@ under the License. </condition-list> </entity-condition> <if-not-empty field="UomConversionDatedLastestList"> - <first-from-list entry="UomConversionLastest" list="UomConversionDatedLastestList"/> + <first-from-list list="UomConversionDatedLastestList" entry="UomConversionLastest"/> <field-to-result field="UomConversionLastest.conversionFactor" result-name="conversionFactor"/> </if-not-empty> </else> Modified: ofbiz/trunk/specialpurpose/birt/widget/facility/FacilityForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/birt/widget/facility/FacilityForms.xml?rev=1768219&r1=1768218&r2=1768219&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/birt/widget/facility/FacilityForms.xml (original) +++ ofbiz/trunk/specialpurpose/birt/widget/facility/FacilityForms.xml Sat Nov 5 14:14:04 2016 @@ -44,7 +44,7 @@ under the License. <field name="productSupplierId" title="${uiLabelMap.ProductSupplier}"> <drop-down allow-empty="true"> <entity-options entity-name="PartyRoleAndPartyDetail" key-field-name="partyId" description="${groupName} [${partyId}]"> - <entity-constraint name="roleTypeId" value="SUPPLIER" operator="equals"/> + <entity-constraint name="roleTypeId" operator="equals" value="SUPPLIER"/> <entity-order-by field-name="partyId"/> </entity-options> </drop-down> Modified: ofbiz/trunk/specialpurpose/ebay/widget/EbayForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebay/widget/EbayForms.xml?rev=1768219&r1=1768218&r2=1768219&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ebay/widget/EbayForms.xml (original) +++ ofbiz/trunk/specialpurpose/ebay/widget/EbayForms.xml Sat Nov 5 14:14:04 2016 @@ -24,7 +24,7 @@ under the License. header-row-style="header-row" default-table-style="basic-table"> <field name="productStoreId"> <drop-down> - <entity-options entity-name="ProductStore" description="${storeName}" key-field-name="productStoreId"> + <entity-options entity-name="ProductStore" key-field-name="productStoreId" description="${storeName}"> <entity-order-by field-name="storeName"/> </entity-options> </drop-down> @@ -43,7 +43,7 @@ under the License. <field name="externalId" title="${uiLabelMap.EbayImportEbayItem}"><display/></field> <field name="transactionId"><display/></field> <field name="orderId"> - <hyperlink target="orderview" description="${orderId}"> + <hyperlink description="${orderId}" target="orderview"> <parameter param-name="orderId"/> </hyperlink> </field> @@ -92,7 +92,7 @@ under the License. header-row-style="header-row" default-table-style="basic-table"> <field name="productStoreId"> <drop-down> - <entity-options entity-name="ProductStore" description="${storeName}" key-field-name="productStoreId"> + <entity-options entity-name="ProductStore" key-field-name="productStoreId" description="${storeName}"> <entity-order-by field-name="storeName"/> </entity-options> </drop-down> @@ -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 target="/ordermgr/control/orderview" also-hidden="false" description="${orderId}" target-type="inter-app"> + <hyperlink description="${orderId}" target="/ordermgr/control/orderview" also-hidden="false" target-type="inter-app"> <parameter param-name="orderId"/> </hyperlink> </field> @@ -146,12 +146,12 @@ under the License. <field name="compatibilityLevel"><display/></field> <field name="webSiteId" title="${uiLabelMap.ProductWebSite}"><display-entity entity-name="WebSite" description="${siteName} [${webSiteId}]"/></field> <field name="editEbayConfiguration" title="${uiLabelMap.CommonEdit}" widget-style="buttontext"> - <hyperlink target="EditEbayConfiguration" description="${uiLabelMap.CommonEdit}" also-hidden="false"> + <hyperlink description="${uiLabelMap.CommonEdit}" target="EditEbayConfiguration" also-hidden="false"> <parameter param-name="productStoreId"/> </hyperlink> </field> <field name="deleteEbayConfiguration" title="${uiLabelMap.CommonDelete}" widget-style="buttontext"> - <hyperlink target="deleteEbayConfiguration" description="${uiLabelMap.CommonDelete}" also-hidden="false"> + <hyperlink description="${uiLabelMap.CommonDelete}" target="deleteEbayConfiguration" also-hidden="false"> <parameter param-name="productStoreId"/> </hyperlink> </field> @@ -213,7 +213,7 @@ under the License. </drop-down> </field> <field name="deleteEbayShippingMethod" title="" widget-style="buttontext"> - <hyperlink target="deleteEbayShippingMethod" description="${uiLabelMap.CommonDelete}" also-hidden="false"> + <hyperlink description="${uiLabelMap.CommonDelete}" target="deleteEbayShippingMethod" also-hidden="false"> <parameter param-name="shipmentMethodName"/> <parameter param-name="productStoreId"/> </hyperlink> @@ -257,7 +257,7 @@ under the License. </field> <field name="websiteId" field-name="webSiteId" parameter-name="webSiteId" title="${uiLabelMap.ProductWebSite}"> <drop-down no-current-selected-key="${parameters.webSiteId}" allow-empty="true"> - <entity-options entity-name="WebSite" description="${siteName} [${webSiteId}]" key-field-name="webSiteId"> + <entity-options entity-name="WebSite" key-field-name="webSiteId" description="${siteName} [${webSiteId}]"> <entity-order-by field-name="siteName"/> </entity-options> </drop-down> Modified: ofbiz/trunk/specialpurpose/ebaystore/minilang/EbayServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebaystore/minilang/EbayServices.xml?rev=1768219&r1=1768218&r2=1768219&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ebaystore/minilang/EbayServices.xml (original) +++ ofbiz/trunk/specialpurpose/ebaystore/minilang/EbayServices.xml Sat Nov 5 14:14:04 2016 @@ -22,26 +22,26 @@ xmlns="http://ofbiz.apache.org/Simple-Method"; xsi:schemaLocation="http://ofbiz.apache.org/Simple-Method http://ofbiz.apache.org/dtds/simple-methods.xsd";> <simple-method method-name="createEbayAccount" short-description="Create Ebay Account"> - <set-service-fields service-name="createPersonAndUserLogin" to-map="newPerson" map="parameters"/> + <set-service-fields service-name="createPersonAndUserLogin" map="parameters" to-map="newPerson"/>/> <call-service service-name="createPersonAndUserLogin" in-map-name="newPerson"> <result-to-field result-name="partyId" field="parameters.partyId"/> </call-service> <set field="parameters.roleTypeId" value="VENDOR" /> - <set-service-fields service-name="createPartyRole" to-map="newPartyRole" map="parameters"/> + <set-service-fields service-name="createPartyRole" map="parameters" to-map="newPartyRole"/>/> <call-service service-name="createPartyRole" in-map-name="newPartyRole"/> <set field="parameters.storeName" value="${parameters.userLoginId}_store"/> - <set-service-fields service-name="createProductStore" to-map="newProductStore" map="parameters"/> + <set-service-fields service-name="createProductStore" map="parameters" to-map="newProductStore"/>/> <call-service service-name="createProductStore" in-map-name="newProductStore"> <result-to-field result-name="productStoreId" field="parameters.productStoreId"/> </call-service> <set field="parameters.roleTypeId" value="EBAY_ACCOUNT"/> - <set-service-fields service-name="createPartyRole" to-map="newPartyRole" map="parameters"/> + <set-service-fields service-name="createPartyRole" map="parameters" to-map="newPartyRole"/>/> <call-service service-name="createPartyRole" in-map-name="newPartyRole"/> - <set-service-fields service-name="createProductStoreRole" to-map="newProductStoreRole" map="parameters"/> + <set-service-fields service-name="createProductStoreRole" map="parameters" to-map="newProductStoreRole"/>/> <call-service service-name="createProductStoreRole" in-map-name="newProductStoreRole"/> <field-to-result field="parameters.productStoreId" result-name="productStoreId"/> @@ -105,7 +105,7 @@ <check-errors/> </if-empty> - <set-service-fields map="parameters" to-map="callServiceMap" service-name="reserveEbayProductInventoryByStoreFacility"/> + <set-service-fields service-name="reserveEbayProductInventoryByStoreFacility" map="parameters" to-map="callServiceMap"/>/> <set from-field="facilityId" field="callServiceMap.facilityId"/> <set from-field="requireInventory" field="callServiceMap.requireInventory"/> <set from-field="productStore.reserveOrderEnumId" field="callServiceMap.reserveOrderEnumId"/> Modified: ofbiz/trunk/specialpurpose/ebaystore/minilang/EbayStoreEvents.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebaystore/minilang/EbayStoreEvents.xml?rev=1768219&r1=1768218&r2=1768219&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ebaystore/minilang/EbayStoreEvents.xml (original) +++ ofbiz/trunk/specialpurpose/ebaystore/minilang/EbayStoreEvents.xml Sat Nov 5 14:14:04 2016 @@ -251,7 +251,7 @@ <simple-method method-name="createEmailTemplate" short-description="Create Email Template"> <!-- create content --> <set field="parameters.dataTemplateTypeId" value="FTL"/> - <set-service-fields service-name="createElectronicText" to-map="newElectronicText" map="parameters"/> + <set-service-fields service-name="createElectronicText" map="parameters" to-map="newElectronicText"/>/> <call-service service-name="createElectronicText" in-map-name="newElectronicText"> <result-to-field result-name="dataResourceId" field="parameters.dataResourceId"/> </call-service> @@ -259,7 +259,7 @@ <set field="parameters.roleTypeId" value="OWNER"/> <set field="parameters.contentTypeId" value="DOCUMENT"/> <set field="parameters.ownerContentId" from-field="parameters.emailType"/> - <set-service-fields service-name="createContent" to-map="newContent" map="parameters"/> + <set-service-fields service-name="createContent" map="parameters" to-map="newContent"/>/> <call-service service-name="createContent" in-map-name="newContent" > <result-to-field result-name="contentId"/> </call-service> @@ -271,7 +271,7 @@ <if-not-empty field="parameters.includeCrossPromotions"> <set field="parameters.subject" value="${parameters.includeCrossPromotions} INCLUDE_CROSS_PROMOTIONS"/> </if-not-empty> - <set-service-fields service-name="createProductStoreEmailSetting" to-map="newEmailSetting" map="parameters"/> + <set-service-fields service-name="createProductStoreEmailSetting" map="parameters" to-map="newEmailSetting"/>/> <call-service service-name="createProductStoreEmailSetting" in-map-name="newEmailSetting" > <result-to-field result-name="contentId"/> </call-service> @@ -279,7 +279,7 @@ <simple-method method-name="updateEmailTemplate" short-description="Create Email Template"> <!-- update content --> - <set-service-fields service-name="updateElectronicText" to-map="updateElectronicText" map="parameters"/> + <set-service-fields service-name="updateElectronicText" map="parameters" to-map="updateElectronicText"/>/> <call-service service-name="updateElectronicText" in-map-name="updateElectronicText"> <result-to-field result-name="dataResourceId" field="parameters.dataResourceId"/> </call-service> @@ -291,7 +291,7 @@ <if-not-empty field="parameters.includeCrossPromotions"> <set field="parameters.subject" value="${parameters.subject} INCLUDE_CROSS_PROMOTIONS"/> </if-not-empty--> - <set-service-fields service-name="updateProductStoreEmailSetting" to-map="updateEmailSetting" map="parameters"/> + <set-service-fields service-name="updateProductStoreEmailSetting" map="parameters" to-map="updateEmailSetting"/>/> <call-service service-name="updateProductStoreEmailSetting" in-map-name="updateEmailSetting" > <result-to-field result-name="contentId"/> </call-service> Modified: ofbiz/trunk/specialpurpose/ebaystore/widget/CommonScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebaystore/widget/CommonScreens.xml?rev=1768219&r1=1768218&r2=1768219&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ebaystore/widget/CommonScreens.xml (original) +++ ofbiz/trunk/specialpurpose/ebaystore/widget/CommonScreens.xml Sat Nov 5 14:14:04 2016 @@ -61,11 +61,11 @@ <field-map field-name="productStoreId" from-field="parameters.productStoreId"/> </service> <set field="userLoginId" from-field="result.userLoginId"/> - <entity-one value-field="ebayUser" entity-name="UserLogin"> + <entity-one entity-name="UserLogin" value-field="ebayUser"> <field-map field-name="userLoginId" from-field="result.userLoginId"/> </entity-one> <set field="parameters.partyId" from-field="ebayUser.partyId" global="true"/> - <entity-one value-field="person" entity-name="Person"> + <entity-one entity-name="Person" value-field="person"> <field-map field-name="partyId" from-field="parameters.partyId"/> </entity-one> </actions> Modified: ofbiz/trunk/specialpurpose/ebaystore/widget/EbayAccountForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebaystore/widget/EbayAccountForms.xml?rev=1768219&r1=1768218&r2=1768219&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ebaystore/widget/EbayAccountForms.xml (original) +++ ofbiz/trunk/specialpurpose/ebaystore/widget/EbayAccountForms.xml Sat Nov 5 14:14:04 2016 @@ -42,7 +42,7 @@ under the License. <field name="itemID"><display description="${itemID} - ${title}"/></field> <field name="userID"><display description="${userID}"/></field> <field name="actions" use-when=""${commentType}" == """> - <hyperlink target="LeaveFeedback" description="Leave Feedback"> + <hyperlink description="Leave Feedback" target="LeaveFeedback"> <parameter param-name="itemId" value="${itemID}"/> <parameter param-name="transactionId" value="${transactionID}"/> <parameter param-name="productStoreId" value="${parameters.productStoreId}"/> Modified: ofbiz/trunk/specialpurpose/ebaystore/widget/EbayEmailScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebaystore/widget/EbayEmailScreens.xml?rev=1768219&r1=1768218&r2=1768219&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ebaystore/widget/EbayEmailScreens.xml (original) +++ ofbiz/trunk/specialpurpose/ebaystore/widget/EbayEmailScreens.xml Sat Nov 5 14:14:04 2016 @@ -30,19 +30,19 @@ </service> <set field="userLoginId" from-field="result.userLoginId"/> <set field="emailType" from-field="parameters.emailType"/> - <entity-one value-field="emailSetting" entity-name="ProductStoreEmailSetting"> + <entity-one entity-name="ProductStoreEmailSetting" value-field="emailSetting"> <field-map field-name="productStoreId" from-field="parameters.productStoreId"/> <field-map field-name="emailType" from-field="emailType"/> </entity-one> <set field="subject" from-field="emailSetting.subject"/> <set field="bodyScreenLocation" value="component://ebaystore/widget/EbayEmailScreens.xml#EbayEmailTemplate"/> <set field="fromAddress" from-field="ebayUser.email"/> - <entity-one value-field="userLoginCheck" entity-name="UserLogin"> + <entity-one entity-name="UserLogin" value-field="userLoginCheck"> <field-map field-name="userLoginId" from-field="userLoginId"/> </entity-one> <set field="partyId" from-field="userLoginCheck.partyId"/> <script location="component://ebaystore/groovyScripts/email/GetProductStoreEmailTemplate.groovy"/> - <entity-one value-field="templateContent" entity-name="Content"/> + <entity-one entity-name="Content" value-field="templateContent"/> <get-related-one value-field="templateContent" relation-name="DataResource" to-value-field="templateDataResource"/> <get-related-one value-field="templateDataResource" relation-name="ElectronicText" to-value-field="templateData"/> <set field="textData" from-field="templateData.textData"/> Modified: ofbiz/trunk/specialpurpose/ebaystore/widget/EbaySellingManagerForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebaystore/widget/EbaySellingManagerForms.xml?rev=1768219&r1=1768218&r2=1768219&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ebaystore/widget/EbaySellingManagerForms.xml (original) +++ ofbiz/trunk/specialpurpose/ebaystore/widget/EbaySellingManagerForms.xml Sat Nov 5 14:14:04 2016 @@ -126,7 +126,7 @@ under the License. </field> <field name="submitButton" title="${uiLabelMap.CommonSubmit}" position="1"><submit/></field> <field name="cancelButton" title=" " widget-style="smallSubmit" position="2"> - <hyperlink target="soldListing" description="${uiLabelMap.CommonCancel}"> + <hyperlink description="${uiLabelMap.CommonCancel}" target="soldListing"> <parameter param-name="productStoreId" from-field="parameters.productStoreId"/> </hyperlink> </field> @@ -302,7 +302,7 @@ under the License. <field name="afterDays" title="${uiLabelMap.EbayAfter}" position="1" tooltip="${uiLabelMap.CommonDays} ${uiLabelMap.EbayIsSendCopyEmailTooltip}" ><text default-value="5" size="5" maxlength="2"></text></field> <field name="isSendCopyEmailToSeller" position="1" title="${uiLabelMap.EbayIsSendCopyEmailToSeller}"><check></check></field> <field name="emailTemplate" title="Email" tooltip="Edit Feedback Reminder email template"> - <hyperlink target="editEmailTemplate" description="Edit Email Template"> + <hyperlink description="Edit Email Template" target="editEmailTemplate"> <parameter param-name="productStoreId" from-field="parameters.productStoreId"/> <parameter param-name="emailType" value="EBAY_WIN_BUYER_NOTI"/> </hyperlink> @@ -324,7 +324,7 @@ under the License. <field name="isAutoSendPayReceivedEmail" tooltip="${uiLabelMap.EbayAutoPaymentReceviedEmail}" position="1" title="${uiLabelMap.EbayIsAutoSendEmail}"><check></check></field> <field name="isSendCopyEmailToSeller" position="1" title="${uiLabelMap.EbayIsSendCopyEmailToSeller}"><check></check></field> <field name="emailTemplate" title="Email" tooltip="Edit Payment received email template"> - <hyperlink target="editEmailTemplate" description="${uiLabelMap.EbayEditEmailTemplate}"> + <hyperlink description="${uiLabelMap.EbayEditEmailTemplate}" target="editEmailTemplate"> <parameter param-name="productStoreId" from-field="parameters.productStoreId"/> <parameter param-name="emailType" value="EBAY_PAY_RECIEVED"/> </hyperlink> @@ -473,7 +473,7 @@ under the License. <field name="itemId"><display/></field> <field name="SKU" title="Product ID"><display/></field> <field name="title"> - <hyperlink target="${viewItemURL}" description="${title}" target-type="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 target="getItemProduct?productStoreId=${parameters.productStoreId}&itemId=${itemId}" description="Edit" target-type="plain" target-window="_BLANK"/> + <hyperlink description="Edit" target="getItemProduct?productStoreId=${parameters.productStoreId}&itemId=${itemId}" target-type="plain" target-window="_BLANK"/> </field> </grid> <!-- Unsold Listing --> @@ -647,7 +647,7 @@ under the License. <field name="offerStatus" title="Offer Status"><display description="${inMap.offerStatus}"/></field> <field name="contactStatus" title="Contact Status"><display description="${contactStatus}"/></field> <field name="viewCustomerDataButton" widget-style="buttontext" title="View Customer Offer Data"> - <hyperlink target="customerOfferData" description="View Data" also-hidden="false"> + <hyperlink description="View Data" target="customerOfferData" also-hidden="false"> <parameter param-name="productStoreId" from-field="productStoreId"/> <parameter param-name="itemId" from-field="itemId"/> <parameter param-name="userId" from-field="userId"/> @@ -661,7 +661,7 @@ under the License. </hyperlink> </field> <field name="deleteOfferButton" title="Delete Offer Alert Data" widget-style="buttontext"> - <hyperlink target="deleteContactAlert" description="Delete Data" also-hidden="false"> + <hyperlink description="Delete Data" target="deleteContactAlert" also-hidden="false"> <parameter param-name="itemId" from-field="itemId"/> <parameter param-name="userId" from-field="userId"/> <parameter param-name="productStoreId" from-field="productStoreId"/> @@ -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 target="${viewItemURL}" description="${title}" target-type="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 target="https://localhost:8443/ordermgr/control/orderview?orderId=${orderId}"; description="${orderId}" target-type="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 target="https://localhost:8443/ordermgr/control/orderview?orderId=${orderId}"; description="${orderId}" target-type="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> Modified: ofbiz/trunk/specialpurpose/ebaystore/widget/EbaySellingManagerScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebaystore/widget/EbaySellingManagerScreens.xml?rev=1768219&r1=1768218&r2=1768219&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ebaystore/widget/EbaySellingManagerScreens.xml (original) +++ ofbiz/trunk/specialpurpose/ebaystore/widget/EbaySellingManagerScreens.xml Sat Nov 5 14:14:04 2016 @@ -283,7 +283,7 @@ <set field="headerItem" value="ebayStore"/> <set field="autoPrefEnumId" value="EBAY_AUTO_RELISTING"/> <set field="serviceName" value="autoRelistingItems"/> - <entity-one value-field="ebayPrefRelisting" entity-name="EbayProductStorePref"> + <entity-one entity-name="EbayProductStorePref" value-field="ebayPrefRelisting"> <field-map field-name="productStoreId" from-field="parameters.productStoreId"/> <field-map field-name="autoPrefEnumId" from-field="autoPrefEnumId"/> </entity-one> @@ -308,11 +308,11 @@ <set field="autoPrefEnumId2" value="EBAY_AUTO_DISPUTE2"/> <set field="serviceName1" value="automaticEbayDisputeNotComplete"/> <set field="serviceName2" value="automaticEbayDisputeNotPay"/> - <entity-one value-field="ebayPrefDispute1" entity-name="EbayProductStorePref"> + <entity-one entity-name="EbayProductStorePref" value-field="ebayPrefDispute1"> <field-map field-name="productStoreId" from-field="parameters.productStoreId"/> <field-map field-name="autoPrefEnumId" from-field="autoPrefEnumId1"/> </entity-one> - <entity-one value-field="ebayPrefDispute2" entity-name="EbayProductStorePref"> + <entity-one entity-name="EbayProductStorePref" value-field="ebayPrefDispute2"> <field-map field-name="productStoreId" from-field="parameters.productStoreId"/> <field-map field-name="autoPrefEnumId" from-field="autoPrefEnumId2"/> </entity-one> @@ -407,19 +407,19 @@ </service> <set field="userLoginId" from-field="result.userLoginId"/> <set field="emailType" from-field="parameters.emailType"/> - <entity-one value-field="emailSetting" entity-name="ProductStoreEmailSetting"> + <entity-one entity-name="ProductStoreEmailSetting" value-field="emailSetting"> <field-map field-name="productStoreId" from-field="parameters.productStoreId"/> <field-map field-name="emailType" from-field="emailType"/> </entity-one> <set field="subject" from-field="emailSetting.subject"/> <set field="bodyScreenLocation" value="component://ebaystore/widget/EbayEmailScreens.xml#EbayEmailTemplate"/> <set field="fromAddress" from-field="ebayUser.email"/> - <entity-one value-field="userLoginCheck" entity-name="UserLogin"> + <entity-one entity-name="UserLogin" value-field="userLoginCheck"> <field-map field-name="userLoginId" from-field="userLoginId"/> </entity-one> <set field="partyId" from-field="userLoginCheck.partyId"/> <script location="component://ebaystore/groovyScripts/email/GetProductStoreEmailTemplate.groovy"/> - <entity-one value-field="templateContent" entity-name="Content"/> + <entity-one entity-name="Content" value-field="templateContent"/> <get-related-one value-field="templateContent" relation-name="DataResource" to-value-field="templateDataResource"/> <get-related-one value-field="templateDataResource" relation-name="ElectronicText" to-value-field="templateData"/> <set field="textData" from-field="templateData.textData"/> Modified: ofbiz/trunk/specialpurpose/ebaystore/widget/EbayStoreForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebaystore/widget/EbayStoreForms.xml?rev=1768219&r1=1768218&r2=1768219&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ebaystore/widget/EbayStoreForms.xml (original) +++ ofbiz/trunk/specialpurpose/ebaystore/widget/EbayStoreForms.xml Sat Nov 5 14:14:04 2016 @@ -96,7 +96,7 @@ under the License. <field name="prodCatalogId"><hidden/></field> <field name="productCategoryId"><display></display></field> <field name="categoryName"> - <hyperlink target="getChildCategory" description="${prodCategory.categoryName}"> + <hyperlink description="${prodCategory.categoryName}" target="getChildCategory"> <parameter param-name="productStoreId"/> <parameter from-field="parameters.prodCatalogId" param-name="prodCatalogId"/> <parameter param-name="productCategoryId"/> @@ -134,7 +134,7 @@ under the License. <display-entity entity-name="ProdCatalog" description="${catalogName}" key-field-name="prodCatalogId"/> </field> <field name="delete" widget-style="buttontext"> - <hyperlink target="removeCatalogFromStore" description="${uiLabelMap.CommonDelete}"> + <hyperlink description="${uiLabelMap.CommonDelete}" target="removeCatalogFromStore"> <parameter param-name="productStoreId"/> <parameter param-name="prodCatalogId"/> <parameter param-name="fromDate"/> Modified: ofbiz/trunk/specialpurpose/ecommerce/minilang/customer/CustomerEvents.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/minilang/customer/CustomerEvents.xml?rev=1768219&r1=1768218&r2=1768219&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/minilang/customer/CustomerEvents.xml (original) +++ ofbiz/trunk/specialpurpose/ecommerce/minilang/customer/CustomerEvents.xml Sat Nov 5 14:14:04 2016 @@ -290,7 +290,7 @@ under the License. <!-- the above copy is okay since we checked already that they are the same --> <call-service service-name="createPersonAndUserLogin" in-map-name="personUserLoginContext"> <result-to-field result-name="partyId" field="tempMap.partyId"/> - <result-to-field field="createdUserLogin" result-name="newUserLogin"/> + <result-to-field result-name="newUserLogin" field="createdUserLogin"/> </call-service> <set-current-user-login value-field="createdUserLogin"/> @@ -1267,7 +1267,7 @@ under the License. </if-compare-field> </simple-method> <simple-method method-name="createAnonContact" short-description="Create a non Contact" login-required="false"> - <entity-one value-field="systemUserLogin" entity-name="UserLogin"> + <entity-one entity-name="UserLogin" value-field="systemUserLogin"> <field-map field-name="userLoginId" value="system"/> </entity-one> <set field="parameters.userLogin" from-field="systemUserLogin"/> @@ -1295,11 +1295,11 @@ under the License. </if-compare-field> <check-errors/> <if-empty field="parameters.partyId"> - <set-service-fields service-name="createPerson" to-map="newPerson" map="parameters"/> + <set-service-fields service-name="createPerson" map="parameters" to-map="newPerson"/>/> <call-service service-name="createPerson" in-map-name="newPerson"> <result-to-field result-name="partyId" field="parameters.partyId"/> </call-service> - <set-service-fields service-name="createPartyContactMech" to-map="newContact" map="parameters"/> + <set-service-fields service-name="createPartyContactMech" map="parameters" to-map="newContact"/>/> <set field="newContact.infoString" from-field="parameters.emailAddress"/> <set field="newContact.contactMechTypeId" value="EMAIL_ADDRESS"/> <set field="newContact.contactMechPurposeTypeId" value="PRIMARY_EMAIL"/> @@ -1310,7 +1310,7 @@ under the License. <set field="parameters.contactMechIdFrom" from-field="contact.contactMechId"/> </else> </if-empty> - <set-service-fields service-name="sendContactUsEmailToCompany" to-map="newComm" map="parameters"/> + <set-service-fields service-name="sendContactUsEmailToCompany" map="parameters" to-map="newComm"/>/> <set field="newComm.emailType" value="CONT_NOTI_EMAIL"/> <call-service service-name="sendContactUsEmailToCompany" in-map-name="newComm"> <default-message property="ThankYouForContactingUs" resource="EcommerceUiLabels"></default-message> Modified: ofbiz/trunk/specialpurpose/ecommerce/widget/ContentForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/widget/ContentForms.xml?rev=1768219&r1=1768218&r2=1768219&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/widget/ContentForms.xml (original) +++ ofbiz/trunk/specialpurpose/ecommerce/widget/ContentForms.xml Sat Nov 5 14:14:04 2016 @@ -30,7 +30,7 @@ under the License. default-title-style="tableheadtext" default-widget-style="inputBox" paginate-target="/AdminSearch"> <field name="editContent" title=" "> - <hyperlink also-hidden="false" description="${uiLabelMap.CommonEdit}" target="CMSContentEdit"> + <hyperlink description="${uiLabelMap.CommonEdit}" target="CMSContentEdit" also-hidden="false"> <parameter param-name="contentId"/> <parameter param-name="drDataResourceId"/> <parameter param-name="contentIdTo"/> Modified: ofbiz/trunk/specialpurpose/ecommerce/widget/ForumForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/widget/ForumForms.xml?rev=1768219&r1=1768218&r2=1768219&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/widget/ForumForms.xml (original) +++ ofbiz/trunk/specialpurpose/ecommerce/widget/ForumForms.xml Sat Nov 5 14:14:04 2016 @@ -194,12 +194,12 @@ under the License. default-title-style="tableheadtext" default-widget-style="inputBox" paginate-target="/FindContent"> <field name="editContent" title=" "> - <hyperlink also-hidden="false" description="${uiLabelMap.CommonEdit}" target="EditContent"> + <hyperlink description="${uiLabelMap.CommonEdit}" target="EditContent" also-hidden="false"> <parameter param-name="contentId"/> <parameter param-name="drDataResourceId"/> </hyperlink> <!-- - <hyperlink also-hidden="false" description="${uiLabelMap.CommonEdit}" target="EditContent"> + <hyperlink description="${uiLabelMap.CommonEdit}" target="EditContent" also-hidden="false"> <parameter param-name="caContentIdTo"/> <parameter param-name="caFromDate"/> <parameter param-name="contentId"/> @@ -645,7 +645,7 @@ under the License. </field> <!-- <field name="submitContentEdit" title=" "> - <hyperlink also-hidden="false" description="Submit" target="javascript:document.EditAddContent.action='${persistAction}'; document.EditAddContent.submit()" target-type="plain"/> + <hyperlink description="Submit" target="javascript:document.EditAddContent.action='${persistAction}'; document.EditAddContent.submit()" also-hidden="false" target-type="plain"/> </field> --> <field name="deactivateExisting" > Modified: ofbiz/trunk/specialpurpose/ecommerce/widget/ForumScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/widget/ForumScreens.xml?rev=1768219&r1=1768218&r2=1768219&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/widget/ForumScreens.xml (original) +++ ofbiz/trunk/specialpurpose/ecommerce/widget/ForumScreens.xml Sat Nov 5 14:14:04 2016 @@ -65,7 +65,7 @@ under the License. <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer"/> <property-to-field resource="widget" property="widget.form.defaultViewSize" field="viewSizeDefaultValue"/> <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="${viewSizeDefaultValue}"/> - <entity-condition list="forumMessages" entity-name="ContentAssocViewTo" > + <entity-condition entity-name="ContentAssocViewTo" list="forumMessages" > <condition-list combine="and"> <condition-expr field-name="contentIdStart" from-field="parameters.forumId"/> <condition-list combine="or"> Modified: ofbiz/trunk/specialpurpose/ecommerce/widget/blog/BlogForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/widget/blog/BlogForms.xml?rev=1768219&r1=1768218&r2=1768219&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/widget/blog/BlogForms.xml (original) +++ ofbiz/trunk/specialpurpose/ecommerce/widget/blog/BlogForms.xml Sat Nov 5 14:14:04 2016 @@ -49,10 +49,10 @@ <submit button-type="button"/> </field> <field name="createBlog" title=" " widget-style="buttontext"> - <hyperlink also-hidden="false" description="${uiLabelMap.CommonNew} ${uiLabelMap.ContentForum}" target="EditBlogArticle"/> + <hyperlink description="${uiLabelMap.CommonNew} ${uiLabelMap.ContentForum}" target="EditBlogArticle" also-hidden="false"/> </field> <field name="createForum" title=" " widget-style="buttontext"> - <hyperlink also-hidden="false" description="${uiLabelMap.CommonNew} ${uiLabelMap.ContentForum}" target="EditForumArticle"/> + <hyperlink description="${uiLabelMap.CommonNew} ${uiLabelMap.ContentForum}" target="EditForumArticle" also-hidden="false"/> </field> </form> @@ -69,7 +69,7 @@ </actions> <field name="editContent" title=" "> - <hyperlink also-hidden="false" description="${uiLabelMap.CommonEdit}" target="CMSContentEdit"> + <hyperlink description="${uiLabelMap.CommonEdit}" target="CMSContentEdit" also-hidden="false"> <parameter param-name="contentId"/> <parameter param-name="drDataResourceId"/> <parameter param-name="contentIdTo"/> Modified: ofbiz/trunk/specialpurpose/example/minilang/example/ExampleServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/example/minilang/example/ExampleServices.xml?rev=1768219&r1=1768218&r2=1768219&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/example/minilang/example/ExampleServices.xml (original) +++ ofbiz/trunk/specialpurpose/example/minilang/example/ExampleServices.xml Sat Nov 5 14:14:04 2016 @@ -29,7 +29,7 @@ under the License. <field-map field-name="exampleId" from-field="parameters.exampleId"/> <order-by field-name="-statusDate"/> </entity-and> - <first-from-list entry="oldExampleStatus" list="oldExampleStatusList"/> + <first-from-list list="oldExampleStatusList" entry="oldExampleStatus"/> <if-not-empty field="oldExampleStatus"> <set field="oldExampleStatus.statusEndDate" from-field="nowTimestamp"/> <store-value value-field="oldExampleStatus"/> Modified: ofbiz/trunk/specialpurpose/example/widget/example/ExampleFeatureForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/example/widget/example/ExampleFeatureForms.xml?rev=1768219&r1=1768218&r2=1768219&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/example/widget/example/ExampleFeatureForms.xml (original) +++ ofbiz/trunk/specialpurpose/example/widget/example/ExampleFeatureForms.xml Sat Nov 5 14:14:04 2016 @@ -40,7 +40,7 @@ under the License. </service> </actions> <field name="exampleFeatureId" title="${uiLabelMap.ExampleExampleFeatureId}" widget-style="buttontext"> - <hyperlink also-hidden="false" description="${exampleFeatureId}" target="EditExampleFeature"> + <hyperlink description="${exampleFeatureId}" target="EditExampleFeature" also-hidden="false"> <parameter param-name="exampleFeatureId"/> </hyperlink> </field> @@ -98,7 +98,7 @@ under the License. </field> <field name="submitButton" title="${uiLabelMap.CommonUpdate}"><submit button-type="button"/></field> <field name="deleteLink" title="" widget-style="buttontext"> - <hyperlink target="feature_deleteExampleFeatureAppl" description="${uiLabelMap.CommonDelete}" also-hidden="false"> + <hyperlink description="${uiLabelMap.CommonDelete}" target="feature_deleteExampleFeatureAppl" also-hidden="false"> <parameter param-name="exampleId"/> <parameter param-name="exampleFeatureId"/> <parameter param-name="fromDate"/> @@ -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}" also-hidden="false" target-type="plain" target="javascript:set_value('${exampleFeatureId}')"/> + <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"/> Modified: ofbiz/trunk/specialpurpose/example/widget/example/ExampleForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/example/widget/example/ExampleForms.xml?rev=1768219&r1=1768218&r2=1768219&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/example/widget/example/ExampleForms.xml (original) +++ ofbiz/trunk/specialpurpose/example/widget/example/ExampleForms.xml Sat Nov 5 14:14:04 2016 @@ -66,7 +66,7 @@ under the License. <alt-row-style use-when="'EXST_APPROVED'.equals(statusId)" style="Validate"/> <alt-row-style use-when="'EXST_CANCELLED'.equals(statusId)" style="Warn"/> <field name="exampleId" title="${uiLabelMap.ExampleExampleId}" widget-style="buttontext"> - <hyperlink also-hidden="false" description="${exampleId}" target="EditExample"> + <hyperlink description="${exampleId}" target="EditExample" also-hidden="false"> <parameter param-name="exampleId"/> </hyperlink> </field> @@ -144,7 +144,7 @@ under the License. <entity-condition entity-name="Example"><order-by field-name="exampleName"/></entity-condition> </actions> <field name="exampleId" title="${uiLabelMap.ExampleExampleId}" widget-style="buttontext"> - <hyperlink also-hidden="false" description="${exampleId}" target="EditExampleLayer" link-type="layered-modal"> + <hyperlink description="${exampleId}" target="EditExampleLayer" also-hidden="false" link-type="layered-modal"> <parameter param-name="exampleId"/> </hyperlink> </field> @@ -253,7 +253,7 @@ under the License. </drop-down> </field> <field name="deleteLink" title=" " widget-style="buttontext"> - <hyperlink target="deleteExampleItem" description="${uiLabelMap.CommonDelete}" also-hidden="false" confirmation-message="${uiLabelMap.CommonConfirmDelete}" image-location="${iconsLocation}/delete.png"> + <hyperlink description="${uiLabelMap.CommonDelete}" target="deleteExampleItem" also-hidden="false" confirmation-message="${uiLabelMap.CommonConfirmDelete}" image-location="${iconsLocation}/delete.png"> <parameter param-name="exampleId"/> <parameter param-name="exampleItemSeqId"/> </hyperlink> @@ -303,7 +303,7 @@ under the License. </field> <field name="submitButton" title="${uiLabelMap.CommonUpdate}"><submit button-type="button"/></field> <field name="deleteLink" title=" " widget-style="buttontext"> - <hyperlink target="example_deleteExampleFeatureAppl" description="${uiLabelMap.CommonDelete}" also-hidden="false" image-location="${iconsLocation}/delete.png"> + <hyperlink description="${uiLabelMap.CommonDelete}" target="example_deleteExampleFeatureAppl" also-hidden="false" image-location="${iconsLocation}/delete.png"> <parameter param-name="exampleId"/> <parameter param-name="exampleFeatureId"/> <parameter param-name="fromDate"/> Modified: ofbiz/trunk/specialpurpose/example/widget/example/FormWidgetExampleForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/example/widget/example/FormWidgetExampleForms.xml?rev=1768219&r1=1768218&r2=1768219&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/example/widget/example/FormWidgetExampleForms.xml (original) +++ ofbiz/trunk/specialpurpose/example/widget/example/FormWidgetExampleForms.xml Sat Nov 5 14:14:04 2016 @@ -400,7 +400,7 @@ under the License. <!-- ************************ --> <field name="emptyField0" title=" "><display/></field> <field name="newExample" title=" " widget-area-style="smallSubmit" position="1"> - <hyperlink also-hidden="false" description="${uiLabelMap.ExampleNewExample} (Layered-modal)" target="EditExampleLayer" link-type="layered-modal"/> + <hyperlink description="${uiLabelMap.ExampleNewExample} (Layered-modal)" target="EditExampleLayer" also-hidden="false" link-type="layered-modal"/> </field> </form> </forms> Modified: ofbiz/trunk/specialpurpose/hhfacility/widget/hhfacility/FacilityForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/hhfacility/widget/hhfacility/FacilityForms.xml?rev=1768219&r1=1768218&r2=1768219&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/hhfacility/widget/hhfacility/FacilityForms.xml (original) +++ ofbiz/trunk/specialpurpose/hhfacility/widget/hhfacility/FacilityForms.xml Sat Nov 5 14:14:04 2016 @@ -24,7 +24,7 @@ under the License. <form name="ListFacilities" type="list" list-name="facilities" paginate-target="main" default-title-style="tableheadtext"> <field name="facilityId" widget-style="buttontext"> - <hyperlink also-hidden="false" description="${facilityId}" target="menu"> + <hyperlink description="${facilityId}" target="menu" also-hidden="false"> <parameter param-name="facilityId"/> </hyperlink> </field> @@ -89,7 +89,7 @@ under the License. <field name="quantity" required-field="true" entry-name="totalQuantityOnHand"><text size="6" default-value=""/></field> <field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field> <field name="deleteLink" title=" " widget-style="buttontext"> - <hyperlink target="removeProductFromCategory" description="${uiLabelMap.CommonDelete}" also-hidden="false"> + <hyperlink description="${uiLabelMap.CommonDelete}" target="removeProductFromCategory" also-hidden="false"> <parameter param-name="productId"/> <parameter param-name="productCategoryId"/> <parameter param-name="fromDate"/> Modified: ofbiz/trunk/specialpurpose/lucene/widget/LuceneForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/lucene/widget/LuceneForms.xml?rev=1768219&r1=1768218&r2=1768219&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/lucene/widget/LuceneForms.xml (original) +++ ofbiz/trunk/specialpurpose/lucene/widget/LuceneForms.xml Sat Nov 5 14:14:04 2016 @@ -32,7 +32,7 @@ under the License. <form name="SearchList" type="list" target="" list-name="queryResults" paginate-target="/AdminSearch" odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <field name="editContent" title=" "> - <hyperlink also-hidden="false" description="${uiLabelMap.CommonEdit}" target="CMSContentEdit"> + <hyperlink description="${uiLabelMap.CommonEdit}" target="CMSContentEdit" also-hidden="false"> <parameter param-name="contentId"/> <parameter param-name="drDataResourceId" from-field="dataResourceId"/> <parameter param-name="contentIdTo"/> Modified: ofbiz/trunk/specialpurpose/myportal/minilang/Events.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/myportal/minilang/Events.xml?rev=1768219&r1=1768218&r2=1768219&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/myportal/minilang/Events.xml (original) +++ ofbiz/trunk/specialpurpose/myportal/minilang/Events.xml Sat Nov 5 14:14:04 2016 @@ -57,7 +57,7 @@ under the License. <set-service-fields map="userLoginContext" service-name="createPersonAndUserLogin" to-map="personUserLoginContext"/> <call-service service-name="createPersonAndUserLogin" in-map-name="personUserLoginContext"> <result-to-field result-name="partyId" field="partyId"/> - <result-to-field field="createdUserLogin" result-name="newUserLogin"/> + <result-to-field result-name="newUserLogin" field="createdUserLogin"/> </call-service> <set-current-user-login value-field="createdUserLogin"/> <else> Modified: ofbiz/trunk/specialpurpose/myportal/widget/PortalAdmForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/myportal/widget/PortalAdmForms.xml?rev=1768219&r1=1768218&r2=1768219&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/myportal/widget/PortalAdmForms.xml (original) +++ ofbiz/trunk/specialpurpose/myportal/widget/PortalAdmForms.xml Sat Nov 5 14:14:04 2016 @@ -72,7 +72,7 @@ under the License. <field name="ownerUserLoginId" sort-field="true"><display/></field> <field name="securityGroupId" title="${uiLabelMap.CommonSecurityGroupId}" sort-field="true"><display/></field> <field name="deleteLink" use-when="originalPortalPageId!=null" title=" " widget-style="buttontext" > - <hyperlink target="deletePortalPage" description="${uiLabelMap.CommonRevertPortalPage}"> + <hyperlink description="${uiLabelMap.CommonRevertPortalPage}" target="deletePortalPage"> <parameter param-name="portalPageId"/> <parameter param-name="parentPortalPageId" from-field="parameters.parentPortalPageId"/> </hyperlink>
