You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by di...@apache.org on 2016/11/05 14:14:07 UTC
svn commit: r1768219 [3/18] - in /ofbiz/trunk:
applications/accounting/minilang/ applications/accounting/minilang/admin/
applications/accounting/minilang/agreement/
applications/accounting/minilang/budget/
applications/accounting/minilang/finaccount/ a...
Modified: ofbiz/trunk/applications/accounting/widget/InvoiceForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/InvoiceForms.xml?rev=1768219&r1=1768218&r2=1768219&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/InvoiceForms.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/InvoiceForms.xml Sat Nov 5 14:14:04 2016
@@ -85,12 +85,12 @@ under the License.
<field name="statusId" title="${uiLabelMap.CommonStatus}" sort-field="true"><display-entity entity-name="StatusItem"/></field>
<field name="description" sort-field="true"><display/></field>
<field name="partyIdFrom" title="${uiLabelMap.AccountingFromParty}" sort-field="true">
- <hyperlink target="/partymgr/control/PartyFinancialHistory" target-type="inter-app" description="${partyNameResultFrom.fullName} [${partyIdFrom}]">
+ <hyperlink description="${partyNameResultFrom.fullName} [${partyIdFrom}]" target="/partymgr/control/PartyFinancialHistory" target-type="inter-app">
<parameter param-name="partyId" from-field="partyIdFrom"/>
</hyperlink>
</field>
<field name="partyIdTo" title="${uiLabelMap.AccountingToParty}" parameter-name="partyId">
- <hyperlink target="/partymgr/control/PartyFinancialHistory" target-type="inter-app" description="${partyNameResultTo.fullName} [${partyId}]">
+ <hyperlink description="${partyNameResultTo.fullName} [${partyId}]" target="/partymgr/control/PartyFinancialHistory" target-type="inter-app">
<parameter param-name="partyId"/>
</hyperlink>
</field>
@@ -119,12 +119,12 @@ under the License.
<field position="1" name="description"><display/></field>
<field position="2" name="invoiceMessage"><display/></field>
<field position="1" name="partyIdFrom">
- <hyperlink target="/partymgr/control/viewprofile" target-type="inter-app" description="${partyNameResultFrom.fullName} [${invoice.partyIdFrom}]">
+ <hyperlink description="${partyNameResultFrom.fullName} [${invoice.partyIdFrom}]" target="/partymgr/control/viewprofile" target-type="inter-app">
<parameter param-name="partyId" from-field="invoice.partyIdFrom"/>
</hyperlink>
</field>
<field position="2" name="partyIdTo" entry-name="partyId">
- <hyperlink target="/partymgr/control/viewprofile" target-type="inter-app" description="${partyNameResultTo.fullName} [${invoice.partyId}]">
+ <hyperlink description="${partyNameResultTo.fullName} [${invoice.partyId}]" target="/partymgr/control/viewprofile" target-type="inter-app">
<parameter param-name="partyId" from-field="invoice.partyId"/>
</hyperlink>
</field>
@@ -149,7 +149,7 @@ under the License.
<field name="invoiceItemSeqId"><display/></field>
<field name="invoiceItemTypeId"><display-entity entity-name="InvoiceItemType"/></field>
<field name="orderId" widget-style="linktext">
- <hyperlink target="/ordermgr/control/orderview" target-type="inter-app" description="${orderId}">
+ <hyperlink description="${orderId}" target="/ordermgr/control/orderview" target-type="inter-app">
<parameter param-name="orderId"/>
</hyperlink>
</field>
@@ -159,12 +159,12 @@ under the License.
<field name="amount" title="${uiLabelMap.AccountingUnitPrice}" widget-area-style="align-text"><display type="currency" currency="${invoice.currencyUomId}"/></field>
<field name="total"><display type="currency" currency="${invoice.currencyUomId}"/></field>
<field name="productId" widget-style="linktext">
- <hyperlink target="/catalog/control/EditProduct" target-type="inter-app" description="${productId}">
+ <hyperlink description="${productId}" target="/catalog/control/EditProduct" target-type="inter-app">
<parameter param-name="productId"/>
</hyperlink>
</field>
<field name="overrideGlAccountId" widget-area-style="align-text">
- <hyperlink target="GlAccountNavigate" description="${overrideGlAccountId}">
+ <hyperlink description="${overrideGlAccountId}" target="GlAccountNavigate">
<parameter param-name="glAccountId" from-field="overrideGlAccountId"/>
</hyperlink>
</field>
@@ -198,7 +198,7 @@ under the License.
<field name="total" widget-area-style="align-text"><display type="currency" currency="${invoice.currencyUomId}"/></field>
<field name="invoiceId"><hidden/></field>
<field name="paymentId" widget-style="linktext">
- <hyperlink target="paymentOverview" description="${paymentId}">
+ <hyperlink description="${paymentId}" target="paymentOverview">
<parameter param-name="paymentId"/>
</hyperlink>
</field>
@@ -210,7 +210,7 @@ under the License.
odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<auto-fields-entity entity-name="AcctgTransAndEntries" default-field-type="display"/>
<field name="invoiceId"><hidden/></field>
- <field name="paymentId"><hyperlink target="paymentOverview?paymentId=${paymentId}" description="${paymentId}"/></field>
+ <field name="paymentId"><hyperlink description="${paymentId}" target="paymentOverview?paymentId=${paymentId}"/></field>
<field name="amount"><display type="currency" currency="${currencyUomId}"/></field>
<field name="origAmount"><display type="currency" currency="${origCurrencyUomId}"/></field>
<field name="acctgTransId"><hyperlink description="${acctgTransId}" target="EditAcctgTrans?acctgTransId=${acctgTransId}&organizationPartyId=${organizationPartyId}"/></field>
@@ -527,7 +527,7 @@ under the License.
odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<field name="invoiceId"><hidden/></field>
<field name="paymentId" widget-style="buttontext">
- <hyperlink target="paymentOverview" description="[${paymentId}]">
+ <hyperlink description="[${paymentId}]" target="paymentOverview">
<parameter param-name="paymentId"/>
</hyperlink>
</field>
@@ -613,7 +613,7 @@ under the License.
<field name="invoiceId"><hidden/></field>
<field name="deleteLink" title=" " widget-style="buttontext">
- <hyperlink target="unlinkInvoiceFromTimeEntry" description="${uiLabelMap.CommonDelete}" also-hidden="false">
+ <hyperlink description="${uiLabelMap.CommonDelete}" target="unlinkInvoiceFromTimeEntry" also-hidden="false">
<parameter param-name="timeEntryId"/>
<parameter param-name="invoiceId"/>
<parameter param-name="viewIndex"/>
@@ -632,7 +632,7 @@ under the License.
<field name="invoiceItemSeqId"><display/></field>
<field name="timeEntryId"><display/></field>
<field name="timesheetId" entry-name="timesheet.timesheetId">
- <hyperlink target="/workeffort/control/EditTimesheet" target-type="inter-app" description="${timesheetId}">
+ <hyperlink description="${timesheetId}" target="/workeffort/control/EditTimesheet" target-type="inter-app">
<parameter param-name="timesheetId"/>
</hyperlink>
</field>
Modified: ofbiz/trunk/applications/accounting/widget/InvoiceScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/InvoiceScreens.xml?rev=1768219&r1=1768218&r2=1768219&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/InvoiceScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/InvoiceScreens.xml Sat Nov 5 14:14:04 2016
@@ -602,7 +602,7 @@ under the License.
<actions>
<property-map resource="AccountingUiLabels" map-name="uiLabelMap" global="true"/>
<script location="component://party/groovyScripts/party/GetMyCompany.groovy"/>
- <entity-condition list="invoices" entity-name="Invoice">
+ <entity-condition entity-name="Invoice" list="invoices">
<condition-list combine="and">
<condition-expr field-name="partyId" operator="equals" from-field="myCompanyId"/>
<condition-list combine="or">
@@ -627,7 +627,7 @@ under the License.
<section>
<actions>
<set field="myCompanyId" from-field="userLogin.partyId"/>
- <entity-condition list="invoiceslistexternal" entity-name="Invoice">
+ <entity-condition entity-name="Invoice" list="invoiceslistexternal">
<condition-list combine="and">
<condition-expr field-name="partyIdFrom" operator="equals" from-field="myCompanyId"/>
<condition-expr field-name="invoiceTypeId" operator="equals" value="PURCHASE_INVOICE"/>
Modified: ofbiz/trunk/applications/accounting/widget/PaymentForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/PaymentForms.xml?rev=1768219&r1=1768218&r2=1768219&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/PaymentForms.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/PaymentForms.xml Sat Nov 5 14:14:04 2016
@@ -308,7 +308,7 @@ under the License.
odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<field name="paymentId"><hidden/></field>
<field name="invoiceId" widget-style="buttontext">
- <hyperlink target="invoiceOverview" description="${invoiceId}">
+ <hyperlink description="${invoiceId}" target="invoiceOverview">
<parameter param-name="invoiceId"/>
</hyperlink>
</field>
@@ -330,7 +330,7 @@ under the License.
odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<field name="paymentId"><hidden/></field>
<field name="toPaymentId" widget-style="buttontext">
- <hyperlink target="paymentOverview" description="[${toPaymentId}]">
+ <hyperlink description="[${toPaymentId}]" target="paymentOverview">
<parameter param-name="paymentId" from-field="toPaymentId"/>
</hyperlink>
</field>
@@ -379,12 +379,12 @@ under the License.
<field name="statusId" title="${uiLabelMap.CommonStatus}" position="1"><display-entity entity-name="StatusItem"/></field>
<field name="paymentMethodId" position="2"><display-entity entity-name="PaymentMethod" description="${description} [${paymentMethodId}]"/></field>
<field name="partyIdFrom" title="${uiLabelMap.AccountingFromParty}" position="1">
- <hyperlink target="/partymgr/control/viewprofile" target-type="inter-app" description="${partyNameResultFrom.fullName} [${payment.partyIdFrom}]">
+ <hyperlink description="${partyNameResultFrom.fullName} [${payment.partyIdFrom}]" target="/partymgr/control/viewprofile" target-type="inter-app">
<parameter param-name="partyId" from-field="payment.partyIdFrom"/>
</hyperlink>
</field>
<field name="partyIdTo" title="${uiLabelMap.AccountingToParty}" position="2">
- <hyperlink target="/partymgr/control/viewprofile" target-type="inter-app" description="${partyNameResultTo.fullName} [${payment.partyIdTo}]">
+ <hyperlink description="${partyNameResultTo.fullName} [${payment.partyIdTo}]" target="/partymgr/control/viewprofile" target-type="inter-app">
<parameter param-name="partyId" from-field="payment.partyIdTo"/>
</hyperlink>
</field>
@@ -421,23 +421,23 @@ under the License.
<field name="paymentApplicationId"><hidden/></field>
<field name="paymentId"><hidden/></field>
<field name="invoiceId" widget-style="buttontext">
- <hyperlink target="invoiceOverview" description="${invoiceId}">
+ <hyperlink description="${invoiceId}" target="invoiceOverview">
<parameter param-name="invoiceId"/>
</hyperlink>
</field>
<field name="invoiceItemSeqId" widget-style="buttontext">
- <hyperlink target="listInvoiceItems" description="${invoiceItemSeqId}">
+ <hyperlink description="${invoiceItemSeqId}" target="listInvoiceItems">
<parameter param-name="invoiceId"/>
<parameter param-name="invoiceItemSeqId"/>
</hyperlink>
</field>
<field name="toPaymentId" widget-style="buttontext">
- <hyperlink target="paymentOverview" description="${toPaymentId}">
+ <hyperlink description="${toPaymentId}" target="paymentOverview">
<parameter param-name="paymentId" from-field="toPaymentId"/>
</hyperlink>
</field>
<field name="billingAccountId" widget-style="buttontext">
- <hyperlink target="EditBillingAccount" description="${billingAccountId}">
+ <hyperlink description="${billingAccountId}" target="EditBillingAccount">
<parameter param-name="billingAccountId"/>
</hyperlink>
</field>
@@ -447,13 +447,13 @@ under the License.
<form name="AcctgTransAndEntries" type="list" list-name="AcctgTransAndEntries" extends="AcctgTransAndEntries" extends-resource="component://accounting/widget/InvoiceForms.xml">
<field name="paymentId"><hidden/></field>
- <field name="invoiceId"><hyperlink target="invoiceOverview?invoiceId=${invoiceId}" description="${invoiceId}"/></field>
+ <field name="invoiceId"><hyperlink description="${invoiceId}" target="invoiceOverview?invoiceId=${invoiceId}"/></field>
</form>
<form name="ListChecksToPrint" type="multi" list-name="payments" target="printChecks" separate-columns="true"
odd-row-style="alternate-row" default-table-style="basic-table hover-bar" target-window="_blank">
<field name="paymentId">
- <hyperlink target="paymentOverview" description="${paymentId}">
+ <hyperlink description="${paymentId}" target="paymentOverview">
<parameter param-name="paymentId"/>
</hyperlink>
</field>
@@ -471,7 +471,7 @@ under the License.
odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<field name="paymentId"><hidden/></field>
<field name="paymentId">
- <hyperlink target="paymentOverview" description="${paymentId}">
+ <hyperlink description="${paymentId}" target="paymentOverview">
<parameter param-name="paymentId"/>
</hyperlink>
</field>
@@ -522,7 +522,7 @@ under the License.
<form name="ListInvoicesByDueDate" type="list" list-name="invoicePaymentInfoList"
odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<field name="invoiceId" widget-style="buttontext">
- <hyperlink target="invoiceOverview" description="${invoiceId}">
+ <hyperlink description="${invoiceId}" target="invoiceOverview">
<parameter param-name="invoiceId"/>
</hyperlink>
</field>
@@ -539,7 +539,7 @@ under the License.
<field name="finAccountTransTypeId" title="${uiLabelMap.FormFieldTitle_finAccountTransType}" position="2"><display-entity entity-name="FinAccountTransType"/></field>
<field name="amount" position="1"><display type="currency" currency="${payment.currencyUomId}"/></field>
<field name="glReconciliationId" position="2">
- <hyperlink target="ViewGlReconciliationWithTransaction" description="${finAccountTrans.glReconciliationId}">
+ <hyperlink description="${finAccountTrans.glReconciliationId}" target="ViewGlReconciliationWithTransaction">
<parameter param-name="glReconciliationId" from-field="finAccountTrans.glReconciliationId"/>
<parameter param-name="finAccountId" from-field="finAccountTrans.finAccountId"/>
</hyperlink>
Modified: ofbiz/trunk/applications/accounting/widget/PaymentGroupForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/PaymentGroupForms.xml?rev=1768219&r1=1768218&r2=1768219&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/PaymentGroupForms.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/PaymentGroupForms.xml Sat Nov 5 14:14:04 2016
@@ -47,22 +47,22 @@ under the License.
<field name="paymentGroupTypeId" title="${uiLabelMap.FormFieldTitle_paymentGroupType}"><display-entity entity-name="PaymentGroupType"/></field>
<field name="paymentGroupName"><display description="${paymentGroupName}"/></field>
<field name="depositSlip" title=" " widget-style="buttontext" use-when="${paymentGroupTypeId == 'BATCH_PAYMENT'} @and ${groovy:org.apache.ofbiz.base.util.UtilValidate.isNotEmpty(paymentGroupMembers)}">
- <hyperlink target="DepositSlip.pdf" target-window="_BLANK" description="${uiLabelMap.AccountingInvoicePDF}" also-hidden="false">
+ <hyperlink description="${uiLabelMap.AccountingInvoicePDF}" target="DepositSlip.pdf" target-window="_BLANK" also-hidden="false">
<parameter param-name="paymentGroupId"/>
</hyperlink>
</field>
<field name="printCheck" title=" " widget-style="buttontext" use-when="${paymentGroupTypeId == 'CHECK_RUN'} @and ${groovy:org.apache.ofbiz.base.util.UtilValidate.isNotEmpty(paymentGroupMembers)}">
- <hyperlink target="printChecks.pdf" target-window="_BLANK" description="${uiLabelMap.AccountingInvoicePDF}" also-hidden="false">
+ <hyperlink description="${uiLabelMap.AccountingInvoicePDF}" target="printChecks.pdf" target-window="_BLANK" also-hidden="false">
<parameter param-name="paymentGroupId"/>
</hyperlink>
</field>
<field name="deleteLink" title=" " widget-style="buttontext" use-when="${paymentGroupTypeId == 'BATCH_PAYMENT'} @and ${paymentGroupMemberAndTransList[0].finAccountTransStatusId != 'FINACT_TRNS_APPROVED'} @and ${groovy:org.apache.ofbiz.base.util.UtilValidate.isNotEmpty(paymentGroupMembers)}">
- <hyperlink target="cancelPaymentGroup" description="${uiLabelMap.CommonCancel}" also-hidden="false">
+ <hyperlink description="${uiLabelMap.CommonCancel}" target="cancelPaymentGroup" also-hidden="false">
<parameter param-name="paymentGroupId"/>
</hyperlink>
</field>
<field name="deleteLink" title=" " widget-style="buttontext" use-when="${paymentGroupTypeId == 'CHECK_RUN'} @and ${paymentGroupMemberAndTransList[0].finAccountTransStatusId != 'FINACT_TRNS_APPROVED'} @and ${groovy:org.apache.ofbiz.base.util.UtilValidate.isNotEmpty(paymentGroupMembers)}">
- <hyperlink target="cancelCheckRunPayments" description="${uiLabelMap.CommonCancel}" also-hidden="false">
+ <hyperlink description="${uiLabelMap.CommonCancel}" target="cancelCheckRunPayments" also-hidden="false">
<parameter param-name="paymentGroupId"/>
</hyperlink>
</field>
@@ -119,7 +119,7 @@ under the License.
</row-actions>
<field name="paymentGroupId"><hidden/></field>
<field name="paymentId">
- <hyperlink target="paymentOverview" description="${paymentId}">
+ <hyperlink description="${paymentId}" target="paymentOverview">
<parameter param-name="paymentId"/>
</hyperlink>
</field>
@@ -149,7 +149,7 @@ under the License.
<field name="fromDate"><display/></field>
<field name="thruDate"><date-time/></field>
<field name="deleteLink" title="" widget-style="buttontext">
- <hyperlink target="expirePaymentGroupMember" description="${uiLabelMap.CommonCancel}" also-hidden="false">
+ <hyperlink description="${uiLabelMap.CommonCancel}" target="expirePaymentGroupMember" also-hidden="false">
<parameter param-name="paymentGroupId"/>
<parameter param-name="paymentId"/>
<parameter param-name="fromDate"/>
@@ -176,7 +176,7 @@ under the License.
<set field="partyIdTo" from-field="payment.partyIdTo"/>
</row-actions>
<field name="paymentId">
- <hyperlink target="paymentOverview" description="${paymentId}">
+ <hyperlink description="${paymentId}" target="paymentOverview">
<parameter param-name="paymentId"/>
</hyperlink>
</field>
Modified: ofbiz/trunk/applications/accounting/widget/ReportFinancialSummaryForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/ReportFinancialSummaryForms.xml?rev=1768219&r1=1768218&r2=1768219&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/ReportFinancialSummaryForms.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/ReportFinancialSummaryForms.xml Sat Nov 5 14:14:04 2016
@@ -41,7 +41,7 @@ under the License.
<field name="year" title="${uiLabelMap.CommonYear}" required-field="true"><text size="4"/></field>
<field name="organizationPartyId" required-field="false">
<drop-down allow-empty="true" no-current-selected-key="Company">
- <entity-options entity-name="PartyRoleNameDetail" description="${groupName} [${partyId}]" key-field-name="partyId">
+ <entity-options entity-name="PartyRoleNameDetail" key-field-name="partyId" description="${groupName} [${partyId}]">
<entity-constraint name="roleTypeId" value="INTERNAL_ORGANIZATIO"/>
<entity-order-by field-name="groupName"/>
</entity-options>
@@ -100,7 +100,7 @@ under the License.
<form name="IncomeStatementRevenues" type="list" list-name="revenueAccountBalanceList"
odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<field name="accountCode">
- <hyperlink target="FindAcctgTransEntries" description="${accountCode}">
+ <hyperlink description="${accountCode}" target="FindAcctgTransEntries">
<parameter param-name="glAccountId"/>
<parameter param-name="organizationPartyId"/>
</hyperlink>
@@ -111,7 +111,7 @@ under the License.
<form name="IncomeStatementExpenses" type="list" list-name="expenseAccountBalanceList"
odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<field name="accountCode">
- <hyperlink target="FindAcctgTransEntries" description="${accountCode}">
+ <hyperlink description="${accountCode}" target="FindAcctgTransEntries">
<parameter param-name="glAccountId"/>
<parameter param-name="organizationPartyId"/>
</hyperlink>
@@ -122,7 +122,7 @@ under the License.
<form name="IncomeStatementIncome" type="list" list-name="incomeAccountBalanceList"
odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<field name="accountCode">
- <hyperlink target="FindAcctgTransEntries" description="${accountCode}">
+ <hyperlink description="${accountCode}" target="FindAcctgTransEntries">
<parameter param-name="glAccountId"/>
<parameter param-name="organizationPartyId"/>
</hyperlink>
@@ -178,7 +178,7 @@ under the License.
<form name="ComparativeIncomeStatementRevenues" type="list" list-name="revenueAccountBalanceList"
odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<field name="accountCode">
- <hyperlink target="FindAcctgTransEntries" description="${accountCode}">
+ <hyperlink description="${accountCode}" target="FindAcctgTransEntries">
<parameter param-name="glAccountId"/>
<parameter param-name="organizationPartyId"/>
</hyperlink>
@@ -193,7 +193,7 @@ under the License.
<form name="ComparativeIncomeStatementExpenses" type="list" list-name="expenseAccountBalanceList"
odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<field name="accountCode">
- <hyperlink target="FindAcctgTransEntries" description="${accountCode}">
+ <hyperlink description="${accountCode}" target="FindAcctgTransEntries">
<parameter param-name="glAccountId"/>
<parameter param-name="organizationPartyId"/>
</hyperlink>
@@ -208,7 +208,7 @@ under the License.
<form name="ComparativeIncomeStatementIncome" type="list" list-name="incomeAccountBalanceList"
odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<field name="accountCode">
- <hyperlink target="FindAcctgTransEntries" description="${accountCode}">
+ <hyperlink description="${accountCode}" target="FindAcctgTransEntries">
<parameter param-name="glAccountId"/>
<parameter param-name="organizationPartyId"/>
</hyperlink>
@@ -237,7 +237,7 @@ under the License.
<form name="BalanceSheetAssets" type="list" list-name="assetAccountBalanceList"
odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<field name="accountCode">
- <hyperlink target="FindAcctgTransEntries" description="${accountCode}">
+ <hyperlink description="${accountCode}" target="FindAcctgTransEntries">
<parameter param-name="glAccountId"/>
<parameter param-name="organizationPartyId"/>
</hyperlink>
@@ -248,7 +248,7 @@ under the License.
<form name="BalanceSheetLiabilities" type="list" list-name="liabilityAccountBalanceList"
odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<field name="accountCode">
- <hyperlink target="FindAcctgTransEntries" description="${accountCode}">
+ <hyperlink description="${accountCode}" target="FindAcctgTransEntries">
<parameter param-name="glAccountId"/>
<parameter param-name="organizationPartyId"/>
</hyperlink>
@@ -259,7 +259,7 @@ under the License.
<form name="BalanceSheetEquities" type="list" list-name="equityAccountBalanceList"
odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<field name="accountCode">
- <hyperlink target="FindAcctgTransEntries" description="${accountCode}">
+ <hyperlink description="${accountCode}" target="FindAcctgTransEntries">
<parameter param-name="glAccountId"/>
<parameter param-name="organizationPartyId"/>
</hyperlink>
@@ -321,7 +321,7 @@ under the License.
<form name="ComparativeBalanceSheetAssets" type="list" list-name="assetAccountBalanceList"
odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<field name="accountCode">
- <hyperlink target="FindAcctgTransEntries" description="${accountCode}">
+ <hyperlink description="${accountCode}" target="FindAcctgTransEntries">
<parameter param-name="glAccountId"/>
<parameter param-name="organizationPartyId"/>
</hyperlink>
@@ -336,7 +336,7 @@ under the License.
<form name="ComparativeBalanceSheetLiabilities" type="list" list-name="liabilityAccountBalanceList"
odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<field name="accountCode">
- <hyperlink target="FindAcctgTransEntries" description="${accountCode}">
+ <hyperlink description="${accountCode}" target="FindAcctgTransEntries">
<parameter param-name="glAccountId"/>
<parameter param-name="organizationPartyId"/>
</hyperlink>
@@ -351,7 +351,7 @@ under the License.
<form name="ComparativeBalanceSheetEquities" type="list" list-name="equityAccountBalanceList"
odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<field name="accountCode">
- <hyperlink target="FindAcctgTransEntries" description="${accountCode}">
+ <hyperlink description="${accountCode}" target="FindAcctgTransEntries">
<parameter param-name="glAccountId"/>
<parameter param-name="organizationPartyId"/>
</hyperlink>
@@ -407,7 +407,7 @@ under the License.
<set field="closingC" value="${openingC + C}" type="BigDecimal"/>
</row-actions>
<field name="accountCode">
- <hyperlink target="FindAcctgTransEntries" description="${accountCode}">
+ <hyperlink description="${accountCode}" target="FindAcctgTransEntries">
<parameter param-name="glAccountId"/>
<parameter param-name="organizationPartyId"/>
</hyperlink>
@@ -574,7 +574,7 @@ under the License.
<form name="TrialBalanceReport" type="list" list-name="accountBalances"
odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<field name="accountCode">
- <hyperlink target="FindAcctgTransEntries" description="${accountCode}">
+ <hyperlink description="${accountCode}" target="FindAcctgTransEntries">
<parameter param-name="glAccountId"/>
<parameter param-name="organizationPartyId"/>
</hyperlink>
@@ -608,7 +608,7 @@ under the License.
<form name="CashFlowStatementOpeningCashBalance" type="list" list-name="openingCashBalanceList"
odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<field name="accountCode">
- <hyperlink target="FindAcctgTransEntries" description="${accountCode}">
+ <hyperlink description="${accountCode}" target="FindAcctgTransEntries">
<parameter param-name="glAccountId"/>
<parameter param-name="organizationPartyId"/>
</hyperlink>
@@ -622,7 +622,7 @@ under the License.
<form name="CashFlowStatementPeriodCashBalance" type="list" list-name="periodCashBalanceList"
odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<field name="accountCode">
- <hyperlink target="FindAcctgTransEntries" description="${accountCode}">
+ <hyperlink description="${accountCode}" target="FindAcctgTransEntries">
<parameter param-name="glAccountId"/>
<parameter param-name="organizationPartyId"/>
</hyperlink>
@@ -638,7 +638,7 @@ under the License.
<form name="CashFlowStatementClosingCashBalance" type="list" list-name="closingCashBalanceList"
odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<field name="accountCode">
- <hyperlink target="FindAcctgTransEntries" description="${accountCode}">
+ <hyperlink description="${accountCode}" target="FindAcctgTransEntries">
<parameter param-name="glAccountId"/>
<parameter param-name="organizationPartyId"/>
</hyperlink>
@@ -696,7 +696,7 @@ under the License.
<form name="ComparativeCashFlowStatementOpeningCashBalance" type="list" list-name="openingCashBalanceList"
odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<field name="accountCode">
- <hyperlink target="FindAcctgTransEntries" description="${accountCode}">
+ <hyperlink description="${accountCode}" target="FindAcctgTransEntries">
<parameter param-name="glAccountId"/>
<parameter param-name="organizationPartyId"/>
</hyperlink>
@@ -711,7 +711,7 @@ under the License.
<form name="ComparativeCashFlowStatementPeriodCashBalance" type="list" list-name="periodCashBalanceList"
odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<field name="accountCode">
- <hyperlink target="FindAcctgTransEntries" description="${accountCode}">
+ <hyperlink description="${accountCode}" target="FindAcctgTransEntries">
<parameter param-name="glAccountId"/>
<parameter param-name="organizationPartyId"/>
</hyperlink>
@@ -730,7 +730,7 @@ under the License.
<form name="ComparativeCashFlowStatementClosingCashBalance" type="list" list-name="closingCashBalanceList"
odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<field name="accountCode">
- <hyperlink target="FindAcctgTransEntries" description="${accountCode}">
+ <hyperlink description="${accountCode}" target="FindAcctgTransEntries">
<parameter param-name="glAccountId"/>
<parameter param-name="organizationPartyId"/>
</hyperlink>
Modified: ofbiz/trunk/applications/accounting/widget/TaxAuthorityForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/TaxAuthorityForms.xml?rev=1768219&r1=1768218&r2=1768219&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/TaxAuthorityForms.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/TaxAuthorityForms.xml Sat Nov 5 14:14:04 2016
@@ -94,7 +94,7 @@ under the License.
</field>
<field name="deleteLink" title=" " widget-style="buttontext">
- <hyperlink target="deleteTaxAuthorityCategory" description="${uiLabelMap.CommonDelete}" also-hidden="false">
+ <hyperlink description="${uiLabelMap.CommonDelete}" target="deleteTaxAuthorityCategory" also-hidden="false">
<parameter param-name="taxAuthPartyId"/>
<parameter param-name="taxAuthGeoId"/>
<parameter param-name="productCategoryId"/>
@@ -146,7 +146,7 @@ under the License.
<field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field>
<field name="deleteLink" title=" " widget-style="buttontext">
- <hyperlink target="deleteTaxAuthorityAssoc" description="${uiLabelMap.CommonDelete}" also-hidden="false">
+ <hyperlink description="${uiLabelMap.CommonDelete}" target="deleteTaxAuthorityAssoc" also-hidden="false">
<parameter param-name="taxAuthPartyId"/>
<parameter param-name="taxAuthGeoId"/>
<parameter param-name="toTaxAuthPartyId"/>
@@ -204,7 +204,7 @@ under the License.
</field>
<field name="deleteLink" title=" " widget-style="buttontext">
- <hyperlink target="deleteTaxAuthorityGlAccount" description="${uiLabelMap.CommonDelete}" also-hidden="false">
+ <hyperlink description="${uiLabelMap.CommonDelete}" target="deleteTaxAuthorityGlAccount" also-hidden="false">
<parameter param-name="taxAuthPartyId"/>
<parameter param-name="taxAuthGeoId"/>
<parameter param-name="glAccountId"/>
@@ -267,7 +267,7 @@ under the License.
<field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field>
<field name="deleteLink" title=" " widget-style="buttontext">
- <hyperlink target="deleteTaxAuthorityRateProduct" description="${uiLabelMap.CommonDelete}" also-hidden="false">
+ <hyperlink description="${uiLabelMap.CommonDelete}" target="deleteTaxAuthorityRateProduct" also-hidden="false">
<parameter param-name="taxAuthPartyId"/>
<parameter param-name="taxAuthGeoId"/>
<parameter param-name="taxAuthorityRateSeqId"/>
@@ -362,7 +362,7 @@ under the License.
<field name="isNexus"><display/></field>
<field name="editLink" title=" " widget-style="buttontext">
- <hyperlink target="EditTaxAuthorityPartyInfo" description="${uiLabelMap.CommonEdit}" also-hidden="false">
+ <hyperlink description="${uiLabelMap.CommonEdit}" target="EditTaxAuthorityPartyInfo" also-hidden="false">
<parameter param-name="taxAuthPartyId"/>
<parameter param-name="taxAuthGeoId"/>
<parameter param-name="partyId"/>
@@ -370,7 +370,7 @@ under the License.
</hyperlink>
</field>
<field name="deleteLink" title=" " widget-style="buttontext">
- <hyperlink target="deleteTaxAuthorityPartyInfo" description="${uiLabelMap.CommonDelete}" also-hidden="false">
+ <hyperlink description="${uiLabelMap.CommonDelete}" target="deleteTaxAuthorityPartyInfo" also-hidden="false">
<parameter param-name="taxAuthPartyId"/>
<parameter param-name="taxAuthGeoId"/>
<parameter param-name="partyId"/>
Modified: ofbiz/trunk/applications/accounting/widget/TransactionForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/TransactionForms.xml?rev=1768219&r1=1768218&r2=1768219&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/TransactionForms.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/TransactionForms.xml Sat Nov 5 14:14:04 2016
@@ -97,7 +97,7 @@ under the License.
<form name="ViewGatewayResponseRelations" type="single" target="" title=""
header-row-style="header-row" default-table-style="basic-table">
<field name="orderId" widget-style="buttontext">
- <hyperlink also-hidden="false" target-type="inter-app" description="${orderId}" target="/ordermgr/control/orderview">
+ <hyperlink description="${orderId}" target="/ordermgr/control/orderview" also-hidden="false" target-type="inter-app">
<parameter param-name="orderId"/>
</hyperlink>
</field>
Modified: ofbiz/trunk/applications/accounting/widget/ap/forms/InvoiceForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/ap/forms/InvoiceForms.xml?rev=1768219&r1=1768218&r2=1768219&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/ap/forms/InvoiceForms.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/ap/forms/InvoiceForms.xml Sat Nov 5 14:14:04 2016
@@ -50,12 +50,12 @@ under the License.
<field name="statusId" title="${uiLabelMap.CommonStatus}"><display-entity entity-name="StatusItem"/></field>
<field name="description"><display/></field>
<field name="partyIdFrom">
- <hyperlink target="/partymgr/control/viewprofile" description="${partyNameResultFrom.fullName} [${partyIdFrom}]" target-type="inter-app">
+ <hyperlink description="${partyNameResultFrom.fullName} [${partyIdFrom}]" target="/partymgr/control/viewprofile" target-type="inter-app">
<parameter param-name="partyId" from-field="partyIdFrom"/>
</hyperlink>
</field>
<field name="partyIdTo" parameter-name="partyId">
- <hyperlink target="/partymgr/control/viewprofile" description="${partyNameResultTo.fullName} [${partyId}]" target-type="inter-app">
+ <hyperlink description="${partyNameResultTo.fullName} [${partyId}]" target="/partymgr/control/viewprofile" target-type="inter-app">
<parameter param-name="partyId" from-field="partyId"/>
</hyperlink>
</field>
Modified: ofbiz/trunk/applications/accounting/widget/ap/forms/VendorForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/ap/forms/VendorForms.xml?rev=1768219&r1=1768218&r2=1768219&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/ap/forms/VendorForms.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/ap/forms/VendorForms.xml Sat Nov 5 14:14:04 2016
@@ -31,7 +31,7 @@ under the License.
</service>
</actions>
<field name="partyId" title="${uiLabelMap.PartyPartyId}" widget-style="buttontext">
- <hyperlink also-hidden="false" description="${partyId}" target="editVendor">
+ <hyperlink description="${partyId}" target="editVendor" also-hidden="false">
<parameter param-name="partyId"/>
</hyperlink>
</field>
Modified: ofbiz/trunk/applications/accounting/widget/ar/forms/ArPaymentForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/ar/forms/ArPaymentForms.xml?rev=1768219&r1=1768218&r2=1768219&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/ar/forms/ArPaymentForms.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/ar/forms/ArPaymentForms.xml Sat Nov 5 14:14:04 2016
@@ -37,7 +37,7 @@ under the License.
<field name="noConditionFind"><hidden/></field>
<field name="cardType" tooltip="Select Credit Card from above list of Payment Method Types.">
<drop-down allow-empty="true">
- <entity-options entity-name="Enumeration" description="${enumCode}" key-field-name="enumCode">
+ <entity-options entity-name="Enumeration" key-field-name="enumCode" description="${enumCode}">
<entity-constraint name="enumTypeId" operator="equals" value="CREDIT_CARD_TYPE"/>
<entity-order-by field-name="enumId"/>
</entity-options>
Modified: ofbiz/trunk/applications/accounting/widget/ar/forms/InvoiceForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/ar/forms/InvoiceForms.xml?rev=1768219&r1=1768218&r2=1768219&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/ar/forms/InvoiceForms.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/ar/forms/InvoiceForms.xml Sat Nov 5 14:14:04 2016
@@ -51,12 +51,12 @@ under the License.
<field name="statusId" title="${uiLabelMap.CommonStatus}"><display-entity entity-name="StatusItem"/></field>
<field name="description"><display/></field>
<field name="partyIdFrom">
- <hyperlink target="/partymgr/control/viewprofile" description="${partyNameResultFrom.fullName} [${partyIdFrom}]" target-type="inter-app">
+ <hyperlink description="${partyNameResultFrom.fullName} [${partyIdFrom}]" target="/partymgr/control/viewprofile" target-type="inter-app">
<parameter param-name="partyId" from-field="partyIdFrom"/>
</hyperlink>
</field>
<field name="partyIdTo">
- <hyperlink target="/partymgr/control/viewprofile" description="${partyNameResultTo.fullName} [${partyId}]" target-type="inter-app">
+ <hyperlink description="${partyNameResultTo.fullName} [${partyId}]" target="/partymgr/control/viewprofile" target-type="inter-app">
<parameter param-name="partyId"/>
</hyperlink>
</field>
Modified: ofbiz/trunk/applications/commonext/minilang/SystemInfoServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/commonext/minilang/SystemInfoServices.xml?rev=1768219&r1=1768218&r2=1768219&view=diff
==============================================================================
--- ofbiz/trunk/applications/commonext/minilang/SystemInfoServices.xml (original)
+++ ofbiz/trunk/applications/commonext/minilang/SystemInfoServices.xml Sat Nov 5 14:14:04 2016
@@ -38,7 +38,7 @@ under the License.
</entity-and>
<if-not-empty field="ulList">
<set field="haveUserLogin" value="true"/>
- <first-from-list entry="userLogin" list="ulList"/>
+ <first-from-list list="ulList" entry="userLogin"/>
<set field="paMap.ownerUserLoginId" from-field="userLogin.userLoginId"/>
<set field="paMap.portalPortletId" value="SystemInfoNotes"/>
<call-service service-name="getPortletAttributes" in-map-name="paMap">
@@ -48,7 +48,7 @@ under the License.
</simple-method>
<simple-method method-name="deleteSystemInfoNote" short-description="Delete SystemInfo Note">
- <entity-one value-field="noteData" entity-name="NoteData"/>
+ <entity-one entity-name="NoteData" value-field="noteData"/>
<remove-related relation-name="CustRequestItemNote" value-field="noteData"/>
<remove-related relation-name="CustRequestNote" value-field="noteData"/>
<remove-related relation-name="MarketingCampaignNote" value-field="noteData"/>
@@ -82,7 +82,7 @@ under the License.
</entity-condition>
<if-compare field="comCount" value="0" operator="greater">
<set field="status.noteInfo" value="Open communication events: ${comCount}"/>
- <first-from-list entry="comm" list="comms"/>
+ <first-from-list list="comms" entry="comm"/>
<set field="status.noteDateTime" from-field="comm.entryDate"/>
<field-to-list field="status" list="systemInfoStatus"/>
<clear-field field="status"/>
@@ -103,7 +103,7 @@ under the License.
</entity-count>
<if-compare field="assignCount" value="0" operator="greater">
<set field="status.noteInfo" value="Assigned and not completed tasks: ${assignCount}"/>
- <first-from-list entry="assign" list="assigns"/>
+ <first-from-list list="assigns" entry="assign"/>
<set field="status.noteDateTime" from-field="assign.fromDate"/>
<field-to-list field="status" list="systemInfoStatus"/>
</if-compare>
Modified: ofbiz/trunk/applications/commonext/minilang/setup/SetupEvents.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/commonext/minilang/setup/SetupEvents.xml?rev=1768219&r1=1768218&r2=1768219&view=diff
==============================================================================
--- ofbiz/trunk/applications/commonext/minilang/setup/SetupEvents.xml (original)
+++ ofbiz/trunk/applications/commonext/minilang/setup/SetupEvents.xml Sat Nov 5 14:14:04 2016
@@ -368,7 +368,7 @@
<entity-and entity-name="PartyAndPostalAddress" list="listPartyPostalAddress" filter-by-date="true">
<field-map field-name="partyId" from-field="parameters.partyId"/>
</entity-and>
- <first-from-list entry="partyPostalAddress" list="listPartyPostalAddress"/>
+ <first-from-list list="listPartyPostalAddress" entry="partyPostalAddress"/>
<sequenced-id sequence-name="ContactMech" field="partyPostalAddress.contactMechId"/>
<set-service-fields service-name="createPostalAddress" map="partyPostalAddress" to-map="addressContext"/>
<call-service service-name="createPostalAddress" in-map-name="addressContext">
@@ -604,7 +604,7 @@
<call-service service-name="createProductPrice" in-map-name="createDefaultPriceMap"/>
<else>
- <first-from-list entry="defaultPrice" list="defaultPriceValues"/>
+ <first-from-list list="defaultPriceValues" entry="defaultPrice"/>
<set field="updateDefaultPriceMap.productId" from-field="productId"/>
<set field="updateDefaultPriceMap.price" from-field="parameters.defaultPrice" type="BigDecimal"/>
<set field="updateDefaultPriceMap.productPricePurposeId" from-field="defaultPrice.productPricePurposeId"/>
@@ -636,7 +636,7 @@
<call-service service-name="createProductPrice" in-map-name="createAverageCostMap"/>
<else>
- <first-from-list entry="averageCost" list="averageCostValues"/>
+ <first-from-list list="averageCostValues" entry="averageCost"/>
<set field="updateAverageCostMap.productId" from-field="productId"/>
<set field="updateAverageCostMap.productPricePurposeId" from-field="averageCost.productPricePurposeId"/>
<set field="updateAverageCostMap.productPriceTypeId" from-field="averageCost.productPriceTypeId"/>
Modified: ofbiz/trunk/applications/commonext/widget/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/commonext/widget/CommonScreens.xml?rev=1768219&r1=1768218&r2=1768219&view=diff
==============================================================================
--- ofbiz/trunk/applications/commonext/widget/CommonScreens.xml (original)
+++ ofbiz/trunk/applications/commonext/widget/CommonScreens.xml Sat Nov 5 14:14:04 2016
@@ -64,7 +64,7 @@ under the License.
<field-map field-name="partyId" from-field="defaultOrganizationPartyId"/>
<field-map field-name="roleTypeId" value="INTERNAL_ORGANIZATIO"/>
</entity-one>
- <entity-one value-field="orgPartyLogoMap" entity-name="PartyGroup">
+ <entity-one entity-name="PartyGroup" value-field="orgPartyLogoMap">
<field-map field-name="partyId" from-field="defaultOrganizationPartyId"/>
</entity-one>
<entity-and entity-name="PartyContent" list="orgPartyContentMap" filter-by-date="true">
Modified: ofbiz/trunk/applications/commonext/widget/SystemInfoForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/commonext/widget/SystemInfoForms.xml?rev=1768219&r1=1768218&r2=1768219&view=diff
==============================================================================
--- ofbiz/trunk/applications/commonext/widget/SystemInfoForms.xml (original)
+++ ofbiz/trunk/applications/commonext/widget/SystemInfoForms.xml Sat Nov 5 14:14:04 2016
@@ -24,9 +24,9 @@ under the License.
<form name="SystemInfoNotes" type="list" list-name="systemInfoNotes"
odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar">
<field name="noteDateTime" title="${uiLabelMap.CommonExtDateInfoCreated}"><display type="date-time"/></field>
- <field name="noteInfo" title="${uiLabelMap.CommonExtSystemInfoNote}"><hyperlink target="${moreInfoUrl}${groovy: if (moreInfoItemName &&moreInfoItemId)"?" + moreInfoItemName + "=" + moreInfoItemId + "&id=" + moreInfoItemId;}" target-type="inter-app" description="${noteInfo}"></hyperlink></field>
+ <field name="noteInfo" title="${uiLabelMap.CommonExtSystemInfoNote}"><hyperlink description="${noteInfo}" target="${moreInfoUrl}${groovy: if (moreInfoItemName &&moreInfoItemId)"?" + moreInfoItemName + "=" + moreInfoItemId + "&id=" + moreInfoItemId;}" target-type="inter-app"></hyperlink></field>
<field name="deleteLink" title=" " widget-style="buttontext" >
- <hyperlink target="deleteSystemInfoNote" description="${uiLabelMap.CommonDelete}">
+ <hyperlink description="${uiLabelMap.CommonDelete}" target="deleteSystemInfoNote">
<parameter param-name="noteId"/>
<parameter param-name="portalPageId" from-field="parameters.portalPageId"/>
</hyperlink>
@@ -46,7 +46,7 @@ under the License.
<form name="SystemInfoStatus" type="list" list-name="systemInfoStatus"
odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar">
<field name="noteDateTime" title="${uiLabelMap.CommonExtDateLastChanged}"><display type="date-time"/></field>
- <field name="noteInfo" title="${uiLabelMap.CommonExtSystemInfoStatus}"><hyperlink target="${moreInfoUrl}" target-type="inter-app" description="${noteInfo}"></hyperlink></field>
+ <field name="noteInfo" title="${uiLabelMap.CommonExtSystemInfoStatus}"><hyperlink description="${noteInfo}" target="${moreInfoUrl}" target-type="inter-app"></hyperlink></field>
</form>
<form name="CreateSystemInfoNote" type="single" target="createSystemInfoNote">
Modified: ofbiz/trunk/applications/commonext/widget/ofbizsetup/SetupForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/commonext/widget/ofbizsetup/SetupForms.xml?rev=1768219&r1=1768218&r2=1768219&view=diff
==============================================================================
--- ofbiz/trunk/applications/commonext/widget/ofbizsetup/SetupForms.xml (original)
+++ ofbiz/trunk/applications/commonext/widget/ofbizsetup/SetupForms.xml Sat Nov 5 14:14:04 2016
@@ -270,17 +270,17 @@
<entity-one entity-name="PartyGroup" value-field="partyGroup"/>
</row-actions>
<field name="partyId" title="${uiLabelMap.AccountingCompanies}" use-when="partyAcctgPreference==null" widget-style="buttontext">
- <hyperlink target="viewprofile" description="${partyGroup.groupName} [${partyId}]">
+ <hyperlink description="${partyGroup.groupName} [${partyId}]" target="viewprofile">
<parameter param-name="partyId"/>
</hyperlink>
</field>
<field name="partyId" title="${uiLabelMap.AccountingCompanies}" use-when="partyAcctgPreference!=null" widget-style="buttontext">
- <hyperlink target="showMessage" description="${partyGroup.groupName} [${partyId}]">
+ <hyperlink description="${partyGroup.groupName} [${partyId}]" target="showMessage">
<parameter param-name="partyId"/>
</hyperlink>
</field>
<field name="setToComplete" title=" " use-when="partyAcctgPreference==null" widget-style="buttontext">
- <hyperlink target="OrganizationToComplete" description="${uiLabelMap.SetupSetToComplete}">
+ <hyperlink description="${uiLabelMap.SetupSetToComplete}" target="OrganizationToComplete">
<parameter param-name="partyId"/>
</hyperlink>
</field>
@@ -288,7 +288,7 @@
<form name="EditCustomer" extends="EditPerson" extends-resource="component://party/widget/partymgr/PartyForms.xml">
<field name="cancelLink" title=" " widget-style="smallSubmit">
- <hyperlink target="${donePage}" also-hidden="false" description="${uiLabelMap.CommonCancelDone}">
+ <hyperlink description="${uiLabelMap.CommonCancelDone}" target="${donePage}" also-hidden="false">
<parameter param-name="partyId" from-field="parameters.partyId"/>
</hyperlink>
</field>
Modified: ofbiz/trunk/applications/content/minilang/blog/BlogServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/minilang/blog/BlogServices.xml?rev=1768219&r1=1768218&r2=1768219&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/minilang/blog/BlogServices.xml (original)
+++ ofbiz/trunk/applications/content/minilang/blog/BlogServices.xml Sat Nov 5 14:14:04 2016
@@ -215,7 +215,7 @@
<field-map field-name="contentIdTo" from-field="imageContent.contentId"/>
<field-map field-name="mapKey" value="IMAGE"/>
</entity-and>
- <first-from-list entry="oldAssoc" list="oldAssocs"/>
+ <first-from-list list="oldAssocs" entry="oldAssoc"/>
<now-timestamp field="oldAssoc.thruDate"/>
<store-value value-field="oldAssoc"/>
</if-not-empty>
Modified: ofbiz/trunk/applications/content/minilang/compdoc/CompDocServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/minilang/compdoc/CompDocServices.xml?rev=1768219&r1=1768218&r2=1768219&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/minilang/compdoc/CompDocServices.xml (original)
+++ ofbiz/trunk/applications/content/minilang/compdoc/CompDocServices.xml Sat Nov 5 14:14:04 2016
@@ -555,8 +555,8 @@ under the License.
<set from-field="thisContentId" field="map.contentId"/>
<set from-field="thisContentRevisionSeqId" field="map.contentRevisionSeqId"/>
<call-service service-name="getFinalApprovalStatus" in-map-name="map">
- <result-to-field field="finalApprovalStatusId" result-name="approvalStatusId"/>
- <result-to-field field="contentApprovalList" result-name="contentApprovalList"/>
+ <result-to-field result-name="approvalStatusId" field="finalApprovalStatusId"/>
+ <result-to-field result-name="contentApprovalList" field="contentApprovalList"/>
</call-service>
<!-- determine status of previous approvals --><!-- finalApprovalStatusId is the applicable status from previous approvals -->
<log level="info" message="cloneContentApprovals(2)- finalApprovalStatusId : ${finalApprovalStatusId} "/>
Modified: ofbiz/trunk/applications/content/minilang/content/ContentEvents.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/minilang/content/ContentEvents.xml?rev=1768219&r1=1768218&r2=1768219&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/minilang/content/ContentEvents.xml (original)
+++ ofbiz/trunk/applications/content/minilang/content/ContentEvents.xml Sat Nov 5 14:14:04 2016
@@ -52,7 +52,7 @@ under the License.
<session-to-field field="context.userLogin" session-name="userLogin"/>
<call-service in-map-name="context" service-name="createContent">
- <result-to-field field="contentId" result-name="contentId"/>
+ <result-to-field result-name="contentId" field="contentId"/>
<result-to-request request-name="contentId" result-name="contentId"/>
</call-service>
<if-empty field="contentId">
@@ -113,7 +113,7 @@ under the License.
<set field="context.targetOperationList" from-field="targetOperationList"/>
<session-to-field field="context.userLogin" session-name="userLogin"/>
<call-service in-map-name="context" service-name="updateContent">
- <result-to-field field="contentId" result-name="contentId"/>
+ <result-to-field result-name="contentId" field="contentId"/>
</call-service>
<check-errors/>
</simple-method>
Modified: ofbiz/trunk/applications/content/minilang/content/ContentPermissionEvents.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/minilang/content/ContentPermissionEvents.xml?rev=1768219&r1=1768218&r2=1768219&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/minilang/content/ContentPermissionEvents.xml (original)
+++ ofbiz/trunk/applications/content/minilang/content/ContentPermissionEvents.xml Sat Nov 5 14:14:04 2016
@@ -40,7 +40,7 @@ under the License.
<session-to-field field="context.userLogin" session-name="userLogin"/>
<call-service in-map-name="context" service-name="checkContentPermission">
- <result-to-field field="permissionStatus" result-name="permissionStatus"/>
+ <result-to-field result-name="permissionStatus" field="permissionStatus"/>
</call-service>
<log level="always" message="permissionStatus:${permissionStatus}"/>
Modified: ofbiz/trunk/applications/content/minilang/content/ContentServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/minilang/content/ContentServices.xml?rev=1768219&r1=1768218&r2=1768219&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/minilang/content/ContentServices.xml (original)
+++ ofbiz/trunk/applications/content/minilang/content/ContentServices.xml Sat Nov 5 14:14:04 2016
@@ -37,7 +37,7 @@
<field-map field-name="statusTypeId" value="CONTENT_STATUS"/>
<order-by field-name="sequenceId"/>
</entity-and>
- <first-from-list entry="statusItem" list="contentStatus"/>
+ <first-from-list list="contentStatus" entry="statusItem"/>
<set field="content.statusId" from-field="statusItem.statusId"/>
</if-empty>
@@ -206,8 +206,8 @@
<log level="always" message="assocContent, parameters:${parameters}"/>
<log level="always" message="assocContent, context:${context}"/>
<call-service in-map-name="parameters" service-name="checkAssocPermission">
- <result-to-field field="permissionStatus" result-name="permissionStatus"/>
- <result-to-field field="rolesOut" result-name="rolesOut"/>
+ <result-to-field result-name="permissionStatus" field="permissionStatus"/>
+ <result-to-field result-name="rolesOut" field="rolesOut"/>
</call-service>
<log level="always" message="permissionStatus:${permissionStatus}"/>
@@ -481,7 +481,7 @@
-->
<now-timestamp field="nowTimestamp"/>
- <set-service-fields to-map="persistIn" service-name="persistContentAndAssoc" map="parameters"/>
+ <set-service-fields service-name="persistContentAndAssoc" map="parameters" to-map="persistIn"/>
<!-- let's take a guess at what the dataResourceTypeId should be if it is empty -->
<if-empty field="persistIn.dataResourceTypeId">
<log level="info" message="persistIn.drMimeTypeId: ${persistIn.drMimeTypeId}"/>
@@ -530,7 +530,7 @@
</check-permission>
<check-errors/>
-->
- <set-service-fields to-map="persistIn" service-name="persistContentAndAssoc" map="parameters"/>
+ <set-service-fields service-name="persistContentAndAssoc" map="parameters" to-map="persistIn"/>
<call-service service-name="persistContentAndAssoc" in-map-name="persistIn">
<results-to-map map-name="persistOut"/>
</call-service>
@@ -867,7 +867,7 @@
<set field="filterByDate" from-field="parameters.filterByDate" default-value="true" type="Boolean"/>
<set field="useCache" from-field="parameters.useCache" default-value="true" type="Boolean"/>
- <entity-condition list="viewList" entity-name="ContentAssocViewTo" filter-by-date="${filterByDate}" use-cache="${useCache}">
+ <entity-condition entity-name="ContentAssocViewTo" list="viewList" filter-by-date="${filterByDate}" use-cache="${useCache}">
<condition-list combine="and">
<condition-expr field-name="contentIdStart" from-field="parameters.contentId"/>
<condition-expr field-name="caContentAssocTypeId" from-field="parameters.contentAssocTypeId" ignore-if-empty="true"/>
@@ -923,7 +923,7 @@
</condition-list>
</entity-condition>
<clear-field field="view2"/>
- <first-from-list entry="view2" list="viewList"/>
+ <first-from-list list="viewList" entry="view2"/>
<clear-field field="map"/>
<set field="map.contentIdFrom" from-field="view.contentId"/>
<set field="map.dataResourceIdFrom" from-field="view.dataResourceId"/>
@@ -979,7 +979,7 @@
</or>
</condition>
<then>
- <entity-condition list="contents" entity-name="Content">
+ <entity-condition entity-name="Content" list="contents">
<condition-list combine="and">
<condition-expr field-name="contentName" operator="not-equals" from-field="nullField"/>
<condition-list combine="or">
@@ -993,7 +993,7 @@
</entity-condition>
</then>
<else>
- <entity-condition list="contents" entity-name="Content">
+ <entity-condition entity-name="Content" list="contents">
<condition-list combine="and">
<condition-expr field-name="contentName" operator="not-equals" from-field="nullField"/>
<condition-expr field-name="contentId" operator="equals" from-field="parameters.contentId"/>
@@ -1010,7 +1010,7 @@
</if>
<iterate list="contents" entry="content">
<set field="localeString" from-field="content.localeString" default-value="${defaultLocaleString}"/>
- <entity-condition list="contentAssocDataResources" entity-name="ContentAssocDataResourceViewTo">
+ <entity-condition entity-name="ContentAssocDataResourceViewTo" list="contentAssocDataResources">
<condition-list combine="and">
<condition-expr field-name="caContentAssocTypeId" operator="equals" value="ALTERNATIVE_URL"/>
<condition-expr field-name="contentIdStart" operator="equals" from-field="content.contentId"/>
@@ -1102,7 +1102,7 @@
<iterate list="parameters.productCategories" entry="productCategoryList">
<!-- Create Content Alternative URLs for Product Category Content -->
- <entity-condition list="productCategoryContentAndInfoList" entity-name="ProductCategoryContentAndInfo" filter-by-date="true" use-cache="true">
+ <entity-condition entity-name="ProductCategoryContentAndInfo" list="productCategoryContentAndInfoList" filter-by-date="true" use-cache="true">
<condition-list combine="and">
<condition-expr field-name="productCategoryId" from-field="productCategoryList.productCategoryId"/>
<condition-expr field-name="prodCatContentTypeId" operator="not-equals" value="ALTERNATIVE_URL"/>
@@ -1131,7 +1131,7 @@
</iterate>
<!-- Create Content Alternative URLs for Product Content -->
- <entity-condition list="productCategoryMemberList" entity-name="ProductCategoryMember" filter-by-date="true" use-cache="true">
+ <entity-condition entity-name="ProductCategoryMember" list="productCategoryMemberList" filter-by-date="true" use-cache="true">
<condition-list combine="and">
<condition-expr field-name="productCategoryId" from-field="productCategoryList.productCategoryId"/>
</condition-list>
@@ -1139,7 +1139,7 @@
</entity-condition>
<iterate list="productCategoryMemberList" entry="productCategoryMember">
<set field="product.productId" from-field="productCategoryMember.productId"/>
- <entity-condition list="productContentAndInfoList" entity-name="ProductContentAndInfo" filter-by-date="true" use-cache="true">
+ <entity-condition entity-name="ProductContentAndInfo" list="productContentAndInfoList" filter-by-date="true" use-cache="true">
<condition-list combine="and">
<condition-expr field-name="productId" from-field="product.productId"/>
<condition-expr field-name="productContentTypeId" operator="not-equals" value="ALTERNATIVE_URL"/>
@@ -1232,7 +1232,7 @@
</entity-and>
<iterate list="productCategoryRollups" entry="productCategoryRollup">
<!-- append product category to list -->
- <entity-one value-field="productCategory" entity-name="ProductCategory">
+ <entity-one entity-name="ProductCategory" value-field="productCategory">
<field-map field-name="productCategoryId" from-field="productCategoryRollup.productCategoryId"/>
</entity-one>
<field-to-list list="parameters.productCategories" field="productCategory"/>
Modified: ofbiz/trunk/applications/content/minilang/data/DataServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/minilang/data/DataServices.xml?rev=1768219&r1=1768218&r2=1768219&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/minilang/data/DataServices.xml (original)
+++ ofbiz/trunk/applications/content/minilang/data/DataServices.xml Sat Nov 5 14:14:04 2016
@@ -46,7 +46,7 @@ under the License.
<field-map field-name="statusTypeId" value="CONTENT_STATUS"/>
<order-by field-name="sequenceId"/>
</entity-and>
- <first-from-list entry="statusItem" list="contentStatus"/>
+ <first-from-list list="contentStatus" entry="statusItem"/>
<set field="newEntity.statusId" from-field="statusItem.statusId"/>
</if-empty>
@@ -64,7 +64,7 @@ under the License.
</simple-method>
<simple-method method-name="createDataResourceAndAssocToContent" short-description="Create a Data Resource and return the data resource type">
- <entity-one value-field="content" entity-name="Content"/>
+ <entity-one entity-name="Content" value-field="content"/>
<if-empty field="content">
<add-error>
<fail-property resource="ContentErrorUiLabels" property="layoutEvents.content_empty"/>
@@ -72,7 +72,7 @@ under the License.
<check-errors/>
</if-empty>
- <set-service-fields service-name="createDataResource" to-map="dataResourceCtx" map="parameters"/>
+ <set-service-fields service-name="createDataResource" map="parameters" to-map="dataResourceCtx"/>/>
<call-service service-name="createDataResource" in-map-name="dataResourceCtx">
<result-to-field result-name="dataResource"/>
</call-service>
@@ -344,7 +344,7 @@ under the License.
<set from-field="parameters._uploadedFile_contentType" field="extenLookup.mimeTypeId"/>
<find-by-and entity-name="FileExtension" map="extenLookup" list="extensions"/>
- <first-from-list entry="extension" list="extensions"/>
+ <first-from-list list="extensions" entry="extension"/>
<set from-field="parameters._uploadedFile_fileName" field="dataResource.dataResourceName"/>
<set value="${uploadPath}/${dataResource.dataResourceId}" field="dataResource.objectInfo"/>
@@ -414,7 +414,7 @@ under the License.
<set from-field="parameters._uploadedFile_contentType" field="extenLookup.mimeTypeId"/>
<find-by-and entity-name="FileExtension" map="extenLookup" list="extensions"/>
- <first-from-list entry="extension" list="extensions"/>
+ <first-from-list list="extensions" entry="extension"/>
<set from-field="parameters._uploadedFile_fileName" field="dataResource.dataResourceName"/>
<set from-field="parameters._uploadedFile_contentType" field="dataResource.mimeTypeId"/>
@@ -728,7 +728,7 @@ under the License.
<set from-field="parameters._uploadedFile_contentType" field="extenLookup.mimeTypeId"/>
<find-by-and entity-name="FileExtension" map="extenLookup" list="extensions"/>
- <first-from-list entry="extension" list="extensions"/>
+ <first-from-list list="extensions" entry="extension"/>
<set from-field="parameters._uploadedFile_fileName" field="dataResource.dataResourceName"/>
<set from-field="parameters._uploadedFile_contentType" field="dataResource.mimeTypeId"/>
Modified: ofbiz/trunk/applications/content/minilang/layout/LayoutEvents.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/minilang/layout/LayoutEvents.xml?rev=1768219&r1=1768218&r2=1768219&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/minilang/layout/LayoutEvents.xml (original)
+++ ofbiz/trunk/applications/content/minilang/layout/LayoutEvents.xml Sat Nov 5 14:14:04 2016
@@ -37,8 +37,8 @@ under the License.
<set field="context.objectInfo" from-field="parameters.drObjectInfo"/>
<set field="context.dataResourceTypeId" value="LOCAL_FILE"/>
<call-service in-map-name="context" service-name="persistContentAndAssoc">
- <result-to-field field="contentId" result-name="contentId"/>
- <result-to-field field="dataResourceId" result-name="dataResourceId"/>
+ <result-to-field result-name="contentId" field="contentId"/>
+ <result-to-field result-name="dataResourceId" field="dataResourceId"/>
</call-service>
<if-empty field="contentId">
<add-error>
@@ -64,7 +64,7 @@ under the License.
<set field="context.targetOperationList" from-field="targetOperationList"/>
<session-to-field field="context.userLogin" session-name="userLogin"/>
<call-service in-map-name="context" service-name="checkContentPermission">
- <result-to-field field="permissionStatus" result-name="permissionStatus"/>
+ <result-to-field result-name="permissionStatus" field="permissionStatus"/>
</call-service>
<if-compare field="permissionStatus" operator="not-equals" value="granted" type="String">
<add-error>
@@ -113,10 +113,10 @@ under the License.
<set field="context.contentTypeId" value="DOCUMENT"/>
<call-service in-map-name="context" service-name="persistContentAndAssoc">
- <result-to-field field="context2.activeContentId" result-name="contentId"/>
- <result-to-field field="dataResourceId" result-name="dataResourceId"/>
- <result-to-field field="context2.contentAssocTypeId" result-name="contentAssocTypeId"/>
- <result-to-field field="context2.fromDate" result-name="fromDate"/>
+ <result-to-field result-name="contentId" field="context2.activeContentId"/>
+ <result-to-field result-name="dataResourceId" field="dataResourceId"/>
+ <result-to-field result-name="contentAssocTypeId" field="context2.contentAssocTypeId"/>
+ <result-to-field result-name="fromDate" field="context2.fromDate"/>
</call-service>
<check-errors/>
@@ -129,7 +129,7 @@ under the License.
<set field="context2.mapKey" from-field="parameters.mapKey"/>
<if-not-empty field="context2.activeContentId">
<call-service in-map-name="context2" service-name="deactivateAssocs">
- <result-to-field field="deactivateList" result-name="deactivateList"/>
+ <result-to-field result-name="deactivateList" field="deactivateList"/>
</call-service>
</if-not-empty>
@@ -209,10 +209,10 @@ under the License.
<set field="context.contentTypeId" value="DOCUMENT"/>
<call-service in-map-name="context" service-name="persistContentAndAssoc">
- <result-to-field field="context2.activeContentId" result-name="contentId"/>
- <result-to-field field="dataResourceId" result-name="dataResourceId"/>
- <result-to-field field="context2.contentAssocTypeId" result-name="contentAssocTypeId"/>
- <result-to-field field="context2.fromDate" result-name="fromDate"/>
+ <result-to-field result-name="contentId" field="context2.activeContentId"/>
+ <result-to-field result-name="dataResourceId" field="dataResourceId"/>
+ <result-to-field result-name="contentAssocTypeId" field="context2.contentAssocTypeId"/>
+ <result-to-field result-name="fromDate" field="context2.fromDate"/>
</call-service>
<check-errors/>
@@ -225,7 +225,7 @@ under the License.
<set field="context2.mapKey" from-field="formInput.mapKey"/>
<if-not-empty field="context2.activeContentId">
<call-service in-map-name="context2" service-name="deactivateAssocs">
- <result-to-field field="deactivateList" result-name="deactivateList"/>
+ <result-to-field result-name="deactivateList" field="deactivateList"/>
</call-service>
</if-not-empty>
@@ -267,10 +267,10 @@ under the License.
<set field="context.contentTypeId" value="DOCUMENT"/>
<call-service in-map-name="context" service-name="persistContentAndAssoc">
- <result-to-field field="context2.activeContentId" result-name="contentId"/>
- <result-to-field field="dataResourceId" result-name="dataResourceId"/>
- <result-to-field field="context2.contentAssocTypeId" result-name="contentAssocTypeId"/>
- <result-to-field field="context2.fromDate" result-name="fromDate"/>
+ <result-to-field result-name="contentId" field="context2.activeContentId"/>
+ <result-to-field result-name="dataResourceId" field="dataResourceId"/>
+ <result-to-field result-name="contentAssocTypeId" field="context2.contentAssocTypeId"/>
+ <result-to-field result-name="fromDate" field="context2.fromDate"/>
</call-service>
<check-errors/>
@@ -283,7 +283,7 @@ under the License.
<set field="context2.mapKey" from-field="parameters.mapKey"/>
<if-not-empty field="context2.activeContentId">
<call-service in-map-name="context2" service-name="deactivateAssocs">
- <result-to-field field="deactivateList" result-name="deactivateList"/>
+ <result-to-field result-name="deactivateList" field="deactivateList"/>
</call-service>
</if-not-empty>
Modified: ofbiz/trunk/applications/content/widget/LookupForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/LookupForms.xml?rev=1768219&r1=1768218&r2=1768219&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/widget/LookupForms.xml (original)
+++ ofbiz/trunk/applications/content/widget/LookupForms.xml Sat Nov 5 14:14:04 2016
@@ -29,7 +29,7 @@ under the License.
</entity-condition>
</actions>
<field name="contentId" title="${uiLabelMap.CommonEdit}" widget-style="buttontext">
- <hyperlink also-hidden="false" description="${contentId}" target-type="plain" target="javascript:execRemoteCall('cloneLayout', '${drDataResourceId}', '${contentId}', 'TEMPLATE_MASTER', '')"/>
+ <hyperlink description="${contentId}" target-type="plain" target="javascript:execRemoteCall('cloneLayout', '${drDataResourceId}', '${contentId}', 'TEMPLATE_MASTER', '')" also-hidden="false"/>
</field>
<field name="contentName"><display/></field>
<field name="description"><display/></field>
Modified: ofbiz/trunk/applications/content/widget/WebSiteScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/WebSiteScreens.xml?rev=1768219&r1=1768218&r2=1768219&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/widget/WebSiteScreens.xml (original)
+++ ofbiz/trunk/applications/content/widget/WebSiteScreens.xml Sat Nov 5 14:14:04 2016
@@ -211,7 +211,7 @@ under the License.
<field-map field-name="dataResourceId" from-field="content.dataResourceId"/>
</entity-one>
<set field="parameters.fromDate" type="Timestamp" from-field="parameters.fromDate"/>
- <entity-condition list="assocs" entity-name="ContentAssoc">
+ <entity-condition entity-name="ContentAssoc" list="assocs">
<condition-list>
<condition-expr field-name="contentId" from-field="parameters.contentIdFrom" ignore-if-empty="true"/>
<condition-expr field-name="contentIdTo" from-field="parameters.contentId"/>
Modified: ofbiz/trunk/applications/content/widget/cms/CMSForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/cms/CMSForms.xml?rev=1768219&r1=1768218&r2=1768219&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/widget/cms/CMSForms.xml (original)
+++ ofbiz/trunk/applications/content/widget/cms/CMSForms.xml Sat Nov 5 14:14:04 2016
@@ -45,7 +45,7 @@ under the License.
</actions>
<field name="caContentIdTo" title=" ">
- <hyperlink also-hidden="false" description="${caContentIdTo}" target="EditAddContent">
+ <hyperlink description="${caContentIdTo}" target="EditAddContent" also-hidden="false">
<parameter param-name="MASTER_contentId" from-field="contentId"/>
<parameter param-name="MASTER_drDataResourceId" from-field="drDataResourceId"/>
<parameter param-name="MASTER_caContentIdTo" from-field="caContentIdTo"/>
@@ -54,7 +54,7 @@ under the License.
<parameter param-name="MASTER_caMapKey" from-field="caMapKey"/>
</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"/>
@@ -185,7 +185,7 @@ under the License.
odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<auto-fields-service service-name="updateContentPurposeOperation" default-field-type="display"/>
<field name="deleteLink" title=" " widget-style="buttontext">
- <hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="removeContentPurposeOperation">
+ <hyperlink description="${uiLabelMap.CommonDelete}" target="removeContentPurposeOperation" also-hidden="false">
<parameter param-name="contentPurposeTypeId"/>
<parameter param-name="contentOperationId"/>
<parameter param-name="roleTypeId"/>
@@ -293,7 +293,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" >