You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jl...@apache.org on 2009/02/01 12:07:48 UTC
svn commit: r739739 [2/3] - in /ofbiz/trunk:
applications/content/webapp/content/layout/ applications/content/widget/
applications/content/widget/compdoc/ applications/content/widget/content/
applications/content/widget/forum/ applications/product/widg...
Modified: ofbiz/trunk/applications/workeffort/widget/TimesheetScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/widget/TimesheetScreens.xml?rev=739739&r1=739738&r2=739739&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/widget/TimesheetScreens.xml (original)
+++ ofbiz/trunk/applications/workeffort/widget/TimesheetScreens.xml Sun Feb 1 11:07:47 2009
@@ -29,7 +29,7 @@
<set field="queryString" from-field="result.queryString"/>
<set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer"/>
<set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="10"/>
- <entity-condition entity-name="Timesheet" list-name="currentTimesheetList">
+ <entity-condition entity-name="Timesheet" list="currentTimesheetList">
<condition-list combine="and">
<condition-expr field-name="partyId" env-name="userLogin.partyId"/>
<condition-expr field-name="fromDate" operator="less-equals" env-name="nowTimestamp"/>
@@ -55,7 +55,7 @@
<iterate-section entry-name="currentTimesheet" list-name="currentTimesheetList">
<section>
<actions>
- <entity-condition entity-name="TimeEntry" list-name="currentTimeEntryList">
+ <entity-condition entity-name="TimeEntry" list="currentTimeEntryList">
<condition-list combine="and">
<condition-expr field-name="partyId" env-name="userLogin.partyId"/>
<condition-expr field-name="timesheetId" env-name="currentTimesheet.timesheetId"/>
@@ -80,7 +80,7 @@
<label style="tableheadtext" text="${currentTimeEntry.hours} ${uiLabelMap.WorkEffortTimesheetHours} "/>
<label style="tabletext" text="${currentTimeEntry.comments} [${currentRateType.description}]"/>
<section>
- <condition><not><if-empty field-name="currentTimeEntry.workEffortId"/></not></condition>
+ <condition><not><if-empty field="currentTimeEntry.workEffortId"/></not></condition>
<widgets><link target="WorkEffortSummary?workEffortId=${currentTimeEntry.workEffortId}" text="${uiLabelMap.WorkEffortWorkEffort}: ${currentTimeEntry.workEffortId}" style="buttontext"/></widgets>
</section>
</container>
@@ -209,7 +209,7 @@
<decorator-section name="body">
<section>
<condition>
- <if-empty field-name="timesheet"/>
+ <if-empty field="timesheet"/>
</condition>
<widgets>
<container style="screenlet">
Modified: ofbiz/trunk/applications/workeffort/widget/WorkEffortRelatedSummaryScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/widget/WorkEffortRelatedSummaryScreens.xml?rev=739739&r1=739738&r2=739739&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/widget/WorkEffortRelatedSummaryScreens.xml (original)
+++ ofbiz/trunk/applications/workeffort/widget/WorkEffortRelatedSummaryScreens.xml Sun Feb 1 11:07:47 2009
@@ -69,7 +69,7 @@
<label text="${uiLabelMap.WorkEffortEstimatedCompletionDate} " style="label"/><label text="${workEffort.estimatedCompletionDate}"/>
</container>
<section>
- <condition><not><if-empty field-name="partyAssignments"/></not></condition>
+ <condition><not><if-empty field="partyAssignments"/></not></condition>
<widgets>
<horizontal-separator/>
<container style="h2">
@@ -81,7 +81,7 @@
</widgets>
</section>
<section>
- <condition><not><if-empty field-name="fixedAssetAssignments"/></not></condition>
+ <condition><not><if-empty field="fixedAssetAssignments"/></not></condition>
<widgets>
<horizontal-separator/>
<container style="h2">
@@ -93,7 +93,7 @@
</widgets>
</section>
<section>
- <condition><not><if-empty field-name="commEvents"/></not></condition>
+ <condition><not><if-empty field="commEvents"/></not></condition>
<widgets>
<horizontal-separator/>
<container style="h2">
@@ -114,7 +114,7 @@
</widgets>
</section>
<section>
- <condition><not><if-empty field-name="shoppingLists"/></not></condition>
+ <condition><not><if-empty field="shoppingLists"/></not></condition>
<widgets>
<horizontal-separator/>
<container style="h2">
@@ -135,7 +135,7 @@
</widgets>
</section>
<section>
- <condition><not><if-empty field-name="quotes"/></not></condition>
+ <condition><not><if-empty field="quotes"/></not></condition>
<widgets>
<horizontal-separator/>
<container style="h2">
@@ -156,7 +156,7 @@
</widgets>
</section>
<section>
- <condition><not><if-empty field-name="quotes"/></not></condition>
+ <condition><not><if-empty field="quotes"/></not></condition>
<widgets>
<horizontal-separator/>
<container style="h2">
Modified: ofbiz/trunk/applications/workeffort/widget/WorkEffortScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/widget/WorkEffortScreens.xml?rev=739739&r1=739738&r2=739739&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/widget/WorkEffortScreens.xml (original)
+++ ofbiz/trunk/applications/workeffort/widget/WorkEffortScreens.xml Sun Feb 1 11:07:47 2009
@@ -26,7 +26,7 @@
<set field="headerItem" value="userJobs"/>
<set field="titleProperty" value="WorkEffortJobList"/>
<set field="filterByStatusId" from-field="parameters.statusId" default-value="SERVICE_RUNNING"/>
- <entity-condition entity-name="JobSandbox" list-name="userJobs">
+ <entity-condition entity-name="JobSandbox" list="userJobs">
<condition-list>
<condition-expr field-name="authUserLoginId" env-name="userLogin.userLoginId"/>
<condition-expr field-name="statusId" env-name="filterByStatusId"/>
@@ -114,7 +114,7 @@
<decorator-section name="body">
<section>
<condition>
- <if-empty field-name="workEffort"/>
+ <if-empty field="workEffort"/>
</condition>
<widgets>
<container style="screenlet">
@@ -268,7 +268,7 @@
<link target="AddWorkEffortAndAssoc?workEffortIdFrom=${workEffort.workEffortId}" text="${uiLabelMap.WorkEffortAddChild}" style="buttontext"></link>
<link target="AddWorkEffortAssoc?workEffortIdFrom=${workEffort.workEffortId}" text="${uiLabelMap.WorkEffortAddExistingWorkEffortChild}" style="buttontext"></link>
<section>
- <condition><not><if-empty field-name="workEffortAssoc"/></not></condition>
+ <condition><not><if-empty field="workEffortAssoc"/></not></condition>
<widgets>
<link target="EditWorkEffortAssoc?workEffortIdFrom=${workEffortAssoc.workEffortIdFrom}&workEffortIdTo=${workEffortAssoc.workEffortIdTo}&workEffortAssocTypeId=${workEffortAssoc.workEffortAssocTypeId}&fromDate=${workEffortAssoc.fromDate}&DONE_PAGE=${donePage}" text="${uiLabelMap.WorkEffortEditAssoc}" style="buttontext"></link>
<link target="EditWorkEffortAndAssoc?workEffortIdFrom=${workEffortAssoc.workEffortIdFrom}&workEffortIdTo=${workEffortAssoc.workEffortIdTo}&workEffortAssocTypeId=${workEffortAssoc.workEffortAssocTypeId}&fromDate=${workEffortAssoc.fromDate}&DONE_PAGE=${donePage}" text="${uiLabelMap.WorkEffortEditAssocDetail}" style="buttontext"></link>
Modified: ofbiz/trunk/framework/common/widget/CommonMenus.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/widget/CommonMenus.xml?rev=739739&r1=739738&r2=739739&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/widget/CommonMenus.xml (original)
+++ ofbiz/trunk/framework/common/widget/CommonMenus.xml Sun Feb 1 11:07:47 2009
@@ -22,7 +22,7 @@
<menu name="CommonAppBarMenu" default-menu-item-name="main" id="app-navigation" type="simple" title="${applicationTitle}&nbsp;"
default-selected-style="selected" menu-container-style="button-bar tab-bar" selected-menuitem-context-field-name="headerItem">
<menu-item name="main" title="${uiLabelMap.CommonMain}">
- <condition><not><if-empty field-name="userLogin"/></not></condition>
+ <condition><not><if-empty field="userLogin"/></not></condition>
<link target="main"/>
</menu-item>
</menu>
Modified: ofbiz/trunk/framework/common/widget/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/widget/CommonScreens.xml?rev=739739&r1=739738&r2=739739&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/widget/CommonScreens.xml (original)
+++ ofbiz/trunk/framework/common/widget/CommonScreens.xml Sun Feb 1 11:07:47 2009
@@ -153,12 +153,12 @@
<!-- render appheader: both menu widget style and ftl template style menus are supported-->
<section>
<condition>
- <not><if-empty field-name="userLogin"/></not>
+ <not><if-empty field="userLogin"/></not>
</condition>
<widgets>
<section>
<condition>
- <if-empty field-name="applicationMenuName"/>
+ <if-empty field="applicationMenuName"/>
</condition>
<widgets>
<platform-specific><html><html-template location="${appheaderTemplate}"/></html></platform-specific>
@@ -195,7 +195,7 @@
<!-- render footer -->
<section>
<condition>
- <if-empty field-name="applicationFooterTemplate"/>
+ <if-empty field="applicationFooterTemplate"/>
</condition>
<widgets>
<platform-specific><html><html-template location="${footerTemplateLocation}"/></html></platform-specific>
@@ -407,7 +407,7 @@
<widgets>
<section>
<condition>
- <if-empty field-name="titleProperty"/>
+ <if-empty field="titleProperty"/>
</condition>
<widgets>
<container style="h1">
Modified: ofbiz/trunk/framework/exampleext/widget/example/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/exampleext/widget/example/CommonScreens.xml?rev=739739&r1=739738&r2=739739&view=diff
==============================================================================
--- ofbiz/trunk/framework/exampleext/widget/example/CommonScreens.xml (original)
+++ ofbiz/trunk/framework/exampleext/widget/example/CommonScreens.xml Sun Feb 1 11:07:47 2009
@@ -46,7 +46,7 @@
<condition>
<and>
<if-has-permission permission="EXAMPLE" action="_VIEW"/>
- <not><if-empty field-name="example"/></not>
+ <not><if-empty field="example"/></not>
</and>
</condition>
<widgets>
@@ -63,7 +63,7 @@
<widgets>
<section>
<condition>
- <not><if-empty field-name="example"/></not>
+ <not><if-empty field="example"/></not>
</condition>
<widgets>
<container style="h1"><label>${uiLabelMap[titleProperty]} ${uiLabelMap.CommonFor} ${example.exampleName} [${exampleId}]</label></container>
Modified: ofbiz/trunk/framework/webtools/widget/TempExprScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/widget/TempExprScreens.xml?rev=739739&r1=739738&r2=739739&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/widget/TempExprScreens.xml (original)
+++ ofbiz/trunk/framework/webtools/widget/TempExprScreens.xml Sun Feb 1 11:07:47 2009
@@ -88,7 +88,7 @@
<set field="titleProperty" value="${titleProperty}" default-value="TemporalExpressionMaintenance"/>
<entity-one value-name="temporalExpression" entity-name="TemporalExpression"/>
<set field="fromTempExprId" from-field="parameters.tempExprId"/>
- <entity-condition list-name="childExpressionList" entity-name="TemporalExpressionChild">
+ <entity-condition list="childExpressionList" entity-name="TemporalExpressionChild">
<condition-expr field-name="fromTempExprId" env-name="fromTempExprId"/>
</entity-condition>
</actions>
@@ -101,7 +101,7 @@
</platform-specific>
<section>
<condition>
- <not><if-empty field-name="childExpressionList"/></not>
+ <not><if-empty field="childExpressionList"/></not>
</condition>
<widgets>
<include-form name="ListChildExpressions" location="component://webtools/webapp/webtools/tempexpr/tempExprForms.xml"/>
Modified: ofbiz/trunk/specialpurpose/assetmaint/widget/AssetmaintScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/assetmaint/widget/AssetmaintScreens.xml?rev=739739&r1=739738&r2=739739&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/assetmaint/widget/AssetmaintScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/assetmaint/widget/AssetmaintScreens.xml Sun Feb 1 11:07:47 2009
@@ -31,7 +31,7 @@
<decorator-screen name="CommonFixedAssetDecorator" location="${parameters.fixedAssetDecoratorLocation}">
<decorator-section name="pre-body">
<section>
- <condition><not><if-empty field-name="maintHistSeqId"/></not></condition>
+ <condition><not><if-empty field="maintHistSeqId"/></not></condition>
<widgets>
<include-menu name="FixedAssetMaintTabBar" location="component://assetmaint/widget/Menus.xml"/>
</widgets>
@@ -111,14 +111,14 @@
</actions>
<widgets>
<section>
- <condition><if-empty field-name="maintHistSeqId"/></condition>
+ <condition><if-empty field="maintHistSeqId"/></condition>
<actions><set field="titleProperty" value="AccountingAddFixedAssetMaintenance"/></actions>
<widgets/>
</section>
<decorator-screen name="CommonFixedAssetMaintDecorator">
<decorator-section name="body">
<section>
- <condition><not><if-empty field-name="maintHistSeqId"/></not></condition>
+ <condition><not><if-empty field="maintHistSeqId"/></not></condition>
<widgets>
<container style="button-bar">
<link target="EditFixedAssetMaint?fixedAssetId=${fixedAssetId}" text="${uiLabelMap.AccountingNewFixedAssetMaint}" style="buttontext"/>
@@ -147,7 +147,7 @@
<decorator-section name="body">
<section>
<condition>
- <not><if-empty field-name="parameters.workEffortIdFrom"/></not>
+ <not><if-empty field="parameters.workEffortIdFrom"/></not>
</condition>
<widgets>
<container style="button-bar">
@@ -157,7 +157,7 @@
</section>
<section>
<condition>
- <if-empty field-name="workEffort"/>
+ <if-empty field="workEffort"/>
</condition>
<widgets>
<include-form name="EditWorkEffort" location="component://assetmaint/widget/forms/WorkEffortForms.xml"/>
@@ -268,7 +268,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-name="itemIssuanceList" entity-name="ProductInventoryItemAndItemIssuance">
+ <entity-condition list="itemIssuanceList" entity-name="ProductInventoryItemAndItemIssuance">
<condition-expr field-name="quantity" operator="greater" value="0"/>
</entity-condition>
</actions>
@@ -300,11 +300,11 @@
<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-name="itemIssuanceList" entity-name="ProductInventoryItemAndItemIssuance">
+ <entity-condition list="itemIssuanceList" entity-name="ProductInventoryItemAndItemIssuance">
<condition-expr field-name="quantity" operator="greater" value="0"/>
</entity-condition>
<set field="workEffortId" from-field="fixedAssetMaint.scheduleWorkEffortId"/>
- <entity-condition list-name="notes" entity-name="WorkEffortNoteAndData">
+ <entity-condition list="notes" entity-name="WorkEffortNoteAndData">
<condition-expr field-name="workEffortId" env-name="workEffortId"/>
<order-by field-name="noteId"/>
</entity-condition>
Modified: ofbiz/trunk/specialpurpose/assetmaint/widget/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/assetmaint/widget/CommonScreens.xml?rev=739739&r1=739738&r2=739739&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/assetmaint/widget/CommonScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/assetmaint/widget/CommonScreens.xml Sun Feb 1 11:07:47 2009
@@ -67,8 +67,8 @@
<section>
<condition>
<or>
- <not><if-empty field-name="facility"/></not>
- <not><if-empty field-name="displayWithNoFacility"/></not>
+ <not><if-empty field="facility"/></not>
+ <not><if-empty field="displayWithNoFacility"/></not>
</or>
</condition>
<widgets>
@@ -100,7 +100,7 @@
<decorator-section name="pre-body">
<section>
<condition>
- <not><if-empty field-name="fixedAssetId"/></not>
+ <not><if-empty field="fixedAssetId"/></not>
</condition>
<widgets>
<include-menu name="FixedAssetTabBar" location="component://assetmaint/widget/Menus.xml"/>
@@ -116,7 +116,7 @@
<widgets>
<section>
<condition>
- <not><if-empty field-name="fixedAssetId"/></not>
+ <not><if-empty field="fixedAssetId"/></not>
</condition>
<widgets>
<container style="h1"><label text="${uiLabelMap.${titleProperty}} ${uiLabelMap.CommonFor} ${fixedAsset.fixedAssetName} [${fixedAssetId}] ${${extraFunctionName}}"/></container>
Modified: ofbiz/trunk/specialpurpose/assetmaint/widget/Menus.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/assetmaint/widget/Menus.xml?rev=739739&r1=739738&r2=739739&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/assetmaint/widget/Menus.xml (original)
+++ ofbiz/trunk/specialpurpose/assetmaint/widget/Menus.xml Sun Feb 1 11:07:47 2009
@@ -30,7 +30,7 @@
<menu name="FixedAssetTabBar" extends="FixedAssetTabBar" extends-resource="component://accounting/widget/Menus.xml">
<menu-item name="EditProductMaints" title="${uiLabelMap.AssetMaintProductMaint}">
- <condition><not><if-empty field-name="fixedAsset.instanceOfProductId"/></not></condition>
+ <condition><not><if-empty field="fixedAsset.instanceOfProductId"/></not></condition>
<link target="EditProductMaints?fixedAssetId=${fixedAsset.fixedAssetId}&productId=${fixedAsset.instanceOfProductId}"/>
</menu-item>
</menu>
Modified: ofbiz/trunk/specialpurpose/assetmaint/widget/ismgr/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/assetmaint/widget/ismgr/CommonScreens.xml?rev=739739&r1=739738&r2=739739&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/assetmaint/widget/ismgr/CommonScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/assetmaint/widget/ismgr/CommonScreens.xml Sun Feb 1 11:07:47 2009
@@ -57,7 +57,7 @@
<decorator-section name="pre-body">
<section>
<condition>
- <not><if-empty field-name="fixedAssetId"/></not>
+ <not><if-empty field="fixedAssetId"/></not>
</condition>
<widgets>
<include-menu name="ComputerHardwareTabBar" location="component://assetmaint/widget/ismgr/Menus.xml"/>
@@ -78,7 +78,7 @@
<widgets>
<section>
<condition>
- <not><if-empty field-name="fixedAssetId"/></not>
+ <not><if-empty field="fixedAssetId"/></not>
</condition>
<widgets>
<container style="h1"><label text="${uiLabelMap.${titleProperty}} ${uiLabelMap.CommonFor} ${fixedAsset.fixedAssetName} [${fixedAssetId}] ${${extraFunctionName}}"/></container>
@@ -111,7 +111,7 @@
<decorator-section name="pre-body">
<section>
<condition>
- <not><if-empty field-name="fixedAssetId"/></not>
+ <not><if-empty field="fixedAssetId"/></not>
</condition>
<widgets>
<include-menu name="ComputerHardwareTabBar" location="component://assetmaint/widget/ismgr/Menus.xml"/>
@@ -133,7 +133,7 @@
<widgets>
<section>
<condition>
- <not><if-empty field-name="fixedAssetId"/></not>
+ <not><if-empty field="fixedAssetId"/></not>
</condition>
<widgets>
<container style="h1"><label text="${uiLabelMap.${titleProperty}} ${uiLabelMap.CommonFor} ${fixedAsset.fixedAssetName} [${fixedAssetId}] ${${extraFunctionName}}"/></container>
Modified: ofbiz/trunk/specialpurpose/ebay/widget/EbayScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebay/widget/EbayScreens.xml?rev=739739&r1=739738&r2=739739&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ebay/widget/EbayScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/ebay/widget/EbayScreens.xml Sun Feb 1 11:07:47 2009
@@ -60,7 +60,7 @@
</condition>
<widgets>
<section>
- <condition><not><if-empty field-name="product"/></not></condition>
+ <condition><not><if-empty field="product"/></not></condition>
<widgets>
<include-menu name="ProductTabBar" location="component://product/widget/catalog/Menus.xml"/>
<container>
@@ -119,11 +119,11 @@
<actions>
<set field="titleProperty" value="PageTitleAdvancedSearch"/>
<set field="headerItem" value="export"/>
- <entity-condition entity-name="ProductCategory" list-name="productCategories">
+ <entity-condition entity-name="ProductCategory" list="productCategories">
<condition-expr field-name="showInSelect" operator="not-equals" value="N"/>
<order-by field-name="description"/>
</entity-condition>
- <entity-condition entity-name="ProdCatalog" list-name="prodCatalogs">
+ <entity-condition entity-name="ProdCatalog" list="prodCatalogs">
<order-by field-name="catalogName"/>
</entity-condition>
<script location="component://product/webapp/catalog/WEB-INF/actions/find/advancedsearchoptions.groovy"/>
@@ -168,7 +168,7 @@
<set field="headerItem" value="export"/>
<set field="titleProperty" value="PageTitleEbayProductsExportToEbay"/>
<set field="selectResult" from-field="parameters.selectResult"/>
- <entity-condition entity-name="Geo" list-name="countries">
+ <entity-condition entity-name="Geo" list="countries">
<condition-expr field-name="geoTypeId" value="COUNTRY"/>
<order-by field-name="geoName"/>
</entity-condition>
Modified: ofbiz/trunk/specialpurpose/googleCheckout/widget/GoogleCheckoutScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/googleCheckout/widget/GoogleCheckoutScreens.xml?rev=739739&r1=739738&r2=739739&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/googleCheckout/widget/GoogleCheckoutScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/googleCheckout/widget/GoogleCheckoutScreens.xml Sun Feb 1 11:07:47 2009
@@ -60,7 +60,7 @@
<screen name="expiration">
<section>
<condition>
- <not><if-empty field-name="googleCart.cartExpiration"/></not>
+ <not><if-empty field="googleCart.cartExpiration"/></not>
</condition>
<widgets>
<platform-specific><html><html-template location="component://googlecheckout/webapp/google/templates/shoppingCart/expiration.ftl"/></html></platform-specific>
@@ -70,7 +70,7 @@
<screen name="privateData">
<section>
<condition>
- <not><if-empty field-name="googleCart.merchantPrivateData"/></not>
+ <not><if-empty field="googleCart.merchantPrivateData"/></not>
</condition>
<widgets>
<platform-specific><html><html-template location="component://googlecheckout/webapp/google/templates/shoppingCart/privateData.ftl"/></html></platform-specific>
@@ -80,7 +80,7 @@
<screen name="merchantCalculations">
<section>
<condition>
- <not><if-empty field-name="merchantCalculations"/></not>
+ <not><if-empty field="merchantCalculations"/></not>
</condition>
<widgets>
<platform-specific><html><html-template location="component://googlecheckout/webapp/google/templates/checkoutFlowSupport/merchantCaluclations.ftl"/></html></platform-specific>
@@ -90,7 +90,7 @@
<screen name="shippingMethods">
<section>
<condition>
- <not><if-empty field-name="shippingMethods"/></not>
+ <not><if-empty field="shippingMethods"/></not>
</condition>
<widgets>
<platform-specific><html><html-template location="component://googlecheckout/webapp/google/templates/checkoutFlowSupport/shippingMethods.ftl"/></html></platform-specific>
@@ -107,7 +107,7 @@
<screen name="taxTables">
<section>
<condition>
- <not><if-empty field-name="flowSupport.taxTables"/></not>
+ <not><if-empty field="flowSupport.taxTables"/></not>
</condition>
<widgets>
<platform-specific><html><html-template location="component://googlecheckout/webapp/google/templates/checkoutFlowSupport/taxTables.ftl"/></html></platform-specific>
@@ -117,7 +117,7 @@
<screen name="requestPhone">
<section>
<condition>
- <not><if-empty field-name="flowSupport.requestPhone"/></not>
+ <not><if-empty field="flowSupport.requestPhone"/></not>
</condition>
<widgets>
<platform-specific><html><html-template location="component://googlecheckout/webapp/google/templates/checkoutFlowSupport/requestPhone.ftl"/></html></platform-specific>
Modified: ofbiz/trunk/specialpurpose/googlebase/widget/GoogleBaseScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/googlebase/widget/GoogleBaseScreens.xml?rev=739739&r1=739738&r2=739739&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/googlebase/widget/GoogleBaseScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/googlebase/widget/GoogleBaseScreens.xml Sun Feb 1 11:07:47 2009
@@ -86,7 +86,7 @@
</condition>
<widgets>
<section>
- <condition><not><if-empty field-name="product"/></not></condition>
+ <condition><not><if-empty field="product"/></not></condition>
<widgets>
<include-menu name="ProductTabBar" location="component://product/widget/catalog/Menus.xml"/>
<platform-specific>
Modified: ofbiz/trunk/specialpurpose/mypage/widget/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/mypage/widget/CommonScreens.xml?rev=739739&r1=739738&r2=739739&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/mypage/widget/CommonScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/mypage/widget/CommonScreens.xml Sun Feb 1 11:07:47 2009
@@ -52,7 +52,7 @@
</actions>
<widgets>
<section>
- <condition><not><if-empty field-name="userLogin"/></not></condition>
+ <condition><not><if-empty field="userLogin"/></not></condition>
<actions>
<service service-name="getUserPreferenceGroup" result-map-name="preferences">
<field-map field-name="userPrefGroupTypeId" value="MyPage" />
@@ -202,7 +202,7 @@
<field-map field-name="userPrefGroupTypeId" value="MyPage" />
</service>
<!-- check if there are any customer requests for this user -->
- <entity-condition list-name="custRequests" entity-name="CustReqAndTypeAndPartyRel">
+ <entity-condition list="custRequests" entity-name="CustReqAndTypeAndPartyRel">
<condition-list combine="and">
<condition-expr field-name="statusId" operator="equals" value="CRQ_SUBMITTED"/>
<condition-list combine="and">
@@ -216,7 +216,7 @@
<widgets>
<section>
<condition>
- <not><if-empty field-name="custRequests"/></not>
+ <not><if-empty field="custRequests"/></not>
</condition>
<widgets>
<screenlet title="${uiLabelMap.MyPageIncomingCustRequests}" navigation-form-name="ListRequestList" >
@@ -284,7 +284,7 @@
<set field="partyId" from-field="userLogin.partyId"/>
<set field="status" from-field="parameters.status" default-value="open"/>
<set field="status" value="${bsh:"all".equals(status)?"%":"open"}"/>
- <entity-condition list-name="custRequests" entity-name="CustRequestInfoAndWorkEffortAndPartyRel">
+ <entity-condition list="custRequests" entity-name="CustRequestInfoAndWorkEffortAndPartyRel">
<condition-list combine="and">
<condition-expr field-name="fromPartyId" operator="equals" value="${userLogin.partyId}"/>
<condition-list combine="or">
@@ -295,7 +295,7 @@
<order-by field-name="+priority"/>
<order-by field-name="+custRequestDate"/>
</entity-condition>
- <entity-condition list-name="custRequestsCompleted" entity-name="CustRequestInfoAndWorkEffortAndPartyRel">
+ <entity-condition list="custRequestsCompleted" entity-name="CustRequestInfoAndWorkEffortAndPartyRel">
<condition-list combine="and">
<condition-expr field-name="fromPartyId" operator="equals" value="${userLogin.partyId}"/>
<condition-list combine="or">
@@ -306,7 +306,7 @@
<order-by field-name="custRequestDate"/>
</entity-condition>
<script location="component://party/webapp/partymgr/WEB-INF/actions/party/GetMyCompany.groovy"/>
- <entity-condition list-name="companyCustRequests" entity-name="CustRequestInfoAndWorkEffortAndPartyRel">
+ <entity-condition list="companyCustRequests" entity-name="CustRequestInfoAndWorkEffortAndPartyRel">
<condition-list combine="and">
<condition-expr field-name="partyIdFrom" operator="equals" value="${myCompanyId}"/>
<condition-expr field-name="fromPartyId" operator="not-equals" value="${userLogin.partyId}"/>
@@ -314,7 +314,7 @@
<order-by field-name="custRequestDate"/>
</entity-condition>
<!-- only list internal notes to the customer do not show the incoming or outgoing emails: will confuse only -->
- <entity-condition entity-name="CommunicationEventAndRole" list-name="commEvents">
+ <entity-condition entity-name="CommunicationEventAndRole" list="commEvents">
<condition-list combine="and">
<condition-expr field-name="communicationEventTypeId" operator="equals" value="COMMENT_NOTE" />
<condition-expr field-name="partyId" operator="equals" value="${partyId}" />
@@ -341,7 +341,7 @@
</screenlet>
<section>
<condition>
- <not><if-empty field-name="companyCustRequests"/></not>
+ <not><if-empty field="companyCustRequests"/></not>
</condition>
<widgets>
<screenlet title="${uiLabelMap.MyPageOtherCompanyCustomerRequests}" navigation-form-name="ListOtherCompanyRequests">
@@ -489,7 +489,7 @@
<decorator-section name="body">
<section>
<condition>
- <not><if-empty field-name="custRequest"/></not>
+ <not><if-empty field="custRequest"/></not>
</condition>
<widgets>
<include-menu location="component://mypage/widget/MyPageMenus.xml" name="RequestTabBar"/>
Modified: ofbiz/trunk/specialpurpose/mypage/widget/MyPageMenus.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/mypage/widget/MyPageMenus.xml?rev=739739&r1=739738&r2=739739&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/mypage/widget/MyPageMenus.xml (original)
+++ ofbiz/trunk/specialpurpose/mypage/widget/MyPageMenus.xml Sun Feb 1 11:07:47 2009
@@ -23,20 +23,20 @@
<menu name="MyPageAppBar" id="app-navigation" type="simple" selected-menuitem-context-field-name="headerItem" default-selected-style="selected" title="${uiLabelMap.CommonMyPersonalPage}" menu-container-style="button-bar tab-bar">
<menu-item name="main" title="${uiLabelMap.CommonMain}">
<condition>
- <not><if-empty field-name="userLogin"/></not>
+ <not><if-empty field="userLogin"/></not>
</condition>
<link target="main?donePage=main"/>
</menu-item>
<menu-item name="viewprofile" title="${uiLabelMap.MyPageProfile}">
<condition>
- <not><if-empty field-name="userLogin"/></not>
+ <not><if-empty field="userLogin"/></not>
</condition>
<link target="viewprofile?partyId=${userLogin.partyId}"/>
</menu-item>
<menu-item name="myCommunications" title="${uiLabelMap.MyPageCommunications}">
<condition>
<and>
- <not><if-empty field-name="userLogin"/></not>
+ <not><if-empty field="userLogin"/></not>
<if-compare field-name="preferences.userPrefMap.myCommunications" operator="not-equals" value="Y"/>
</and>
</condition>
@@ -45,7 +45,7 @@
<menu-item name="otherCommunications" title="${uiLabelMap.MyPageOtherCommunications}">
<condition>
<and>
- <not><if-empty field-name="userLogin"/></not>
+ <not><if-empty field="userLogin"/></not>
<if-compare field-name="preferences.userPrefMap.otherCommunications" operator="not-equals" value="Y"/>
<or>
<if-has-permission permission="MYPAGE_EMPLOYEE"/>
@@ -58,7 +58,7 @@
<menu-item name="myCompanyComms" title="${uiLabelMap.MyPageCompanyComms}">
<condition>
<and>
- <not><if-empty field-name="userLogin"/></not>
+ <not><if-empty field="userLogin"/></not>
<if-compare field-name="preferences.userPrefMap.myCompanyComms" operator="not-equals" value="Y"/>
<or>
<if-has-permission permission="MYPAGE_EMPLOYEE"/>
@@ -71,7 +71,7 @@
<menu-item name="myTimesheet" title="${uiLabelMap.MyPageTimeSheets}">
<condition>
<and>
- <not><if-empty field-name="userLogin"/></not>
+ <not><if-empty field="userLogin"/></not>
<if-compare field-name="preferences.userPrefMap.myTimesheet" operator="not-equals" value="Y"/>
<or>
<if-has-permission permission="MYPAGE_EMPLOYEE"/>
@@ -84,7 +84,7 @@
<menu-item name="myTasks" title="${uiLabelMap.MyPageTasks}">
<condition>
<and>
- <not><if-empty field-name="userLogin"/></not>
+ <not><if-empty field="userLogin"/></not>
<if-compare field-name="preferences.userPrefMap.myTasks" operator="not-equals" value="Y"/>
<or>
<if-has-permission permission="MYPAGE_EMPLOYEE"/>
@@ -97,7 +97,7 @@
<menu-item name="invoices" title="${uiLabelMap.AccountingInvoicesMenu}">
<condition>
<and>
- <not><if-empty field-name="userLogin"/></not>
+ <not><if-empty field="userLogin"/></not>
<if-has-permission permission="MYPAGE_CUSTOMER"/>
</and>
</condition>
@@ -106,14 +106,14 @@
<menu-item name="projects" title="${uiLabelMap.ProjectMgrProjects}">
<condition>
<and>
- <not><if-empty field-name="userLogin"/></not>
+ <not><if-empty field="userLogin"/></not>
<if-has-permission permission="MYPAGE_CUSTOMER"/>
</and>
</condition>
<link target="listProjects"/>
</menu-item>
<menu-item name="help" title="${uiLabelMap.CommonHelp}" align-style="opposed">
- <condition><not><if-empty field-name="userLogin"/></not></condition>
+ <condition><not><if-empty field="userLogin"/></not></condition>
<link target="http://docs.ofbiz.org/display/OFBENDUSER/My+Page?decorator=printable" url-mode="plain" target-window="new"/>
</menu-item>
<menu-item name="preferences" title="${uiLabelMap.CommonPreferences}" align-style="opposed">
@@ -160,7 +160,7 @@
<condition>
<or>
<if-compare field-name="parameters.all" operator="equals" value="false" />
- <if-empty field-name="parameters.all"/>
+ <if-empty field="parameters.all"/>
</or>
</condition>
<link target="${parameters.donePage}?donePage=${parameters.donePage}&all=true" />
@@ -218,8 +218,8 @@
<menu-item name="reply" title="${uiLabelMap.PartyReply}">
<condition>
<and>
- <not><if-empty field-name="parameters.communicationEventId"/></not>
- <not><if-empty field-name="communicationEvent.partyIdFrom"/></not>
+ <not><if-empty field="parameters.communicationEventId"/></not>
+ <not><if-empty field="communicationEvent.partyIdFrom"/></not>
<if-compare field-name="communicationEvent.partyIdFrom" operator="not-equals" value="${userLogin.partyId}"/>
<if-has-permission permission="PARTYMGR_CME-EMAIL_UPDATE"/>
<if-has-permission permission="PARTYMGR_CME-NOTE_CREATE"/>
@@ -230,8 +230,8 @@
<menu-item name="forward" title="${uiLabelMap.Forward}">
<condition>
<and>
- <not><if-empty field-name="parameters.communicationEventId"/></not>
- <not><if-empty field-name="communicationEvent.partyIdFrom"/></not>
+ <not><if-empty field="parameters.communicationEventId"/></not>
+ <not><if-empty field="communicationEvent.partyIdFrom"/></not>
<if-compare field-name="communicationEvent.partyIdFrom" operator="not-equals" value="${userLogin.partyId}"/>
<if-has-permission permission="PARTYMGR_CME-EMAIL_UPDATE"/>
<if-has-permission permission="PARTYMGR_CME-NOTE_CREATE"/>
@@ -242,8 +242,8 @@
<menu-item name="createRequestFromCommEvent" title="${uiLabelMap.PartyCreateRequestFromCommEvent}">
<condition>
<and>
- <not><if-empty field-name="parameters.communicationEventId"/></not>
- <not><if-empty field-name="communicationEvent.partyIdFrom"/></not>
+ <not><if-empty field="parameters.communicationEventId"/></not>
+ <not><if-empty field="communicationEvent.partyIdFrom"/></not>
<if-has-permission permission="ORDERMGR_CRQ_CREATE"/>
</and>
</condition>
@@ -260,7 +260,7 @@
<menu-item name="send" title="${uiLabelMap.CommonSend}">
<condition>
<and>
- <not><if-empty field-name="parameters.communicationEventId"/></not>
+ <not><if-empty field="parameters.communicationEventId"/></not>
<if-compare field-name="commEvent.statusId" operator="equals" value="COM_PENDING"/>
<if-has-permission permission="PARTYMGR_CME-EMAIL_UPDATE"/>
</and>
@@ -270,7 +270,7 @@
<menu-item name="delete" title="${uiLabelMap.CommonDelete}">
<condition>
<and>
- <not><if-empty field-name="communicationEventRole"/></not>
+ <not><if-empty field="communicationEventRole"/></not>
<if-has-permission permission="PARTYMGR_CME-EMAIL_DELETE"/>
</and>
</condition>
@@ -290,7 +290,7 @@
<menu-item name="cancelledRequest" title="Cancel request" >
<condition>
<and>
- <not><if-empty field-name="custRequest"/></not>
+ <not><if-empty field="custRequest"/></not>
<if-compare field-name="custRequest.statusId" operator="not-equals" value="CRQ_CANCELLED"/>
<if-compare field-name="custRequest.statusId" operator="not-equals" value="CRQ_COMPLETED"/>
</and>
@@ -300,7 +300,7 @@
<menu-item name="addContent" title="Add content">
<condition>
<and>
- <not><if-empty field-name="custRequest"/></not>
+ <not><if-empty field="custRequest"/></not>
<if-compare field-name="custRequest.statusId" operator="not-equals" value="CRQ_CANCELLED"/>
<if-compare field-name="custRequest.statusId" operator="not-equals" value="CRQ_COMPLETED"/>
</and>
Modified: ofbiz/trunk/specialpurpose/mypage/widget/MyPageScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/mypage/widget/MyPageScreens.xml?rev=739739&r1=739738&r2=739739&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/mypage/widget/MyPageScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/mypage/widget/MyPageScreens.xml Sun Feb 1 11:07:47 2009
@@ -116,7 +116,7 @@
<section>
<condition>
<not>
- <if-empty field-name="tasks" />
+ <if-empty field="tasks" />
</not>
</condition>
<widgets>
@@ -140,7 +140,7 @@
<section>
<condition>
<not>
- <if-empty field-name="tasks" />
+ <if-empty field="tasks" />
</not>
</condition>
<widgets>
@@ -217,7 +217,7 @@
</condition-list>
<order-by field-name="-datetimeStarted" />
</entity-condition>
- <entity-condition entity-name="CommunicationEventAndRole" list-name="commEventDraft">
+ <entity-condition entity-name="CommunicationEventAndRole" list="commEventDraft">
<condition-list combine="and">
<condition-expr field-name="statusId" operator="equals"
value="COM_PENDING"/>
@@ -239,7 +239,7 @@
<section>
<condition>
<not>
- <if-empty field-name="commEventsUnknown" />
+ <if-empty field="commEventsUnknown" />
</not>
</condition>
<widgets>
@@ -255,7 +255,7 @@
<section>
<condition>
<not>
- <if-empty field-name="commEventDraft" />
+ <if-empty field="commEventDraft" />
</not>
</condition>
<widgets>
@@ -318,7 +318,7 @@
<section>
<condition>
<not>
- <if-empty field-name="communicationEvent.parentCommEventId" />
+ <if-empty field="communicationEvent.parentCommEventId" />
</not>
</condition>
<actions>
@@ -491,7 +491,7 @@
<actions>
<set field="headerItem" value="invoices"/>
<script location="component://party/webapp/partymgr/WEB-INF/actions/party/GetMyCompany.groovy"/>
- <entity-condition list-name="invoices" entity-name="Invoice">
+ <entity-condition list="invoices" entity-name="Invoice">
<condition-list combine="and">
<condition-expr field-name="partyId" operator="equals" env-name="myCompanyId"/>
<condition-list combine="or">
@@ -609,7 +609,7 @@
<screen name="addAttachmentEmail">
<section>
<actions>
- <entity-condition entity-name="MimeType" list-name="mimeTypes">
+ <entity-condition entity-name="MimeType" list="mimeTypes">
<order-by field-name="description"/>
<order-by field-name="mimeTypeId"/>
</entity-condition>
@@ -658,7 +658,7 @@
<set field="headerItem" value="projects"/>
<set field="layoutSettings.javaScripts[]" value="/images/jsgantt.js" global="true"/>
<set field="layoutSettings.styleSheets[]" value="/images/jsgantt.css" global="true"/>
- <entity-condition list-name="projects" entity-name="WorkEffortPartyAssignment" filter-by-date="true">
+ <entity-condition list="projects" entity-name="WorkEffortPartyAssignment" filter-by-date="true">
<condition-list combine="and">
<condition-expr field-name="partyId" env-name="userLogin.partyId"/>
<condition-list combine="or">
@@ -731,7 +731,7 @@
</iterate-section>
<section>
<condition>
- <if-empty field-name="projects"/>
+ <if-empty field="projects"/>
</condition>
<widgets>
<label style="h2" text="no projects found"></label>
Modified: ofbiz/trunk/specialpurpose/myportal/widget/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/myportal/widget/CommonScreens.xml?rev=739739&r1=739738&r2=739739&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/myportal/widget/CommonScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/myportal/widget/CommonScreens.xml Sun Feb 1 11:07:47 2009
@@ -203,7 +203,7 @@
<decorator-section name="body">
<section>
<condition>
- <not><if-empty field-name="parameters.partyId"/></not>
+ <not><if-empty field="parameters.partyId"/></not>
</condition>
<actions>
<set field="partyId" from-field="parameters.partyId"/>
@@ -251,7 +251,7 @@
<decorator-section name="body">
<section>
<condition>
- <not><if-empty field-name="custRequest"/></not>
+ <not><if-empty field="custRequest"/></not>
</condition>
<widgets>
<include-menu location="component://myportal/widget/MyPortalMenus.xml" name="RequestTabBar"/>
Modified: ofbiz/trunk/specialpurpose/myportal/widget/MyPortalMenus.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/myportal/widget/MyPortalMenus.xml?rev=739739&r1=739738&r2=739739&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/myportal/widget/MyPortalMenus.xml (original)
+++ ofbiz/trunk/specialpurpose/myportal/widget/MyPortalMenus.xml Sun Feb 1 11:07:47 2009
@@ -50,7 +50,7 @@
<condition>
<or>
<if-compare field-name="parameters.all" operator="equals" value="false" />
- <if-empty field-name="parameters.all"/>
+ <if-empty field="parameters.all"/>
</or>
</condition>
<link target="showPortalPage?portalPageId=${parameters.portalPageId}&all=true" />
@@ -107,8 +107,8 @@
<menu-item name="reply" title="${uiLabelMap.PartyReply}">
<condition>
<and>
- <not><if-empty field-name="parameters.communicationEventId"/></not>
- <not><if-empty field-name="communicationEvent.partyIdFrom"/></not>
+ <not><if-empty field="parameters.communicationEventId"/></not>
+ <not><if-empty field="communicationEvent.partyIdFrom"/></not>
<if-compare field-name="communicationEvent.partyIdFrom" operator="not-equals" value="${userLogin.partyId}"/>
<if-has-permission permission="PARTYMGR_CME-EMAIL_UPDATE"/>
<if-has-permission permission="PARTYMGR_CME-NOTE_CREATE"/>
@@ -119,8 +119,8 @@
<menu-item name="forward" title="${uiLabelMap.Forward}">
<condition>
<and>
- <not><if-empty field-name="parameters.communicationEventId"/></not>
- <not><if-empty field-name="communicationEvent.partyIdFrom"/></not>
+ <not><if-empty field="parameters.communicationEventId"/></not>
+ <not><if-empty field="communicationEvent.partyIdFrom"/></not>
<if-compare field-name="communicationEvent.partyIdFrom" operator="not-equals" value="${userLogin.partyId}"/>
<if-has-permission permission="PARTYMGR_CME-EMAIL_UPDATE"/>
<if-has-permission permission="PARTYMGR_CME-NOTE_CREATE"/>
@@ -131,8 +131,8 @@
<menu-item name="createRequestFromCommEvent" title="${uiLabelMap.PartyCreateRequestFromCommEvent}">
<condition>
<and>
- <not><if-empty field-name="parameters.communicationEventId"/></not>
- <not><if-empty field-name="communicationEvent.partyIdFrom"/></not>
+ <not><if-empty field="parameters.communicationEventId"/></not>
+ <not><if-empty field="communicationEvent.partyIdFrom"/></not>
<if-has-permission permission="ORDERMGR_CRQ_CREATE"/>
</and>
</condition>
@@ -141,7 +141,7 @@
<menu-item name="close" title="${uiLabelMap.CommonClose}">
<condition>
<and>
- <not><if-empty field-name="communicationEventRole"/></not>
+ <not><if-empty field="communicationEventRole"/></not>
<if-compare field-name="communicationEvent.statusId" operator="equals" value="COM_ROLE_READ"/>
<if-has-permission permission="PARTYMGR_CME-EMAIL_CREATE"/>
</and>
@@ -151,7 +151,7 @@
<menu-item name="send" title="${uiLabelMap.CommonSend}">
<condition>
<and>
- <not><if-empty field-name="parameters.communicationEventId"/></not>
+ <not><if-empty field="parameters.communicationEventId"/></not>
<if-compare field-name="commEvent.statusId" operator="equals" value="COM_PENDING"/>
<if-has-permission permission="PARTYMGR_CME-EMAIL_UPDATE"/>
</and>
@@ -161,7 +161,7 @@
<menu-item name="delete" title="${uiLabelMap.CommonDelete}">
<condition>
<and>
- <not><if-empty field-name="communicationEventRole"/></not>
+ <not><if-empty field="communicationEventRole"/></not>
<if-has-permission permission="PARTYMGR_CME-EMAIL_DELETE"/>
</and>
</condition>
@@ -180,7 +180,7 @@
<menu-item name="cancelledRequest" title="Cancel request" >
<condition>
<and>
- <not><if-empty field-name="custRequest"/></not>
+ <not><if-empty field="custRequest"/></not>
<if-compare field-name="custRequest.statusId" operator="not-equals" value="CRQ_CANCELLED"/>
<if-compare field-name="custRequest.statusId" operator="not-equals" value="CRQ_COMPLETED"/>
</and>
@@ -190,7 +190,7 @@
<menu-item name="addContent" title="Add content">
<condition>
<and>
- <not><if-empty field-name="custRequest"/></not>
+ <not><if-empty field="custRequest"/></not>
<if-compare field-name="custRequest.statusId" operator="not-equals" value="CRQ_CANCELLED"/>
<if-compare field-name="custRequest.statusId" operator="not-equals" value="CRQ_COMPLETED"/>
</and>
Modified: ofbiz/trunk/specialpurpose/myportal/widget/MyPortalScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/myportal/widget/MyPortalScreens.xml?rev=739739&r1=739738&r2=739739&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/myportal/widget/MyPortalScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/myportal/widget/MyPortalScreens.xml Sun Feb 1 11:07:47 2009
@@ -117,7 +117,7 @@
<section>
<condition>
<not>
- <if-empty field-name="tasks" />
+ <if-empty field="tasks" />
</not>
</condition>
<widgets>
@@ -141,7 +141,7 @@
<section>
<condition>
<not>
- <if-empty field-name="tasks" />
+ <if-empty field="tasks" />
</not>
</condition>
<widgets>
@@ -240,7 +240,7 @@
<section>
<condition>
<not>
- <if-empty field-name="commEventsUnknown" />
+ <if-empty field="commEventsUnknown" />
</not>
</condition>
<widgets>
@@ -256,7 +256,7 @@
<section>
<condition>
<not>
- <if-empty field-name="commEventDraft" />
+ <if-empty field="commEventDraft" />
</not>
</condition>
<widgets>
@@ -319,7 +319,7 @@
<section>
<condition>
<not>
- <if-empty field-name="communicationEvent.parentCommEventId" />
+ <if-empty field="communicationEvent.parentCommEventId" />
</not>
</condition>
<actions>
@@ -728,7 +728,7 @@
</iterate-section>
<section>
<condition>
- <if-empty field-name="projects"/>
+ <if-empty field="projects"/>
</condition>
<widgets>
<label style="h2" text="no projects found"></label>
@@ -787,7 +787,7 @@
<widgets>
<section>
<condition>
- <not><if-empty field-name="custRequests"/></not>
+ <not><if-empty field="custRequests"/></not>
</condition>
<widgets>
<screenlet title="${uiLabelMap.MyPortalIncomingCustRequests}" navigation-form-name="ListRequestList">
@@ -1026,7 +1026,7 @@
<widgets>
<section>
<condition>
- <not><if-empty field-name="party"/></not>
+ <not><if-empty field="party"/></not>
</condition>
<widgets>
<section>
@@ -1055,7 +1055,7 @@
<widgets>
<section>
<condition>
- <not><if-empty field-name="party"/></not>
+ <not><if-empty field="party"/></not>
</condition>
<widgets>
<section>
@@ -1084,7 +1084,7 @@
<widgets>
<section>
<condition>
- <not><if-empty field-name="party"/></not>
+ <not><if-empty field="party"/></not>
</condition>
<widgets>
<section>
@@ -1113,7 +1113,7 @@
<widgets>
<section>
<condition>
- <not><if-empty field-name="party"/></not>
+ <not><if-empty field="party"/></not>
</condition>
<widgets>
<section>
@@ -1142,7 +1142,7 @@
<widgets>
<section>
<condition>
- <not><if-empty field-name="party"/></not>
+ <not><if-empty field="party"/></not>
</condition>
<widgets>
<section>
@@ -1171,7 +1171,7 @@
<widgets>
<section>
<condition>
- <not><if-empty field-name="party"/></not>
+ <not><if-empty field="party"/></not>
</condition>
<widgets>
<section>
@@ -1200,7 +1200,7 @@
<widgets>
<section>
<condition>
- <not><if-empty field-name="party"/></not>
+ <not><if-empty field="party"/></not>
</condition>
<widgets>
<section>
@@ -1229,7 +1229,7 @@
<widgets>
<section>
<condition>
- <not><if-empty field-name="party"/></not>
+ <not><if-empty field="party"/></not>
</condition>
<widgets>
<section>
@@ -1258,7 +1258,7 @@
<widgets>
<section>
<condition>
- <not><if-empty field-name="party"/></not>
+ <not><if-empty field="party"/></not>
</condition>
<widgets>
<section>
@@ -1287,7 +1287,7 @@
<widgets>
<section>
<condition>
- <not><if-empty field-name="party"/></not>
+ <not><if-empty field="party"/></not>
</condition>
<widgets>
<section>
@@ -1316,7 +1316,7 @@
<widgets>
<section>
<condition>
- <not><if-empty field-name="party"/></not>
+ <not><if-empty field="party"/></not>
</condition>
<widgets>
<section>
@@ -1345,7 +1345,7 @@
<widgets>
<section>
<condition>
- <not><if-empty field-name="party"/></not>
+ <not><if-empty field="party"/></not>
</condition>
<widgets>
<section>
@@ -1374,7 +1374,7 @@
<widgets>
<section>
<condition>
- <not><if-empty field-name="party"/></not>
+ <not><if-empty field="party"/></not>
</condition>
<widgets>
<section>
@@ -1403,7 +1403,7 @@
<widgets>
<section>
<condition>
- <not><if-empty field-name="party"/></not>
+ <not><if-empty field="party"/></not>
</condition>
<widgets>
<section>
@@ -1432,7 +1432,7 @@
<widgets>
<section>
<condition>
- <not><if-empty field-name="party"/></not>
+ <not><if-empty field="party"/></not>
</condition>
<widgets>
<section>
@@ -1461,7 +1461,7 @@
<widgets>
<section>
<condition>
- <not><if-empty field-name="party"/></not>
+ <not><if-empty field="party"/></not>
</condition>
<widgets>
<section>
@@ -1490,7 +1490,7 @@
<widgets>
<section>
<condition>
- <not><if-empty field-name="party"/></not>
+ <not><if-empty field="party"/></not>
</condition>
<widgets>
<section>
@@ -1519,7 +1519,7 @@
<widgets>
<section>
<condition>
- <not><if-empty field-name="party"/></not>
+ <not><if-empty field="party"/></not>
</condition>
<widgets>
<section>
Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/CommonScreens.xml?rev=739739&r1=739738&r2=739739&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/CommonScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/CommonScreens.xml Sun Feb 1 11:07:47 2009
@@ -70,7 +70,7 @@
<section>
<condition>
<not>
- <if-empty field-name="project"/>
+ <if-empty field="project"/>
</not>
</condition>
<widgets>
@@ -114,7 +114,7 @@
<widgets>
<section>
<condition>
- <not><if-empty field-name="workEffort"/></not>
+ <not><if-empty field="workEffort"/></not>
</condition>
<widgets>
<include-menu name="TaskTabBar" location="component://projectmgr/widget/Menus.xml"/>
@@ -204,7 +204,7 @@
<section>
<condition>
<not>
- <if-empty field-name="timesheet"/>
+ <if-empty field="timesheet"/>
</not>
</condition>
<widgets>
@@ -260,10 +260,10 @@
<if-has-permission permission="PROJECTMGR" action="_VIEW"/>
</condition>
<actions>
- <entity-condition entity-name="Facility" list-name="allFacilities">
+ <entity-condition entity-name="Facility" list="allFacilities">
<order-by field-name="facilityName"/>
</entity-condition>
- <entity-condition entity-name="FixedAsset" list-name="allFixedAssets">
+ <entity-condition entity-name="FixedAsset" list="allFixedAssets">
<order-by field-name="fixedAssetId"/>
</entity-condition>
</actions>
@@ -319,7 +319,7 @@
<section>
<condition>
<and>
- <not><if-empty field-name="communicationEvent.statusId"/></not>
+ <not><if-empty field="communicationEvent.statusId"/></not>
<or>
<if-compare field-name="communicationEvent.statusId" operator="equals" type="String" value="COM_COMPLETE"/>
<if-compare field-name="communicationEvent.statusId" operator="equals" type="String" value="COM_RESOLVED"/>
@@ -344,7 +344,7 @@
</condition>
<widgets>
<section>
- <condition><not><if-empty field-name="partyId"/></not></condition>
+ <condition><not><if-empty field="partyId"/></not></condition>
<widgets>
<include-menu location="component://projectmgr/widget/Menus.xml" name="ResourceTabBar"/>
<container>
Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/Menus.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/Menus.xml?rev=739739&r1=739738&r2=739739&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/Menus.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/Menus.xml Sun Feb 1 11:07:47 2009
@@ -203,7 +203,7 @@
<condition>
<and>
<not>
- <if-empty field-name="project"/>
+ <if-empty field="project"/>
</not>
<if-compare field-name="hasUpdatePermission" operator="equals" value="true"/>
</and>
@@ -215,7 +215,7 @@
<and>
<if-compare field-name="project.currentStatusId" operator="not-equals" value="PRJ_CLOSED"/>
<not>
- <if-empty field-name="project"/>
+ <if-empty field="project"/>
</not>
<if-compare field-name="hasUpdatePermission" operator="equals" value="true"/>
</and>
@@ -226,7 +226,7 @@
<condition>
<and>
<not>
- <if-empty field-name="project"/>
+ <if-empty field="project"/>
</not>
<if-compare field-name="hasUpdatePermission" operator="equals" value="true"/>
</and>
@@ -238,7 +238,7 @@
<and>
<if-compare field-name="project.currentStatusId" operator="not-equals" value="PRJ_CLOSED"/>
<not>
- <if-empty field-name="project"/>
+ <if-empty field="project"/>
</not>
<if-compare field-name="hasUpdatePermission" operator="equals" value="true"/>
</and>
@@ -249,14 +249,14 @@
<menu name="TaskTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml">
<menu-item name="taskView" title="${uiLabelMap.ProjectMgrTaskSummary}">
<condition>
- <not><if-empty field-name="workEffort"/></not>
+ <not><if-empty field="workEffort"/></not>
</condition>
<link target="taskView?workEffortId=${workEffortId}"/>
</menu-item>
<menu-item name="edittask" title="${uiLabelMap.ProjectMgrEditTask}">
<condition>
<and>
- <not><if-empty field-name="workEffort"/></not>
+ <not><if-empty field="workEffort"/></not>
<if-compare field-name="workEffort.currentStatusId" operator="not-equals" value="PTS_COMPLETED"/>
<if-compare field-name="workEffort.currentStatusId" operator="not-equals" value="PTS_CANCELLED"/>
<if-compare field-name="workEffort.currentStatusId" operator="not-equals" value="PTS_ON_HOLD"/>
@@ -267,7 +267,7 @@
<menu-item name="dependencies" title="${uiLabelMap.ProjectMgrDependencies}">
<condition>
<and>
- <not><if-empty field-name="workEffort"/></not>
+ <not><if-empty field="workEffort"/></not>
<if-compare field-name="workEffort.currentStatusId" operator="not-equals" value="PTS_COMPLETED"/>
<if-compare field-name="workEffort.currentStatusId" operator="not-equals" value="PTS_CANCELLED"/>
<if-compare field-name="workEffort.currentStatusId" operator="not-equals" value="PTS_ON_HOLD"/>
@@ -278,7 +278,7 @@
<menu-item name="parties" title="${uiLabelMap.ProjectMgrResources}">
<condition>
<and>
- <not><if-empty field-name="workEffort"/></not>
+ <not><if-empty field="workEffort"/></not>
<if-compare field-name="workEffort.currentStatusId" operator="not-equals" value="PTS_COMPLETED"/>
<if-compare field-name="workEffort.currentStatusId" operator="not-equals" value="PTS_CANCELLED"/>
<if-compare field-name="workEffort.currentStatusId" operator="not-equals" value="PTS_ON_HOLD"/>
@@ -289,7 +289,7 @@
<menu-item name="projectskills" title="${uiLabelMap.ProjectMgrSkillStandards}">
<condition>
<and>
- <not><if-empty field-name="workEffort"/></not>
+ <not><if-empty field="workEffort"/></not>
<if-compare field-name="workEffort.currentStatusId" operator="not-equals" value="PTS_COMPLETED"/>
<if-compare field-name="workEffort.currentStatusId" operator="not-equals" value="PTS_CANCELLED"/>
<if-compare field-name="workEffort.currentStatusId" operator="not-equals" value="PTS_ON_HOLD"/>
@@ -300,7 +300,7 @@
<menu-item name="timeEntries" title="${uiLabelMap.ProjectMgrTimeEntries}">
<condition>
<and>
- <not><if-empty field-name="workEffort"/></not>
+ <not><if-empty field="workEffort"/></not>
<if-compare field-name="workEffort.currentStatusId" operator="not-equals" value="PTS_COMPLETED"/>
<if-compare field-name="workEffort.currentStatusId" operator="not-equals" value="PTS_CANCELLED"/>
<if-compare field-name="workEffort.currentStatusId" operator="not-equals" value="PTS_ON_HOLD"/>
@@ -311,7 +311,7 @@
<menu-item name="taskContent" title="${uiLabelMap.CommonContent}">
<condition>
<and>
- <not><if-empty field-name="workEffort"/></not>
+ <not><if-empty field="workEffort"/></not>
<if-compare field-name="workEffort.currentStatusId" operator="not-equals" value="PTS_COMPLETED"/>
<if-compare field-name="workEffort.currentStatusId" operator="not-equals" value="PTS_ON_HOLD"/>
<if-compare field-name="workEffort.currentStatusId" operator="not-equals" value="PTS_CANCELED"/>
@@ -321,7 +321,7 @@
</menu-item>
<menu-item name="notes" title="${uiLabelMap.CommonNotes}">
<condition>
- <not><if-empty field-name="workEffort"/></not>
+ <not><if-empty field="workEffort"/></not>
</condition>
<link target="EditTaskNotes?workEffortId=${workEffortId}"/>
</menu-item>
@@ -331,9 +331,9 @@
<menu-item name="new" title="${uiLabelMap.CommonNew}">
<condition>
<or>
- <not><if-empty field-name="workEffort"/></not>
+ <not><if-empty field="workEffort"/></not>
<and>
- <if-empty field-name="workEffort"/>
+ <if-empty field="workEffort"/>
<if-compare field-name="tabButtonItem" operator="equals" value="find"/>
</and>
</or>
@@ -343,7 +343,7 @@
<menu-item name="setonhold" title="${uiLabelMap.ProjectMgrSetOnHold}" >
<condition>
<and>
- <not><if-empty field-name="workEffort"/></not>
+ <not><if-empty field="workEffort"/></not>
<if-compare field-name="workEffort.currentStatusId" operator="equals" value="PTS_CREATED"/>
</and>
</condition>
@@ -352,7 +352,7 @@
<menu-item name="setcomplete" title="${uiLabelMap.ProjectMgrSetComplete}" >
<condition>
<and>
- <not><if-empty field-name="workEffort"/></not>
+ <not><if-empty field="workEffort"/></not>
<if-compare field-name="workEffort.currentStatusId" operator="equals" value="PTS_CREATED"/>
</and>
</condition>
@@ -361,7 +361,7 @@
<menu-item name="release" title="${uiLabelMap.ProjectMgrRelease}" >
<condition>
<and>
- <not><if-empty field-name="workEffort"/></not>
+ <not><if-empty field="workEffort"/></not>
<if-compare field-name="workEffort.currentStatusId" operator="equals" value="PTS_ON_HOLD"/>
</and>
</condition>
@@ -370,7 +370,7 @@
<menu-item name="cancel" title="${uiLabelMap.CommonCancel}" >
<condition>
<and>
- <not><if-empty field-name="workEffort"/></not>
+ <not><if-empty field="workEffort"/></not>
<if-compare field-name="workEffort.currentStatusId" operator="equals" value="PTS_CREATED"/>
</and>
</condition>
@@ -396,7 +396,7 @@
<menu-item name="TimeSheetStatusToComplete" title="${uiLabelMap.CommonStatustoComplete}">
<condition>
<and>
- <not><if-empty field-name="timesheet"/></not>
+ <not><if-empty field="timesheet"/></not>
<if-compare field-name="timesheet.statusId" operator="equals" value="TIMESHEET_IN_PROCESS"/>
</and>
</condition>
@@ -405,7 +405,7 @@
<menu-item name="TimeSheetStatustoProgress" title="Set status to In Progress">
<condition>
<and>
- <not><if-empty field-name="timesheet"/></not>
+ <not><if-empty field="timesheet"/></not>
<if-compare field-name="timesheet.statusId" operator="equals" value="TIMESHEET_COMPLETED"/>
</and>
</condition>
@@ -417,7 +417,7 @@
<menu-item name="TimeSheetStatusToComplete" title="${uiLabelMap.CommonStatustoComplete}">
<condition>
<and>
- <not><if-empty field-name="timesheet"/></not>
+ <not><if-empty field="timesheet"/></not>
<if-compare field-name="timesheet.statusId" operator="equals" value="TIMESHEET_IN_PROCESS"/>
</and>
</condition>
@@ -448,14 +448,14 @@
<menu name="RequestTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml">
<menu-item name="ViewRequest" title="${uiLabelMap.ProjectMgrView}">
<condition>
- <not><if-empty field-name="custRequest"/></not>
+ <not><if-empty field="custRequest"/></not>
</condition>
<link target="ViewRequest?custRequestId=${parameters.custRequestId}"/>
</menu-item>
<menu-item name="editRequest" title="${uiLabelMap.ProjectMgrEdit}">
<condition>
<and>
- <not><if-empty field-name="custRequest"/></not>
+ <not><if-empty field="custRequest"/></not>
<if-compare field-name="custRequest.statusId" operator="not-equals" value="CRQ_CANCELLED"/>
<if-compare field-name="custRequest.statusId" operator="not-equals" value="CRQ_COMPLETED"/>
</and>
@@ -465,7 +465,7 @@
<menu-item name="custRequestContent" title="Content">
<condition>
<and>
- <not><if-empty field-name="custRequest"/></not>
+ <not><if-empty field="custRequest"/></not>
<if-compare field-name="custRequest.statusId" operator="not-equals" value="CRQ_CANCELLED"/>
<if-compare field-name="custRequest.statusId" operator="not-equals" value="CRQ_COMPLETED"/>
</and>
@@ -486,7 +486,7 @@
<menu-item name="cancelledRequest" title="Cancel request" >
<condition>
<and>
- <not><if-empty field-name="custRequest"/></not>
+ <not><if-empty field="custRequest"/></not>
<if-compare field-name="custRequest.statusId" operator="not-equals" value="CRQ_CANCELLED"/>
<if-compare field-name="custRequest.statusId" operator="not-equals" value="CRQ_COMPLETED"/>
</and>
@@ -496,7 +496,7 @@
<menu-item name="addContent" title="Add content">
<condition>
<and>
- <not><if-empty field-name="custRequest"/></not>
+ <not><if-empty field="custRequest"/></not>
<if-compare field-name="custRequest.statusId" operator="not-equals" value="CRQ_CANCELLED"/>
<if-compare field-name="custRequest.statusId" operator="not-equals" value="CRQ_COMPLETED"/>
</and>