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 15:13:20 UTC
svn commit: r739769 [1/2] - in /ofbiz/trunk:
applications/content/widget/compdoc/ applications/content/widget/content/
applications/product/widget/catalog/ applications/product/widget/facility/
framework/example/widget/example/ specialpurpose/assetmain...
Author: jleroux
Date: Sun Feb 1 14:13:19 2009
New Revision: 739769
URL: http://svn.apache.org/viewvc?rev=739769&view=rev
Log:
<if-compare field-name= => <if-compare field=
Modified:
ofbiz/trunk/applications/content/widget/compdoc/CompDocScreens.xml
ofbiz/trunk/applications/content/widget/content/DataResourceMenus.xml
ofbiz/trunk/applications/product/widget/catalog/Menus.xml
ofbiz/trunk/applications/product/widget/catalog/ProductScreens.xml
ofbiz/trunk/applications/product/widget/catalog/PromoScreens.xml
ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml
ofbiz/trunk/framework/example/widget/example/ExampleAjaxScreens.xml
ofbiz/trunk/specialpurpose/assetmaint/widget/AssetmaintScreens.xml
ofbiz/trunk/specialpurpose/mypage/widget/CommonScreens.xml
ofbiz/trunk/specialpurpose/mypage/widget/MyPageMenus.xml
ofbiz/trunk/specialpurpose/mypage/widget/MyPageScreens.xml
ofbiz/trunk/specialpurpose/myportal/widget/MyPortalMenus.xml
ofbiz/trunk/specialpurpose/myportal/widget/MyPortalScreens.xml
ofbiz/trunk/specialpurpose/projectmgr/widget/CommonScreens.xml
ofbiz/trunk/specialpurpose/projectmgr/widget/Menus.xml
ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml
ofbiz/trunk/specialpurpose/projectmgr/widget/TimeSheetScreens.xml
Modified: ofbiz/trunk/applications/content/widget/compdoc/CompDocScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/compdoc/CompDocScreens.xml?rev=739769&r1=739768&r2=739769&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/widget/compdoc/CompDocScreens.xml (original)
+++ ofbiz/trunk/applications/content/widget/compdoc/CompDocScreens.xml Sun Feb 1 14:13:19 2009
@@ -52,7 +52,7 @@
<decorator-section name="body">
<container><link target="ListWaitingContentApproval?contentId=${contentId}&contentRevisionSeqId=${contentRevisionSeqId}" text="${uiLabelMap.ContentCompDocViewWaitingApprovals}" style="buttontext"/></container>
<section>
- <condition><if-compare field-name="content.contentTypeId" operator="equals" value="COMPDOC_INSTANCE"/></condition>
+ <condition><if-compare field="content.contentTypeId" operator="equals" value="COMPDOC_INSTANCE"/></condition>
<widgets><include-screen name="rootInstanceApprovalStatus"/></widgets>
</section>
<container style="screenlet">
@@ -71,7 +71,7 @@
</container>
<section>
<condition>
- <if-compare field-name="content.contentTypeId" operator="equals" value="COMPDOC_TEMPLATE"/>
+ <if-compare field="content.contentTypeId" operator="equals" value="COMPDOC_TEMPLATE"/>
</condition>
<actions>
<set field="title" value="${uiLabelMap.PageTitleEditCompDocInstance} [${rootContentId}]"/>
@@ -496,7 +496,7 @@
<widgets>
<section>
<condition>
- <if-compare field-name="contentTypeId" operator="equals" value="COMPDOC_TEMPLATE"/>
+ <if-compare field="contentTypeId" operator="equals" value="COMPDOC_TEMPLATE"/>
</condition>
<actions>
<set field="title" value="${uiLabelMap.PageTitleEditCompDocTemplate} ${rootContentId}"/>
@@ -529,7 +529,7 @@
</section>
<section>
<condition>
- <if-compare field-name="content.contentTypeId" operator="equals" value="COMPDOC_INSTANCE"/>
+ <if-compare field="content.contentTypeId" operator="equals" value="COMPDOC_INSTANCE"/>
</condition>
<actions>
<set field="title" value="${uiLabelMap.PageTitleEditCompDocInstance} [${rootContentId}]"/>
@@ -615,7 +615,7 @@
<widgets>
<section>
<condition>
- <if-compare field-name="itemContent.contentTypeId" operator="equals" value="TEMPLATE"/>
+ <if-compare field="itemContent.contentTypeId" operator="equals" value="TEMPLATE"/>
</condition>
<actions>
<set field="title" value="Edit CompDoc Template Part [${contentId}, part of ${rootContentId}]"/>
@@ -659,7 +659,7 @@
</section>
<section>
<condition>
- <if-compare field-name="itemContent.contentTypeId" operator="equals" value="DOCUMENT"/>
+ <if-compare field="itemContent.contentTypeId" operator="equals" value="DOCUMENT"/>
</condition>
<actions>
<set field="title" value="Edit CompDoc Instance Part [${contentId} of ${contentId}]"/>
@@ -708,13 +708,13 @@
<section>
<condition>
<or>
- <if-compare field-name="dataResource.mimeTypeId" operator="equals" value="application/msword"/>
- <if-compare field-name="dataResource.mimeTypeId" operator="equals" value="application/pdf"/>
- <if-compare field-name="dataResource.mimeTypeId" operator="equals" value="application/vnd.oasis.opendocument.text"/>
- <if-compare field-name="dataResource.mimeTypeId" operator="equals" value="image/jpeg"/>
- <if-compare field-name="dataResource.mimeTypeId" operator="equals" value="image/gif"/>
- <if-compare field-name="dataResource.mimeTypeId" operator="equals" value="image/tiff"/>
- <if-compare field-name="dataResource.mimeTypeId" operator="equals" value="image/png"/>
+ <if-compare field="dataResource.mimeTypeId" operator="equals" value="application/msword"/>
+ <if-compare field="dataResource.mimeTypeId" operator="equals" value="application/pdf"/>
+ <if-compare field="dataResource.mimeTypeId" operator="equals" value="application/vnd.oasis.opendocument.text"/>
+ <if-compare field="dataResource.mimeTypeId" operator="equals" value="image/jpeg"/>
+ <if-compare field="dataResource.mimeTypeId" operator="equals" value="image/gif"/>
+ <if-compare field="dataResource.mimeTypeId" operator="equals" value="image/tiff"/>
+ <if-compare field="dataResource.mimeTypeId" operator="equals" value="image/png"/>
</or>
</condition>
<actions>
@@ -726,8 +726,8 @@
<section>
<condition>
<or>
- <if-compare field-name="dataResource.mimeTypeId" operator="equals" value="text/html"/>
- <if-compare field-name="dataResource.mimeTypeId" operator="equals" value="text/plain"/>
+ <if-compare field="dataResource.mimeTypeId" operator="equals" value="text/html"/>
+ <if-compare field="dataResource.mimeTypeId" operator="equals" value="text/plain"/>
</or>
</condition>
<actions>
@@ -738,7 +738,7 @@
</section>
<section>
<condition>
- <if-compare field-name="dataResource.mimeTypeId" operator="equals" value="application/vnd.ofbiz.survey"/>
+ <if-compare field="dataResource.mimeTypeId" operator="equals" value="application/vnd.ofbiz.survey"/>
</condition>
<actions>
</actions>
@@ -750,7 +750,7 @@
</section>
<section>
<condition>
- <if-compare field-name="dataResource.mimeTypeId" operator="equals" value="application/vnd.ofbiz.survey.response"/>
+ <if-compare field="dataResource.mimeTypeId" operator="equals" value="application/vnd.ofbiz.survey.response"/>
</condition>
<actions>
</actions>
@@ -764,19 +764,19 @@
<condition>
<not>
<or>
- <if-compare field-name="dataResource.mimeTypeId" operator="equals" value="application/msword"/>
- <if-compare field-name="dataResource.mimeTypeId" operator="equals" value="application/pdf"/>
- <if-compare field-name="dataResource.mimeTypeId" operator="equals" value="application/vnd.oasis.opendocument.text"/>
- <if-compare field-name="dataResource.mimeTypeId" operator="equals" value="image/jpeg"/>
- <if-compare field-name="dataResource.mimeTypeId" operator="equals" value="image/gif"/>
- <if-compare field-name="dataResource.mimeTypeId" operator="equals" value="image/tiff"/>
- <if-compare field-name="dataResource.mimeTypeId" operator="equals" value="image/png"/>
+ <if-compare field="dataResource.mimeTypeId" operator="equals" value="application/msword"/>
+ <if-compare field="dataResource.mimeTypeId" operator="equals" value="application/pdf"/>
+ <if-compare field="dataResource.mimeTypeId" operator="equals" value="application/vnd.oasis.opendocument.text"/>
+ <if-compare field="dataResource.mimeTypeId" operator="equals" value="image/jpeg"/>
+ <if-compare field="dataResource.mimeTypeId" operator="equals" value="image/gif"/>
+ <if-compare field="dataResource.mimeTypeId" operator="equals" value="image/tiff"/>
+ <if-compare field="dataResource.mimeTypeId" operator="equals" value="image/png"/>
- <if-compare field-name="dataResource.mimeTypeId" operator="equals" value="text/html"/>
- <if-compare field-name="dataResource.mimeTypeId" operator="equals" value="text/plain"/>
+ <if-compare field="dataResource.mimeTypeId" operator="equals" value="text/html"/>
+ <if-compare field="dataResource.mimeTypeId" operator="equals" value="text/plain"/>
- <if-compare field-name="dataResource.dataResourceTypeId" operator="equals" value="SURVEY"/>
- <if-compare field-name="dataResource.dataResourceTypeId" operator="equals" value="SURVEY_RESPONSE"/>
+ <if-compare field="dataResource.dataResourceTypeId" operator="equals" value="SURVEY"/>
+ <if-compare field="dataResource.dataResourceTypeId" operator="equals" value="SURVEY_RESPONSE"/>
</or>
</not>
</condition>
@@ -799,13 +799,13 @@
<section>
<condition>
<or>
- <if-compare field-name="dataResource.mimeTypeId" operator="equals" value="application/msword"/>
- <if-compare field-name="dataResource.mimeTypeId" operator="equals" value="application/pdf"/>
- <if-compare field-name="dataResource.mimeTypeId" operator="equals" value="application/vnd.oasis.opendocument.text"/>
- <if-compare field-name="dataResource.mimeTypeId" operator="equals" value="image/jpeg"/>
- <if-compare field-name="dataResource.mimeTypeId" operator="equals" value="image/gif"/>
- <if-compare field-name="dataResource.mimeTypeId" operator="equals" value="image/tiff"/>
- <if-compare field-name="dataResource.mimeTypeId" operator="equals" value="image/png"/>
+ <if-compare field="dataResource.mimeTypeId" operator="equals" value="application/msword"/>
+ <if-compare field="dataResource.mimeTypeId" operator="equals" value="application/pdf"/>
+ <if-compare field="dataResource.mimeTypeId" operator="equals" value="application/vnd.oasis.opendocument.text"/>
+ <if-compare field="dataResource.mimeTypeId" operator="equals" value="image/jpeg"/>
+ <if-compare field="dataResource.mimeTypeId" operator="equals" value="image/gif"/>
+ <if-compare field="dataResource.mimeTypeId" operator="equals" value="image/tiff"/>
+ <if-compare field="dataResource.mimeTypeId" operator="equals" value="image/png"/>
</or>
</condition>
<actions>
@@ -817,8 +817,8 @@
<section>
<condition>
<or>
- <if-compare field-name="dataResource.mimeTypeId" operator="equals" value="text/html"/>
- <if-compare field-name="dataResource.mimeTypeId" operator="equals" value="text/plain"/>
+ <if-compare field="dataResource.mimeTypeId" operator="equals" value="text/html"/>
+ <if-compare field="dataResource.mimeTypeId" operator="equals" value="text/plain"/>
</or>
</condition>
<actions>
@@ -834,10 +834,10 @@
<section>
<condition>
<or>
- <if-compare field-name="dataResource.mimeTypeId" operator="equals" value="application/vnd.ofbiz.survey"/>
+ <if-compare field="dataResource.mimeTypeId" operator="equals" value="application/vnd.ofbiz.survey"/>
<!--
- <if-compare field-name="dataResource.dataResourceTypeId" operator="equals" value="SURVEY"/>
- <if-compare field-name="dataResource.dataResourceTypeId" operator="equals" value="SURVEY_RESPONSE"/>
+ <if-compare field="dataResource.dataResourceTypeId" operator="equals" value="SURVEY"/>
+ <if-compare field="dataResource.dataResourceTypeId" operator="equals" value="SURVEY_RESPONSE"/>
-->
</or>
</condition>
@@ -853,10 +853,10 @@
<section>
<condition>
<or>
- <if-compare field-name="dataResource.mimeTypeId" operator="equals" value="application/vnd.ofbiz.survey.response"/>
+ <if-compare field="dataResource.mimeTypeId" operator="equals" value="application/vnd.ofbiz.survey.response"/>
<!--
- <if-compare field-name="dataResource.dataResourceTypeId" operator="equals" value="SURVEY"/>
- <if-compare field-name="dataResource.dataResourceTypeId" operator="equals" value="SURVEY_RESPONSE"/>
+ <if-compare field="dataResource.dataResourceTypeId" operator="equals" value="SURVEY"/>
+ <if-compare field="dataResource.dataResourceTypeId" operator="equals" value="SURVEY_RESPONSE"/>
-->
</or>
</condition>
@@ -872,21 +872,21 @@
<condition>
<not>
<or>
- <if-compare field-name="dataResource.mimeTypeId" operator="equals" value="application/msword"/>
- <if-compare field-name="dataResource.mimeTypeId" operator="equals" value="application/pdf"/>
- <if-compare field-name="dataResource.mimeTypeId" operator="equals" value="application/vnd.oasis.opendocument.text"/>
- <if-compare field-name="dataResource.mimeTypeId" operator="equals" value="image/jpeg"/>
- <if-compare field-name="dataResource.mimeTypeId" operator="equals" value="image/gif"/>
- <if-compare field-name="dataResource.mimeTypeId" operator="equals" value="image/tiff"/>
- <if-compare field-name="dataResource.mimeTypeId" operator="equals" value="image/png"/>
+ <if-compare field="dataResource.mimeTypeId" operator="equals" value="application/msword"/>
+ <if-compare field="dataResource.mimeTypeId" operator="equals" value="application/pdf"/>
+ <if-compare field="dataResource.mimeTypeId" operator="equals" value="application/vnd.oasis.opendocument.text"/>
+ <if-compare field="dataResource.mimeTypeId" operator="equals" value="image/jpeg"/>
+ <if-compare field="dataResource.mimeTypeId" operator="equals" value="image/gif"/>
+ <if-compare field="dataResource.mimeTypeId" operator="equals" value="image/tiff"/>
+ <if-compare field="dataResource.mimeTypeId" operator="equals" value="image/png"/>
- <if-compare field-name="dataResource.mimeTypeId" operator="equals" value="text/html"/>
- <if-compare field-name="dataResource.mimeTypeId" operator="equals" value="text/plain"/>
+ <if-compare field="dataResource.mimeTypeId" operator="equals" value="text/html"/>
+ <if-compare field="dataResource.mimeTypeId" operator="equals" value="text/plain"/>
- <if-compare field-name="dataResource.mimeTypeId" operator="equals" value="application/vnd.ofbiz.survey.response"/>
- <if-compare field-name="dataResource.mimeTypeId" operator="equals" value="application/vnd.ofbiz.survey"/>
- <if-compare field-name="dataResource.dataResourceTypeId" operator="equals" value="SURVEY"/>
- <if-compare field-name="dataResource.dataResourceTypeId" operator="equals" value="SURVEY_RESPONSE"/>
+ <if-compare field="dataResource.mimeTypeId" operator="equals" value="application/vnd.ofbiz.survey.response"/>
+ <if-compare field="dataResource.mimeTypeId" operator="equals" value="application/vnd.ofbiz.survey"/>
+ <if-compare field="dataResource.dataResourceTypeId" operator="equals" value="SURVEY"/>
+ <if-compare field="dataResource.dataResourceTypeId" operator="equals" value="SURVEY_RESPONSE"/>
</or>
</not>
</condition>
@@ -1133,7 +1133,7 @@
<condition>
<and>
<if-compare-field field-name="mostRecentRevisionSeqId" operator="equals" to-field-name="rootContentRevisionSeqId"/>
- <if-compare field-name="approvalStatusResult.approvalStatusId" operator="equals" value="CNTAP_NOT_READY"/>
+ <if-compare field="approvalStatusResult.approvalStatusId" operator="equals" value="CNTAP_NOT_READY"/>
</and>
</condition>
<widgets>
@@ -1320,8 +1320,8 @@
<section>
<condition>
<or>
- <if-compare field-name="dataResource.dataResourceTypeId" operator="equals" value="SURVEY"/>
- <if-compare field-name="dataResource.dataResourceTypeId" operator="equals" value="SURVEY_RESPONSE"/>
+ <if-compare field="dataResource.dataResourceTypeId" operator="equals" value="SURVEY"/>
+ <if-compare field="dataResource.dataResourceTypeId" operator="equals" value="SURVEY_RESPONSE"/>
</or>
</condition>
<widgets>
@@ -1331,8 +1331,8 @@
<condition>
<not>
<or>
- <if-compare field-name="dataResource.dataResourceTypeId" operator="equals" value="SURVEY"/>
- <if-compare field-name="dataResource.dataResourceTypeId" operator="equals" value="SURVEY_RESPONSE"/>
+ <if-compare field="dataResource.dataResourceTypeId" operator="equals" value="SURVEY"/>
+ <if-compare field="dataResource.dataResourceTypeId" operator="equals" value="SURVEY_RESPONSE"/>
</or>
</not>
</condition>
Modified: ofbiz/trunk/applications/content/widget/content/DataResourceMenus.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/content/DataResourceMenus.xml?rev=739769&r1=739768&r2=739769&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/widget/content/DataResourceMenus.xml (original)
+++ ofbiz/trunk/applications/content/widget/content/DataResourceMenus.xml Sun Feb 1 14:13:19 2009
@@ -93,7 +93,7 @@
<condition>
<and>
<not><if-empty field="currentValue.dataResourceId"/></not>
- <if-compare field-name="currentValue.dataResourceTypeId" operator="equals" value="ELECTRONIC_TEXT"/>
+ <if-compare field="currentValue.dataResourceTypeId" operator="equals" value="ELECTRONIC_TEXT"/>
</and>
</condition>
<link target="EditElectronicText?dataResourceId=${parameters.dataResourceId}"/>
@@ -102,7 +102,7 @@
<condition>
<and>
<not><if-empty field="currentValue.dataResourceId"/></not>
- <if-compare field-name="currentValue.dataResourceTypeId" operator="equals" value="ELECTRONIC_TEXT"/>
+ <if-compare field="currentValue.dataResourceTypeId" operator="equals" value="ELECTRONIC_TEXT"/>
</and>
</condition>
<link target="EditHtmlText?dataResourceId=${parameters.dataResourceId}"/>
@@ -110,12 +110,12 @@
<menu-item name="uploadImage" title="${uiLabelMap.ContentDataResourceImage}" >
<condition>
<or>
- <if-compare field-name="currentValue.dataResourceTypeId" operator="equals" value="IMAGE_OBJECT"/>
+ <if-compare field="currentValue.dataResourceTypeId" operator="equals" value="IMAGE_OBJECT"/>
<and>
- <if-compare field-name="currentValue.dataResourceTypeId" operator="contains" value="FILE"/>
+ <if-compare field="currentValue.dataResourceTypeId" operator="contains" value="FILE"/>
<or>
- <if-compare field-name="currentValue.mimeTypeId" operator="contains" value="image"/>
- <if-compare field-name="currentValue.mimeTypeId" operator="contains" value="Image"/>
+ <if-compare field="currentValue.mimeTypeId" operator="contains" value="image"/>
+ <if-compare field="currentValue.mimeTypeId" operator="contains" value="Image"/>
</or>
</and>
</or>
Modified: ofbiz/trunk/applications/product/widget/catalog/Menus.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/Menus.xml?rev=739769&r1=739768&r2=739769&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/widget/catalog/Menus.xml (original)
+++ ofbiz/trunk/applications/product/widget/catalog/Menus.xml Sun Feb 1 14:13:19 2009
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -245,19 +245,19 @@
</menu-item>
<menu-item name="QuickAddVariants" title="${uiLabelMap.ProductVariants}">
<condition>
- <if-compare field-name="product.isVirtual" operator="equals" value="Y"/>
+ <if-compare field="product.isVirtual" operator="equals" value="Y"/>
</condition>
<link target="QuickAddVariants?productId=${productId}"/>
</menu-item>
<menu-item name="EditProductConfigs" title="${uiLabelMap.ProductConfigs}">
<condition>
- <if-compare field-name="product.productTypeId" operator="equals" value="AGGREGATED"/>
+ <if-compare field="product.productTypeId" operator="equals" value="AGGREGATED"/>
</condition>
<link target="EditProductConfigs?productId=${productId}"/>
</menu-item>
<menu-item name="EditProductAssetUsage" title="${uiLabelMap.ProductAssetUsage}">
<condition>
- <if-compare field-name="product.productTypeId" operator="equals" value="ASSET_USAGE"/>
+ <if-compare field="product.productTypeId" operator="equals" value="ASSET_USAGE"/>
</condition>
<link target="EditProductAssetUsage?productId=${productId}"/>
</menu-item>
Modified: ofbiz/trunk/applications/product/widget/catalog/ProductScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/ProductScreens.xml?rev=739769&r1=739768&r2=739769&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/widget/catalog/ProductScreens.xml (original)
+++ ofbiz/trunk/applications/product/widget/catalog/ProductScreens.xml Sun Feb 1 14:13:19 2009
@@ -78,7 +78,7 @@
<widgets>
<section>
<condition>
- <if-compare field-name="product.isVirtual" operator="equals" type="String" value="Y"/>
+ <if-compare field="product.isVirtual" operator="equals" type="String" value="Y"/>
</condition>
<widgets>
<container style="screenlet">
@@ -854,7 +854,7 @@
<decorator-section name="body">
<section>
<condition>
- <if-compare field-name="product.isVirtual" operator="equals" type="String" value="Y"/>
+ <if-compare field="product.isVirtual" operator="equals" type="String" value="Y"/>
</condition>
<widgets>
<platform-specific>
Modified: ofbiz/trunk/applications/product/widget/catalog/PromoScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/PromoScreens.xml?rev=739769&r1=739768&r2=739769&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/widget/catalog/PromoScreens.xml (original)
+++ ofbiz/trunk/applications/product/widget/catalog/PromoScreens.xml Sun Feb 1 14:13:19 2009
@@ -281,7 +281,7 @@
</container>
<section>
<condition>
- <if-compare field-name="manualOnly" operator="equals" value="Y"/>
+ <if-compare field="manualOnly" operator="equals" value="Y"/>
</condition>
<widgets>
<container>
Modified: ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml?rev=739769&r1=739768&r2=739769&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml (original)
+++ ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml Sun Feb 1 14:13:19 2009
@@ -38,7 +38,7 @@
<widgets>
<section>
<condition>
- <if-compare field-name="showScreen" value="one" operator="equals"/>
+ <if-compare field="showScreen" value="one" operator="equals"/>
</condition>
<actions>
<script location="component://product/webapp/facility/WEB-INF/actions/facility/EditFacility.groovy"/>
@@ -62,7 +62,7 @@
</section>
<section>
<condition>
- <if-compare field-name="showScreen" value="ten" operator="equals"/>
+ <if-compare field="showScreen" value="ten" operator="equals"/>
</condition>
<widgets>
<label text="${uiLabelMap.FacilitySelection}" style="h1"/>
@@ -79,7 +79,7 @@
</section>
<section>
<condition>
- <if-compare field-name="showScreen" value="more" operator="equals"/>
+ <if-compare field="showScreen" value="more" operator="equals"/>
</condition>
<widgets>
<decorator-screen name="FindScreenDecorator" location="component://common/widget/CommonScreens.xml">
@@ -231,7 +231,7 @@
<container style="screenlet-body">
<section>
<condition>
- <if-compare field-name="parameters.completeRequested" operator="equals" value="true"/>
+ <if-compare field="parameters.completeRequested" operator="equals" value="true"/>
</condition>
<widgets>
<include-form name="FromFacilityTransfersComplete" location="component://product/webapp/facility/facility/FacilityForms.xml"/>
@@ -548,7 +548,7 @@
</container>
<section>
<condition>
- <if-compare field-name="parameters.reportType" operator="equals" value="BY_ITEM"/>
+ <if-compare field="parameters.reportType" operator="equals" value="BY_ITEM"/>
</condition>
<widgets>
<container style="screenlet">
@@ -569,7 +569,7 @@
</section>
<section>
<condition>
- <if-compare field-name="parameters.reportType" operator="equals" value="BY_PRODUCT"/>
+ <if-compare field="parameters.reportType" operator="equals" value="BY_PRODUCT"/>
</condition>
<widgets>
<container style="screenlet">
@@ -590,7 +590,7 @@
</section>
<section>
<condition>
- <if-compare field-name="parameters.reportType" operator="equals" value="BY_DATE"/>
+ <if-compare field="parameters.reportType" operator="equals" value="BY_DATE"/>
</condition>
<widgets>
<container style="screenlet">
@@ -888,7 +888,7 @@
</section>
<section>
<condition>
- <if-compare field-name="inventoryItem.inventoryItemTypeId" operator="equals" value="NON_SERIAL_INV_ITEM"/>
+ <if-compare field="inventoryItem.inventoryItemTypeId" operator="equals" value="NON_SERIAL_INV_ITEM"/>
</condition>
<actions>
<script location="component://product/webapp/facility/WEB-INF/actions/inventory/PhysicalInventoryVariance.groovy"/>
Modified: ofbiz/trunk/framework/example/widget/example/ExampleAjaxScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/example/widget/example/ExampleAjaxScreens.xml?rev=739769&r1=739768&r2=739769&view=diff
==============================================================================
--- ofbiz/trunk/framework/example/widget/example/ExampleAjaxScreens.xml (original)
+++ ofbiz/trunk/framework/example/widget/example/ExampleAjaxScreens.xml Sun Feb 1 14:13:19 2009
@@ -40,7 +40,7 @@
<container style="h1"><label>${uiLabelMap[titleProperty]}</label></container>
<section>
<condition>
- <if-compare field-name="javaScriptEnabled" value="true" operator="equals"/>
+ <if-compare field="javaScriptEnabled" value="true" operator="equals"/>
</condition>
<widgets/>
<fail-widgets>
Modified: ofbiz/trunk/specialpurpose/assetmaint/widget/AssetmaintScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/assetmaint/widget/AssetmaintScreens.xml?rev=739769&r1=739768&r2=739769&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/assetmaint/widget/AssetmaintScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/assetmaint/widget/AssetmaintScreens.xml Sun Feb 1 14:13:19 2009
@@ -169,7 +169,7 @@
</container>
<section>
<condition>
- <if-compare field-name="parameters.mode" operator="equals" value="addAssignment"/>
+ <if-compare field="parameters.mode" operator="equals" value="addAssignment"/>
</condition>
<widgets>
<screenlet id="add-party-assignment" title="${uiLabelMap.PageTitleAddWorkEffortPartyAssign}" collapsible="true">
@@ -188,7 +188,7 @@
</container>
<section>
<condition>
- <if-compare field-name="parameters.mode" operator="equals" value="addChildTask"/>
+ <if-compare field="parameters.mode" operator="equals" value="addChildTask"/>
</condition>
<widgets>
<screenlet id="add-workeffort-task" title="${uiLabelMap.WorkEffortAddTask}" collapsible="true">
Modified: ofbiz/trunk/specialpurpose/mypage/widget/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/mypage/widget/CommonScreens.xml?rev=739769&r1=739768&r2=739769&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/mypage/widget/CommonScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/mypage/widget/CommonScreens.xml Sun Feb 1 14:13:19 2009
@@ -226,7 +226,7 @@
</section>
<section>
<condition>
- <if-compare field-name="preferences.userPrefMap.myCommunications"
+ <if-compare field="preferences.userPrefMap.myCommunications"
operator="equals" value="Y" />
</condition>
<widgets>
@@ -236,7 +236,7 @@
</section>
<section>
<condition>
- <if-compare field-name="preferences.userPrefMap.otherCommunications"
+ <if-compare field="preferences.userPrefMap.otherCommunications"
operator="equals" value="Y" />
</condition>
<widgets>
@@ -246,7 +246,7 @@
</section>
<section>
<condition>
- <if-compare field-name="preferences.userPrefMap.myCompanyComms"
+ <if-compare field="preferences.userPrefMap.myCompanyComms"
operator="equals" value="Y" />
</condition>
<widgets>
@@ -256,7 +256,7 @@
</section>
<section>
<condition>
- <if-compare field-name="preferences.userPrefMap.myTasks"
+ <if-compare field="preferences.userPrefMap.myTasks"
operator="equals" value="Y" />
</condition>
<widgets>
@@ -266,7 +266,7 @@
</section>
<section>
<condition>
- <if-compare field-name="preferences.userPrefMap.myTimesheet"
+ <if-compare field="preferences.userPrefMap.myTimesheet"
operator="equals" value="Y" />
</condition>
<widgets>
Modified: ofbiz/trunk/specialpurpose/mypage/widget/MyPageMenus.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/mypage/widget/MyPageMenus.xml?rev=739769&r1=739768&r2=739769&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/mypage/widget/MyPageMenus.xml (original)
+++ ofbiz/trunk/specialpurpose/mypage/widget/MyPageMenus.xml Sun Feb 1 14:13:19 2009
@@ -37,7 +37,7 @@
<condition>
<and>
<not><if-empty field="userLogin"/></not>
- <if-compare field-name="preferences.userPrefMap.myCommunications" operator="not-equals" value="Y"/>
+ <if-compare field="preferences.userPrefMap.myCommunications" operator="not-equals" value="Y"/>
</and>
</condition>
<link target="myCommunications?donePage=myCommunications"/>
@@ -46,7 +46,7 @@
<condition>
<and>
<not><if-empty field="userLogin"/></not>
- <if-compare field-name="preferences.userPrefMap.otherCommunications" operator="not-equals" value="Y"/>
+ <if-compare field="preferences.userPrefMap.otherCommunications" operator="not-equals" value="Y"/>
<or>
<if-has-permission permission="MYPAGE_EMPLOYEE"/>
<if-has-permission permission="MYPAGE_EMPL-NOEMAIL"/>
@@ -59,7 +59,7 @@
<condition>
<and>
<not><if-empty field="userLogin"/></not>
- <if-compare field-name="preferences.userPrefMap.myCompanyComms" operator="not-equals" value="Y"/>
+ <if-compare field="preferences.userPrefMap.myCompanyComms" operator="not-equals" value="Y"/>
<or>
<if-has-permission permission="MYPAGE_EMPLOYEE"/>
<if-has-permission permission="MYPAGE_EMPL-NOEMAIL"/>
@@ -72,7 +72,7 @@
<condition>
<and>
<not><if-empty field="userLogin"/></not>
- <if-compare field-name="preferences.userPrefMap.myTimesheet" operator="not-equals" value="Y"/>
+ <if-compare field="preferences.userPrefMap.myTimesheet" operator="not-equals" value="Y"/>
<or>
<if-has-permission permission="MYPAGE_EMPLOYEE"/>
<if-has-permission permission="MYPAGE_EMPL-NOEMAIL"/>
@@ -85,7 +85,7 @@
<condition>
<and>
<not><if-empty field="userLogin"/></not>
- <if-compare field-name="preferences.userPrefMap.myTasks" operator="not-equals" value="Y"/>
+ <if-compare field="preferences.userPrefMap.myTasks" operator="not-equals" value="Y"/>
<or>
<if-has-permission permission="MYPAGE_EMPLOYEE"/>
<if-has-permission permission="MYPAGE_EMPL-NOEMAIL"/>
@@ -152,14 +152,14 @@
</menu-item>
<menu-item name="openEvents" title="${uiLabelMap.MyPageOpenEvents}">
<condition>
- <if-compare field-name="parameters.all" operator="equals" value="true" />
+ <if-compare field="parameters.all" operator="equals" value="true" />
</condition>
<link target="${parameters.donePage}?donePage=${parameters.donePage}&all=false" />
</menu-item>
<menu-item name="allOtherEvents" title="${uiLabelMap.MyPageAllEvents}">
<condition>
<or>
- <if-compare field-name="parameters.all" operator="equals" value="false" />
+ <if-compare field="parameters.all" operator="equals" value="false" />
<if-empty field="parameters.all"/>
</or>
</condition>
@@ -175,8 +175,8 @@
<menu-item name="setToComplete" title="${uiLabelMap.MyPageToComplete}">
<condition>
<and>
- <if-compare field-name="timesheet.statusId" operator="equals" value="TIMESHEET_IN_PROCESS"/>
- <if-compare field-name="headerItem" operator="equals" value="main"/>
+ <if-compare field="timesheet.statusId" operator="equals" value="TIMESHEET_IN_PROCESS"/>
+ <if-compare field="headerItem" operator="equals" value="main"/>
</and>
</condition>
<link target="statusToComplete?timesheetId=${timesheet.timesheetId}&statusId=TIMESHEET_COMPLETED"/>
@@ -184,8 +184,8 @@
<menu-item name="setToCompleteKey" title="${uiLabelMap.MyPageToComplete}">
<condition>
<and>
- <if-compare field-name="timesheet.statusId" operator="equals" value="TIMESHEET_IN_PROCESS"/>
- <if-compare field-name="headerItem" operator="not-equals" value="main"/>
+ <if-compare field="timesheet.statusId" operator="equals" value="TIMESHEET_IN_PROCESS"/>
+ <if-compare field="headerItem" operator="not-equals" value="main"/>
</and>
</condition>
<link target="statusToCompleteKey?timesheetId=${timesheet.timesheetId}&statusId=TIMESHEET_COMPLETED"/>
@@ -220,7 +220,7 @@
<and>
<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-compare field="communicationEvent.partyIdFrom" operator="not-equals" value="${userLogin.partyId}"/>
<if-has-permission permission="PARTYMGR_CME-EMAIL_UPDATE"/>
<if-has-permission permission="PARTYMGR_CME-NOTE_CREATE"/>
</and>
@@ -232,7 +232,7 @@
<and>
<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-compare field="communicationEvent.partyIdFrom" operator="not-equals" value="${userLogin.partyId}"/>
<if-has-permission permission="PARTYMGR_CME-EMAIL_UPDATE"/>
<if-has-permission permission="PARTYMGR_CME-NOTE_CREATE"/>
</and>
@@ -261,7 +261,7 @@
<condition>
<and>
<not><if-empty field="parameters.communicationEventId"/></not>
- <if-compare field-name="commEvent.statusId" operator="equals" value="COM_PENDING"/>
+ <if-compare field="commEvent.statusId" operator="equals" value="COM_PENDING"/>
<if-has-permission permission="PARTYMGR_CME-EMAIL_UPDATE"/>
</and>
</condition>
@@ -291,8 +291,8 @@
<condition>
<and>
<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"/>
+ <if-compare field="custRequest.statusId" operator="not-equals" value="CRQ_CANCELLED"/>
+ <if-compare field="custRequest.statusId" operator="not-equals" value="CRQ_COMPLETED"/>
</and>
</condition>
<link target="setCustRequestStatus?custRequestId=${custRequestId}&statusId=CRQ_CANCELLED"/>
@@ -301,8 +301,8 @@
<condition>
<and>
<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"/>
+ <if-compare field="custRequest.statusId" operator="not-equals" value="CRQ_CANCELLED"/>
+ <if-compare field="custRequest.statusId" operator="not-equals" value="CRQ_COMPLETED"/>
</and>
</condition>
<link target="EditCustRequestContent?custRequestId=${custRequest.custRequestId}"/>
Modified: ofbiz/trunk/specialpurpose/mypage/widget/MyPageScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/mypage/widget/MyPageScreens.xml?rev=739769&r1=739768&r2=739769&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/mypage/widget/MyPageScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/mypage/widget/MyPageScreens.xml Sun Feb 1 14:13:19 2009
@@ -60,7 +60,7 @@
<include-menu name="MyTimesheetMenu" location="component://mypage/widget/MyPageMenus.xml"/>
<section>
<condition>
- <if-compare field-name="timesheet.statusId" operator="equals" value="TIMESHEET_COMPLETED"/>
+ <if-compare field="timesheet.statusId" operator="equals" value="TIMESHEET_COMPLETED"/>
</condition>
<widgets>
<include-form name="WeekTimesheet" location="component://projectmgr/widget/forms/TimeSheetForms.xml"/>
@@ -76,7 +76,7 @@
collapsible="true" name="timesheet">
<section>
<condition>
- <if-compare field-name="timesheet.statusId" operator="equals" value="TIMESHEET_COMPLETED"/>
+ <if-compare field="timesheet.statusId" operator="equals" value="TIMESHEET_COMPLETED"/>
</condition>
<widgets>
<include-form name="WeekTimesheet" location="component://projectmgr/widget/forms/TimeSheetForms.xml"/>
@@ -551,9 +551,9 @@
<section><!-- Email -->
<condition>
<or><!-- have for e-mails a special form -->
- <if-compare field-name="parameters.communicationEventTypeId"
+ <if-compare field="parameters.communicationEventTypeId"
operator="equals" value="EMAIL_COMMUNICATION" />
- <if-compare field-name="parameters.communicationEventTypeId"
+ <if-compare field="parameters.communicationEventTypeId"
operator="equals" value="AUTO_EMAIL_COMM" />
</or>
</condition>
@@ -566,7 +566,7 @@
</section>
<section>
<condition><!-- internal note -->
- <if-compare field-name="parameters.communicationEventTypeId"
+ <if-compare field="parameters.communicationEventTypeId"
operator="equals" value="COMMENT_NOTE" />
</condition>
<widgets>
@@ -578,11 +578,11 @@
<section>
<condition><!-- others -->
<and>
- <if-compare field-name="parameters.communicationEventTypeId"
+ <if-compare field="parameters.communicationEventTypeId"
operator="not-equals" value="COMMENT_NOTE" />
- <if-compare field-name="parameters.communicationEventTypeId"
+ <if-compare field="parameters.communicationEventTypeId"
operator="not-equals" value="EMAIL_COMMUNICATION" />
- <if-compare field-name="parameters.communicationEventTypeId"
+ <if-compare field="parameters.communicationEventTypeId"
operator="not-equals" value="AUTO_EMAIL_COMM" />
</and>
</condition>
Modified: ofbiz/trunk/specialpurpose/myportal/widget/MyPortalMenus.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/myportal/widget/MyPortalMenus.xml?rev=739769&r1=739768&r2=739769&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/myportal/widget/MyPortalMenus.xml (original)
+++ ofbiz/trunk/specialpurpose/myportal/widget/MyPortalMenus.xml Sun Feb 1 14:13:19 2009
@@ -42,14 +42,14 @@
</menu-item>
<menu-item name="openEvents" title="${uiLabelMap.MyPortalOpenEvents}">
<condition>
- <if-compare field-name="parameters.all" operator="equals" value="true" />
+ <if-compare field="parameters.all" operator="equals" value="true" />
</condition>
<link target="showPortalPage?portalPageId=${parameters.portalPageId}&all=false" />
</menu-item>
<menu-item name="allOtherEvents" title="${uiLabelMap.MyPortalAllEvents}">
<condition>
<or>
- <if-compare field-name="parameters.all" operator="equals" value="false" />
+ <if-compare field="parameters.all" operator="equals" value="false" />
<if-empty field="parameters.all"/>
</or>
</condition>
@@ -65,8 +65,8 @@
<menu-item name="setToComplete" title="${uiLabelMap.MyPortalToComplete}">
<condition>
<and>
- <if-compare field-name="timesheet.statusId" operator="equals" value="TIMESHEET_IN_PROCESS"/>
- <if-compare field-name="headerItem" operator="equals" value="main"/>
+ <if-compare field="timesheet.statusId" operator="equals" value="TIMESHEET_IN_PROCESS"/>
+ <if-compare field="headerItem" operator="equals" value="main"/>
</and>
</condition>
<link target="statusToComplete?timesheetId=${timesheet.timesheetId}&statusId=TIMESHEET_COMPLETED"/>
@@ -74,8 +74,8 @@
<menu-item name="setToCompleteKey" title="${uiLabelMap.MyPortalToComplete}">
<condition>
<and>
- <if-compare field-name="timesheet.statusId" operator="equals" value="TIMESHEET_IN_PROCESS"/>
- <if-compare field-name="headerItem" operator="not-equals" value="main"/>
+ <if-compare field="timesheet.statusId" operator="equals" value="TIMESHEET_IN_PROCESS"/>
+ <if-compare field="headerItem" operator="not-equals" value="main"/>
</and>
</condition>
<link target="statusToCompleteKey?timesheetId=${timesheet.timesheetId}&statusId=TIMESHEET_COMPLETED"/>
@@ -109,7 +109,7 @@
<and>
<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-compare field="communicationEvent.partyIdFrom" operator="not-equals" value="${userLogin.partyId}"/>
<if-has-permission permission="PARTYMGR_CME-EMAIL_UPDATE"/>
<if-has-permission permission="PARTYMGR_CME-NOTE_CREATE"/>
</and>
@@ -121,7 +121,7 @@
<and>
<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-compare field="communicationEvent.partyIdFrom" operator="not-equals" value="${userLogin.partyId}"/>
<if-has-permission permission="PARTYMGR_CME-EMAIL_UPDATE"/>
<if-has-permission permission="PARTYMGR_CME-NOTE_CREATE"/>
</and>
@@ -142,7 +142,7 @@
<condition>
<and>
<not><if-empty field="communicationEventRole"/></not>
- <if-compare field-name="communicationEvent.statusId" operator="equals" value="COM_ROLE_READ"/>
+ <if-compare field="communicationEvent.statusId" operator="equals" value="COM_ROLE_READ"/>
<if-has-permission permission="PARTYMGR_CME-EMAIL_CREATE"/>
</and>
</condition>
@@ -152,7 +152,7 @@
<condition>
<and>
<not><if-empty field="parameters.communicationEventId"/></not>
- <if-compare field-name="commEvent.statusId" operator="equals" value="COM_PENDING"/>
+ <if-compare field="commEvent.statusId" operator="equals" value="COM_PENDING"/>
<if-has-permission permission="PARTYMGR_CME-EMAIL_UPDATE"/>
</and>
</condition>
@@ -181,8 +181,8 @@
<condition>
<and>
<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"/>
+ <if-compare field="custRequest.statusId" operator="not-equals" value="CRQ_CANCELLED"/>
+ <if-compare field="custRequest.statusId" operator="not-equals" value="CRQ_COMPLETED"/>
</and>
</condition>
<link target="setCustRequestStatus?custRequestId=${custRequestId}&statusId=CRQ_CANCELLED"/>
@@ -191,8 +191,8 @@
<condition>
<and>
<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"/>
+ <if-compare field="custRequest.statusId" operator="not-equals" value="CRQ_CANCELLED"/>
+ <if-compare field="custRequest.statusId" operator="not-equals" value="CRQ_COMPLETED"/>
</and>
</condition>
<link target="EditCustRequestContent?custRequestId=${custRequest.custRequestId}"/>
Modified: ofbiz/trunk/specialpurpose/myportal/widget/MyPortalScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/myportal/widget/MyPortalScreens.xml?rev=739769&r1=739768&r2=739769&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/myportal/widget/MyPortalScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/myportal/widget/MyPortalScreens.xml Sun Feb 1 14:13:19 2009
@@ -61,7 +61,7 @@
<include-menu name="MyTimesheetMenu" location="component://myportal/widget/MyPortalMenus.xml"/>
<section>
<condition>
- <if-compare field-name="timesheet.statusId" operator="equals" value="TIMESHEET_COMPLETED"/>
+ <if-compare field="timesheet.statusId" operator="equals" value="TIMESHEET_COMPLETED"/>
</condition>
<widgets>
<include-form name="WeekTimesheet" location="component://myportal/widget/MyPortalForms.xml"/>
@@ -77,7 +77,7 @@
collapsible="true" name="timesheet">
<section>
<condition>
- <if-compare field-name="timesheet.statusId" operator="equals" value="TIMESHEET_COMPLETED"/>
+ <if-compare field="timesheet.statusId" operator="equals" value="TIMESHEET_COMPLETED"/>
</condition>
<widgets>
<include-form name="WeekTimesheet" location="component://myportal/widget/MyPortalForms.xml"/>
@@ -550,9 +550,9 @@
<section><!-- Email -->
<condition>
<or><!-- have for e-mails a special form -->
- <if-compare field-name="parameters.communicationEventTypeId"
+ <if-compare field="parameters.communicationEventTypeId"
operator="equals" value="EMAIL_COMMUNICATION" />
- <if-compare field-name="parameters.communicationEventTypeId"
+ <if-compare field="parameters.communicationEventTypeId"
operator="equals" value="AUTO_EMAIL_COMM" />
</or>
</condition>
@@ -565,7 +565,7 @@
</section>
<section>
<condition><!-- internal note -->
- <if-compare field-name="parameters.communicationEventTypeId"
+ <if-compare field="parameters.communicationEventTypeId"
operator="equals" value="COMMENT_NOTE" />
</condition>
<widgets>
@@ -577,11 +577,11 @@
<section>
<condition><!-- others -->
<and>
- <if-compare field-name="parameters.communicationEventTypeId"
+ <if-compare field="parameters.communicationEventTypeId"
operator="not-equals" value="COMMENT_NOTE" />
- <if-compare field-name="parameters.communicationEventTypeId"
+ <if-compare field="parameters.communicationEventTypeId"
operator="not-equals" value="EMAIL_COMMUNICATION" />
- <if-compare field-name="parameters.communicationEventTypeId"
+ <if-compare field="parameters.communicationEventTypeId"
operator="not-equals" value="AUTO_EMAIL_COMM" />
</and>
</condition>
Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/CommonScreens.xml?rev=739769&r1=739768&r2=739769&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/CommonScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/CommonScreens.xml Sun Feb 1 14:13:19 2009
@@ -321,9 +321,9 @@
<and>
<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"/>
- <if-compare field-name="communicationEvent.statusId" operator="equals" type="String" value="COM_REFERRED"/>
+ <if-compare field="communicationEvent.statusId" operator="equals" type="String" value="COM_COMPLETE"/>
+ <if-compare field="communicationEvent.statusId" operator="equals" type="String" value="COM_RESOLVED"/>
+ <if-compare field="communicationEvent.statusId" operator="equals" type="String" value="COM_REFERRED"/>
</or>
</and>
</condition>