svn commit: r739739 [1/3] - in /ofbiz/trunk: applications/content/webapp/co
Locked
svn commit: r739739 [1/3] - in /ofbiz/trunk: applications/content/webapp/co
 
|
Author: jleroux
Date: Sun Feb 1 11:07:47 2009 New Revision: 739739 URL: http://svn.apache.org/viewvc?rev=739739&view=rev Log: <if-empty field-name= => <if-empty field= Modified: ofbiz/trunk/applications/content/webapp/content/layout/LayoutMenus.xml ofbiz/trunk/applications/content/widget/CommonScreens.xml ofbiz/trunk/applications/content/widget/SurveyScreens.xml ofbiz/trunk/applications/content/widget/WebSiteScreens.xml ofbiz/trunk/applications/content/widget/compdoc/CompDocScreens.xml ofbiz/trunk/applications/content/widget/content/ContentScreens.xml ofbiz/trunk/applications/content/widget/content/DataResourceMenus.xml ofbiz/trunk/applications/content/widget/content/DataResourceScreens.xml ofbiz/trunk/applications/content/widget/forum/ForumScreens.xml ofbiz/trunk/applications/product/widget/catalog/CategoryScreens.xml ofbiz/trunk/applications/product/widget/catalog/CommonScreens.xml ofbiz/trunk/applications/product/widget/catalog/ConfigScreens.xml ofbiz/trunk/applications/product/widget/catalog/ProductScreens.xml ofbiz/trunk/applications/product/widget/catalog/PromoScreens.xml ofbiz/trunk/applications/product/widget/catalog/StoreScreens.xml ofbiz/trunk/applications/product/widget/catalog/SubscriptionScreens.xml ofbiz/trunk/applications/product/widget/facility/CommonScreens.xml ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml ofbiz/trunk/applications/product/widget/facility/InventoryItemLabelScreens.xml ofbiz/trunk/applications/product/widget/facility/Menus.xml ofbiz/trunk/applications/product/widget/facility/ShipmentScreens.xml ofbiz/trunk/applications/workeffort/widget/CommonScreens.xml ofbiz/trunk/applications/workeffort/widget/TimesheetScreens.xml ofbiz/trunk/applications/workeffort/widget/WorkEffortRelatedSummaryScreens.xml ofbiz/trunk/applications/workeffort/widget/WorkEffortScreens.xml ofbiz/trunk/framework/common/widget/CommonMenus.xml ofbiz/trunk/framework/common/widget/CommonScreens.xml ofbiz/trunk/framework/exampleext/widget/example/CommonScreens.xml ofbiz/trunk/framework/webtools/widget/TempExprScreens.xml ofbiz/trunk/specialpurpose/assetmaint/widget/AssetmaintScreens.xml ofbiz/trunk/specialpurpose/assetmaint/widget/CommonScreens.xml ofbiz/trunk/specialpurpose/assetmaint/widget/Menus.xml ofbiz/trunk/specialpurpose/assetmaint/widget/ismgr/CommonScreens.xml ofbiz/trunk/specialpurpose/ebay/widget/EbayScreens.xml ofbiz/trunk/specialpurpose/googleCheckout/widget/GoogleCheckoutScreens.xml ofbiz/trunk/specialpurpose/googlebase/widget/GoogleBaseScreens.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/CommonScreens.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/ResourceScreens.xml ofbiz/trunk/specialpurpose/projectmgr/widget/TaskScreens.xml ofbiz/trunk/specialpurpose/webpos/widget/WebPosScreens.xml Modified: ofbiz/trunk/applications/content/webapp/content/layout/LayoutMenus.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/webapp/content/layout/LayoutMenus.xml?rev=739739&r1=739738&r2=739739&view=diff ============================================================================== --- ofbiz/trunk/applications/content/webapp/content/layout/LayoutMenus.xml (original) +++ ofbiz/trunk/applications/content/webapp/content/layout/LayoutMenus.xml Sun Feb 1 11:07:47 2009 @@ -31,8 +31,8 @@ <menu-item name="EditLayout" title="${uiLabelMap.CommonEdit}"> <condition> <and> - <not><if-empty field-name="parameters.contentId"/></not> - <not><if-empty field-name="parameters.drDataResourceId"/></not> + <not><if-empty field="parameters.contentId"/></not> + <not><if-empty field="parameters.drDataResourceId"/></not> </and> </condition> <link target="EditLayout?contentId=${parameters.contentId}&drDataResourceId=${parameters.drDataResourceId}" target-window="_top" style="tabButton" /> @@ -40,8 +40,8 @@ <menu-item name="EditLayoutSubContent" title="${uiLabelMap.ContentSubContent}" > <condition> <and> - <not><if-empty field-name="parameters.contentId"/></not> - <not><if-empty field-name="parameters.drDataResourceId"/></not> + <not><if-empty field="parameters.contentId"/></not> + <not><if-empty field="parameters.drDataResourceId"/></not> </and> </condition> <link target="EditLayoutSubContent?contentId=${parameters.contentId}&drDataResourceId=${parameters.drDataResourceId}" target-window="_top" style="tabButton" /> @@ -49,8 +49,8 @@ <menu-item name="EditLayoutText" title="${uiLabelMap.ContentText}" > <condition> <and> - <not><if-empty field-name="parameters.contentId"/></not> - <not><if-empty field-name="parameters.drDataResourceId"/></not> + <not><if-empty field="parameters.contentId"/></not> + <not><if-empty field="parameters.drDataResourceId"/></not> </and> </condition> <link target="EditLayoutText?contentId=${parameters.contentId}&drDataResourceId=${parameters.drDataResourceId}" target-window="_top" style="tabButton" /> @@ -58,8 +58,8 @@ <menu-item name="EditLayoutHtml" title="${uiLabelMap.ContentHtml}" > <condition> <and> - <not><if-empty field-name="parameters.contentId"/></not> - <not><if-empty field-name="parameters.drDataResourceId"/></not> + <not><if-empty field="parameters.contentId"/></not> + <not><if-empty field="parameters.drDataResourceId"/></not> </and> </condition> <link target="EditLayoutHtml?contentId=${parameters.contentId}&drDataResourceId=${parameters.drDataResourceId}" target-window="_top" style="tabButton" /> @@ -67,8 +67,8 @@ <menu-item name="EditLayoutImage" title="${uiLabelMap.ContentImage}" > <condition> <and> - <not><if-empty field-name="parameters.contentId"/></not> - <not><if-empty field-name="parameters.drDataResourceId"/></not> + <not><if-empty field="parameters.contentId"/></not> + <not><if-empty field="parameters.drDataResourceId"/></not> </and> </condition> <link target="EditLayoutImage?contentId=${parameters.contentId}&drDataResourceId=${parameters.drDataResourceId}" target-window="_top" style="tabButton" /> @@ -76,8 +76,8 @@ <menu-item name="EditLayoutUrl" title="${uiLabelMap.ContentUrl}" > <condition> <and> - <not><if-empty field-name="parameters.contentId"/></not> - <not><if-empty field-name="parameters.drDataResourceId"/></not> + <not><if-empty field="parameters.contentId"/></not> + <not><if-empty field="parameters.drDataResourceId"/></not> </and> </condition> <link target="EditLayoutUrl?contentId=${parameters.contentId}&drDataResourceId=${parameters.drDataResourceId}" target-window="_top" style="tabButton" /> Modified: ofbiz/trunk/applications/content/widget/CommonScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/CommonScreens.xml?rev=739739&r1=739738&r2=739739&view=diff ============================================================================== --- ofbiz/trunk/applications/content/widget/CommonScreens.xml (original) +++ ofbiz/trunk/applications/content/widget/CommonScreens.xml Sun Feb 1 11:07:47 2009 @@ -96,7 +96,7 @@ </container> <section> <condition> - <not><if-empty field-name="currentValue.contentId"/></not> + <not><if-empty field="currentValue.contentId"/></not> </condition> <widgets> <label style="h1" text="${uiLabelMap.${titleProperty}} ${uiLabelMap.CommonFor}: ${currentValue.contentName},${currentValue.description} [${currentValue.contentId}] ${uiLabelMap.${extraFunctionName}}"/> @@ -133,7 +133,7 @@ <widgets> <section> <condition> - <not><if-empty field-name="currentValue.dataResourceId"/></not> + <not><if-empty field="currentValue.dataResourceId"/></not> </condition> <widgets> <include-menu name="dataresourceTopMenu" location="component://content/widget/content/DataResourceMenus.xml"/> @@ -240,7 +240,7 @@ <widgets> <section> <condition> - <not><if-empty field-name="parameters.webSiteId"/></not> + <not><if-empty field="parameters.webSiteId"/></not> </condition> <widgets> <include-menu name="website" location="component://content/widget/content/ContentMenus.xml"/> Modified: ofbiz/trunk/applications/content/widget/SurveyScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/SurveyScreens.xml?rev=739739&r1=739738&r2=739739&view=diff ============================================================================== --- ofbiz/trunk/applications/content/widget/SurveyScreens.xml (original) +++ ofbiz/trunk/applications/content/widget/SurveyScreens.xml Sun Feb 1 11:07:47 2009 @@ -72,7 +72,7 @@ </condition> <widgets> <section> - <condition><not><if-empty field-name="surveyId"/></not></condition> + <condition><not><if-empty field="surveyId"/></not></condition> <widgets> <include-menu name="SurveyTabBar" location="component://content/widget/SurveyMenus.xml"/> <container><link text="${uiLabelMap.ContentSurveyCreate}" target="EditSurvey" style="buttontext"/></container> @@ -105,7 +105,7 @@ <decorator-section name="body"> <section> <condition> - <if-empty field-name="survey"/> + <if-empty field="survey"/> </condition> <widgets> <container style="screenlet"> @@ -155,7 +155,7 @@ <set field="surveyId" from-field="parameters.surveyId"/> <entity-one entity-name="Survey" value-field="survey"/> - <entity-condition entity-name="SurveyMultiResp" list-name="surveyMultiRespList"> + <entity-condition entity-name="SurveyMultiResp" list="surveyMultiRespList"> <condition-expr field-name="surveyId" env-name="surveyId"/> <order-by field-name="surveyMultiRespId"/> </entity-condition> @@ -342,7 +342,7 @@ <section> <widgets> <section> - <condition><not><if-empty field-name="parameters.rootContentId"/></not></condition> + <condition><not><if-empty field="parameters.rootContentId"/></not></condition> <widgets><container><link text="Go Back to CompDoc Root [${parameters.rootContentId}]" target="ViewCompDocInstanceTree?rootContentId=${parameters.rootContentId}" style="buttontext"/></container></widgets> </section> <platform-specific><html><html-template location="component://content/webapp/content/survey/ViewSurveyResponses.ftl"/></html></platform-specific> Modified: ofbiz/trunk/applications/content/widget/WebSiteScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/WebSiteScreens.xml?rev=739739&r1=739738&r2=739739&view=diff ============================================================================== --- ofbiz/trunk/applications/content/widget/WebSiteScreens.xml (original) +++ ofbiz/trunk/applications/content/widget/WebSiteScreens.xml Sun Feb 1 11:07:47 2009 @@ -27,7 +27,7 @@ <set field="headerItem" value="websites"/> <set field="labelTitleProperty" value="PageTitleFindWebSite"/> - <entity-condition entity-name="WebSite" list-name="webSites"> + <entity-condition entity-name="WebSite" list="webSites"> <order-by field-name="webSiteId"/> </entity-condition> </actions> @@ -214,7 +214,7 @@ <section> <condition> <not> - <if-empty field-name="contentRoot"/> + <if-empty field="contentRoot"/> </not> </condition> <widgets> @@ -298,7 +298,7 @@ <entity-and entity-name="ContentPurpose" list-name="currentPurposes"> <field-map field-name="contentId" env-name="contentId"/> </entity-and> - <entity-condition entity-name="ContentPurposeType" list-name="purposeTypes"> + <entity-condition entity-name="ContentPurposeType" list="purposeTypes"> <order-by field-name="description"/> </entity-condition> <entity-and entity-name="DataResource" list-name="templates"> @@ -309,7 +309,7 @@ <field-map field-name="statusTypeId" value="CONTENT_STATUS"/> <order-by field-name="sequenceId"/> </entity-and> - <entity-condition entity-name="DataTemplateType" list-name="templateTypes"/> + <entity-condition entity-name="DataTemplateType" list="templateTypes"/> <entity-and entity-name="Content" list-name="decorators"> <field-map field-name="contentTypeId" value="DECORATOR"/> </entity-and> Modified: ofbiz/trunk/applications/content/widget/compdoc/CompDocScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/compdoc/CompDocScreens.xml?rev=739739&r1=739738&r2=739739&view=diff ============================================================================== --- ofbiz/trunk/applications/content/widget/compdoc/CompDocScreens.xml (original) +++ ofbiz/trunk/applications/content/widget/compdoc/CompDocScreens.xml Sun Feb 1 11:07:47 2009 @@ -483,7 +483,7 @@ </entity-one> <set from-field="dataResource.mimeTypeId" field="mimeTypeId"/> <set from-field="content.contentTypeId" field="contentTypeId"/> - <entity-condition entity-name="ContentRevision" list-name="contentRevisions" use-cache="true"> + <entity-condition entity-name="ContentRevision" list="contentRevisions" use-cache="true"> <condition-list combine="and"> <condition-expr field-name="contentId" env-name="rootContentId" operator="equals"/> </condition-list> @@ -597,7 +597,7 @@ This operation effectively gets the current ContentRevisionItem entity, in any case, and that is needed to get the dataResourceId for this revision, which may not be the latest. --> - <entity-condition entity-name="ContentRevisionItem" list-name="contentRevisionItems" use-cache="true"> + <entity-condition entity-name="ContentRevisionItem" list="contentRevisionItems" use-cache="true"> <condition-list combine="and"> <condition-expr field-name="contentId" env-name="rootContentId"/> <condition-expr field-name="itemContentId" env-name="contentId"/> @@ -639,8 +639,8 @@ <section> <condition> <and> - <not><if-empty field-name="mostRecentRevisionSeqId"/></not> - <not><if-empty field-name="rootContentRevisionSeqId"/></not> + <not><if-empty field="mostRecentRevisionSeqId"/></not> + <not><if-empty field="rootContentRevisionSeqId"/></not> <if-compare-field field-name="mostRecentRevisionSeqId" operator="greater" to-field-name="rootContentRevisionSeqId"/> </and> </condition> @@ -666,7 +666,7 @@ <set value="updateChildCompDocInstance" field="childCompDocTarget"/> <set value="DOCUMENT" field="contentTypeId"/> <!-- - <entity-condition entity-name="MaxRevisionItemView" list-name="rootRevList" use-cache="false" > + <entity-condition entity-name="MaxRevisionItemView" list="rootRevList" use-cache="false" > <condition-list combine="and"> <condition-expr field-name="rootRevisionContentId" operator="equals" env-name="rootInstanceContentId" /> <condition-expr field-name="contentId" operator="equals" env-name="contentId" /> @@ -919,7 +919,7 @@ <set from-field="parameters.rootContentId" field="rootContentId"/> <set from-field="parameters.rootContentRevisionSeqId" field="rootContentRevisionSeqId"/> <set value="COMPDOC_INSTANCE" field="contentTypeId"/> - <entity-condition entity-name="ContentRevision" list-name="contentRevisions" use-cache="true"> + <entity-condition entity-name="ContentRevision" list="contentRevisions" use-cache="true"> <condition-list combine="and"> <condition-expr field-name="contentId" env-name="rootContentId" operator="equals"/> </condition-list> @@ -1081,7 +1081,7 @@ <field-map field-name="contentId" env-name="rootContentId"/> </entity-one> <set from-field="instanceContent.instanceOfContentId" field="templateContentId"/> - <entity-condition entity-name="ContentRevision" list-name="contentTemplateRevisions" use-cache="true"> + <entity-condition entity-name="ContentRevision" list="contentTemplateRevisions" use-cache="true"> <condition-list combine="and"> <condition-expr field-name="contentId" env-name="templateContentId" operator="equals"/> </condition-list> @@ -1163,7 +1163,7 @@ as the contentId value and rootInstanceRevSeqId for the revision and the contentId of the current template part as the itemContentId --> - <entity-condition entity-name="ContentAssocRevisionItemView" use-cache="false" list-name="assocRevisionItemViewList"> + <entity-condition entity-name="ContentAssocRevisionItemView" use-cache="false" list="assocRevisionItemViewList"> <condition-list combine="and"> <condition-expr field-name="contentIdTo" operator="equals" env-name="rootContentId"/> <condition-expr field-name="rootRevisionContentId" operator="equals" env-name="rootContentId"/> Modified: ofbiz/trunk/applications/content/widget/content/ContentScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/content/ContentScreens.xml?rev=739739&r1=739738&r2=739739&view=diff ============================================================================== --- ofbiz/trunk/applications/content/widget/content/ContentScreens.xml (original) +++ ofbiz/trunk/applications/content/widget/content/ContentScreens.xml Sun Feb 1 11:07:47 2009 @@ -149,10 +149,10 @@ <section> <condition> <and> - <not><if-empty field-name="contentId"/></not> - <not><if-empty field-name="contentIdTo"/></not> - <not><if-empty field-name="contentAssocTypeId"/></not> - <not><if-empty field-name="fromDate"/></not> + <not><if-empty field="contentId"/></not> + <not><if-empty field="contentIdTo"/></not> + <not><if-empty field="contentAssocTypeId"/></not> + <not><if-empty field="fromDate"/></not> </and> </condition> <widgets> @@ -175,10 +175,10 @@ <section> <condition> <or> - <if-empty field-name="contentId"/> - <if-empty field-name="contentIdTo"/> - <if-empty field-name="contentAssocTypeId"/> - <if-empty field-name="fromDate"/> + <if-empty field="contentId"/> + <if-empty field="contentIdTo"/> + <if-empty field="contentAssocTypeId"/> + <if-empty field="fromDate"/> </or> </condition> <widgets> @@ -284,7 +284,7 @@ <set field="titleProperty" value="PageTitleFindWebSite"/> <set field="labelTitleProperty" value="PageTitleFindWebSite"/> <set field="tabButtonItem" value="websites"/> - <entity-condition entity-name="WebSiteAndContent" list-name="webSites"> + <entity-condition entity-name="WebSiteAndContent" list="webSites"> <condition-expr field-name="contentId" env-name="parameters.contentId"/> <order-by field-name="webSiteId"/> </entity-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=739739&r1=739738&r2=739739&view=diff ============================================================================== --- ofbiz/trunk/applications/content/widget/content/DataResourceMenus.xml (original) +++ ofbiz/trunk/applications/content/widget/content/DataResourceMenus.xml Sun Feb 1 11:07:47 2009 @@ -33,43 +33,43 @@ </menu-item> <menu-item name="editdataresource" title="Data Resource" > <condition disabled-style="buttontextdisabled"> - <not><if-empty field-name="dataResourceId" /></not> + <not><if-empty field="dataResourceId" /></not> </condition> <link target="EditDataResource" name="EditDataResource" target-window="_top" style="tabButton" /> </menu-item> <menu-item name="editelectronictext" title="Text" > <condition disabled-style="buttontextdisabled"> - <not><if-empty field-name="dataResourceId" /></not> + <not><if-empty field="dataResourceId" /></not> </condition> <link target="EditElectronicText" name="EditElectronicText" target-window="_top" style="tabButton" /> </menu-item> <menu-item name="edithtmltext" title="Html" > <condition disabled-style="buttontextdisabled"> - <not><if-empty field-name="dataResourceId" /></not> + <not><if-empty field="dataResourceId" /></not> </condition> <link target="EditHtmlText" name="EditHtmlText" target-window="_top" style="tabButton" /> </menu-item> <menu-item name="uploadimage" title="Image" > <condition disabled-style="buttontextdisabled"> - <not><if-empty field-name="dataResourceId" /></not> + <not><if-empty field="dataResourceId" /></not> </condition> <link target="UploadImage" name="UploadImage" target-window="_top" style="tabButton" /> </menu-item> <menu-item name="editdataresourceattribute" title="Attribute" > <condition disabled-style="buttontextdisabled"> - <not><if-empty field-name="dataResourceId" /></not> + <not><if-empty field="dataResourceId" /></not> </condition> <link target="EditDataResourceAttribute" name="EditDataResourceAttribute" target-window="_top" style="tabButton" /> </menu-item> <menu-item name="editdataresourcerole" title="Role" > <condition disabled-style="buttontextdisabled"> - <not><if-empty field-name="dataResourceId"/></not> + <not><if-empty field="dataResourceId"/></not> </condition> <link target="EditDataResourceRole" name="EditDataResourceRole" target-window="_top" style="tabButton" /> </menu-item> <menu-item name="editdataresourceproductfeatures" title="Product Features" > <condition disabled-style="buttontextdisabled"> - <not><if-empty field-name="dataResourceId" /></not> + <not><if-empty field="dataResourceId" /></not> </condition> <link target="EditDataResourceProductFeatures" name="EditDataResourceProductFeatures" target-window="_top" style="tabButton" /> </menu-item> @@ -85,14 +85,14 @@ <menu name="dataresource" menu-container-style="button-bar tab-bar" default-selected-style="selected" selected-menuitem-context-field-name="tabButtonItem"> <menu-item name="editDataResource" title="${uiLabelMap.CommonEdit}"> <condition> - <not><if-empty field-name="currentValue.dataResourceId"/></not> + <not><if-empty field="currentValue.dataResourceId"/></not> </condition> <link target="EditDataResource?dataResourceId=${parameters.dataResourceId}"/> </menu-item> <menu-item name="editElectronicText" title="${uiLabelMap.ContentDataResourceText}" > <condition> <and> - <not><if-empty field-name="currentValue.dataResourceId"/></not> + <not><if-empty field="currentValue.dataResourceId"/></not> <if-compare field-name="currentValue.dataResourceTypeId" operator="equals" value="ELECTRONIC_TEXT"/> </and> </condition> @@ -101,7 +101,7 @@ <menu-item name="editHtmlText" title="${uiLabelMap.ContentDataResourceHtml}" > <condition> <and> - <not><if-empty field-name="currentValue.dataResourceId"/></not> + <not><if-empty field="currentValue.dataResourceId"/></not> <if-compare field-name="currentValue.dataResourceTypeId" operator="equals" value="ELECTRONIC_TEXT"/> </and> </condition> @@ -124,19 +124,19 @@ </menu-item> <menu-item name="EditDataResourceAttribute" title="${uiLabelMap.ContentDataResourceAttribute}" > <condition> - <not><if-empty field-name="currentValue.dataResourceId"/></not> + <not><if-empty field="currentValue.dataResourceId"/></not> </condition> <link target="EditDataResourceAttribute?dataResourceId=${parameters.dataResourceId}"/> </menu-item> <menu-item name="editDataResourceRole" title="${uiLabelMap.ContentDataResourceRole}" > <condition> - <not><if-empty field-name="currentValue.dataResourceId"/></not> + <not><if-empty field="currentValue.dataResourceId"/></not> </condition> <link target="EditDataResourceRole?dataResourceId=${parameters.dataResourceId}"/> </menu-item> <menu-item name="editDataResourceProductFeatures" title="${uiLabelMap.ContentDataResourceProductFeatures}" > <condition> - <not><if-empty field-name="currentValue.dataResourceId"/></not> + <not><if-empty field="currentValue.dataResourceId"/></not> </condition> <link target="EditDataResourceProductFeatures?dataResourceId=${parameters.dataResourceId}"/> </menu-item> Modified: ofbiz/trunk/applications/content/widget/content/DataResourceScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/content/DataResourceScreens.xml?rev=739739&r1=739738&r2=739739&view=diff ============================================================================== --- ofbiz/trunk/applications/content/widget/content/DataResourceScreens.xml (original) +++ ofbiz/trunk/applications/content/widget/content/DataResourceScreens.xml Sun Feb 1 11:07:47 2009 @@ -196,7 +196,7 @@ </container> <section> <condition> - <not><if-empty field-name="currentValue"/></not> + <not><if-empty field="currentValue"/></not> </condition> <widgets> <label text="${uiLabelMap.ContentContentsAssociatedToDataResource}" style="h3"/> Modified: ofbiz/trunk/applications/content/widget/forum/ForumScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/forum/ForumScreens.xml?rev=739739&r1=739738&r2=739739&view=diff ============================================================================== --- ofbiz/trunk/applications/content/widget/forum/ForumScreens.xml (original) +++ ofbiz/trunk/applications/content/widget/forum/ForumScreens.xml Sun Feb 1 11:07:47 2009 @@ -38,7 +38,7 @@ <widgets> <section> <condition> - <not><if-empty field-name="tabBar"/></not> + <not><if-empty field="tabBar"/></not> </condition> <widgets> <include-menu name="${tabBar}" location="component://content/widget/forum/ForumMenus.xml"/> @@ -252,7 +252,7 @@ <include-tree name="MessageTree" location="component://content/widget/forum/ForumTrees.xml" /> <section> <condition> - <not><if-empty field-name="parameters.forumThreadId"/></not> + <not><if-empty field="parameters.forumThreadId"/></not> </condition> <widgets> <container style="screenlet"> @@ -273,7 +273,7 @@ </section> <section> <condition> - <not><if-empty field-name="parameters.forumMessageId"/></not> + <not><if-empty field="parameters.forumMessageId"/></not> </condition> <widgets> <container style="screenlet"> Modified: ofbiz/trunk/applications/product/widget/catalog/CategoryScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/CategoryScreens.xml?rev=739739&r1=739738&r2=739739&view=diff ============================================================================== --- ofbiz/trunk/applications/product/widget/catalog/CategoryScreens.xml (original) +++ ofbiz/trunk/applications/product/widget/catalog/CategoryScreens.xml Sun Feb 1 11:07:47 2009 @@ -37,7 +37,7 @@ </condition> <widgets> <section> - <condition><not><if-empty field-name="productCategoryId"/></not></condition> + <condition><not><if-empty field="productCategoryId"/></not></condition> <widgets> <include-menu name="CategoryTabBar" location="component://product/widget/catalog/Menus.xml"/> <container> @@ -74,7 +74,7 @@ <set field="productCategoryId" from-field="parameters.productCategoryId"/> <entity-one entity-name="ProductCategory" value-field="productCategory"/> - <entity-condition entity-name="ProductCategoryType" list-name="productCategoryTypes"> + <entity-condition entity-name="ProductCategoryType" list="productCategoryTypes"> <order-by field-name="description"/> </entity-condition> @@ -105,7 +105,7 @@ <set field="categoryContentOrderList[]" value="prodCatContentTypeId"/> <get-related value-name="productCategory" relation-name="ProductCategoryContent" list-name="productCategoryContentList" order-by-list-name="categoryContentOrderList"/> - <entity-condition entity-name="ProductCategoryType" list-name="productCategoryTypes"/> + <entity-condition entity-name="ProductCategoryType" list="productCategoryTypes"/> </actions> <widgets> <decorator-screen name="CommonCategoryDecorator"> @@ -186,7 +186,7 @@ <decorator-screen name="CommonCategoryDecorator"> <decorator-section name="body"> <section> - <condition><not><if-empty field-name="contentId"/></not></condition> + <condition><not><if-empty field="contentId"/></not></condition> <widgets><link target="/content/control/gotoContent?contentId=${contentId}" text="${uiLabelMap.ContentContent} ${uiLabelMap.CommonPage}" url-mode="inter-app" style="buttontext"/></widgets> </section> @@ -248,11 +248,11 @@ <set field="labelTitleProperty" value="ProductRollup"/> <set field="productCategoryId" from-field="parameters.showProductCategoryId"/> - <entity-condition entity-name="ProductCategoryRollup" list-name="currentProductCategoryRollups"> + <entity-condition entity-name="ProductCategoryRollup" list="currentProductCategoryRollups"> <condition-expr field-name="productCategoryId" env-name="productCategoryId"/> <order-by field-name="sequenceNum"/> </entity-condition> - <entity-condition entity-name="ProductCategoryRollup" list-name="parentProductCategoryRollups"> + <entity-condition entity-name="ProductCategoryRollup" list="parentProductCategoryRollups"> <condition-expr field-name="parentProductCategoryId" env-name="productCategoryId"/> <order-by field-name="sequenceNum"/> </entity-condition> @@ -303,17 +303,17 @@ <set field="productCategoryId" from-field="parameters.productCategoryId"/> <entity-one entity-name="ProductCategory" value-field="productCategory"/> - <entity-condition entity-name="ProdCatalogCategory" list-name="prodCatalogCategories"> + <entity-condition entity-name="ProdCatalogCategory" list="prodCatalogCategories"> <condition-expr field-name="productCategoryId" env-name="productCategoryId"/> <order-by field-name="prodCatalogCategoryTypeId"/> <order-by field-name="sequenceNum"/> <order-by field-name="prodCatalogId"/> </entity-condition> - <entity-condition entity-name="ProdCatalog" list-name="prodCatalogs"> + <entity-condition entity-name="ProdCatalog" list="prodCatalogs"> <order-by field-name="catalogName"/> </entity-condition> - <entity-condition entity-name="ProdCatalogCategoryType" list-name="prodCatalogCategoryTypes"> + <entity-condition entity-name="ProdCatalogCategoryType" list="prodCatalogCategoryTypes"> <order-by field-name="description"/> </entity-condition> </actions> @@ -339,19 +339,19 @@ <set field="productCategoryId" from-field="parameters.productCategoryId"/> <entity-one entity-name="ProductCategory" value-field="productCategory"/> - <entity-condition entity-name="ProductFeatureCategoryAppl" list-name="productFeatureCategoryAppls"> + <entity-condition entity-name="ProductFeatureCategoryAppl" list="productFeatureCategoryAppls"> <condition-expr field-name="productCategoryId" env-name="productCategoryId"/> <order-by field-name="productFeatureCategoryId"/> </entity-condition> - <entity-condition entity-name="ProductFeatureCatGrpAppl" list-name="productFeatureCatGrpAppls"> + <entity-condition entity-name="ProductFeatureCatGrpAppl" list="productFeatureCatGrpAppls"> <condition-expr field-name="productCategoryId" env-name="productCategoryId"/> <order-by field-name="productFeatureGroupId"/> </entity-condition> - <entity-condition entity-name="ProductFeatureCategory" list-name="productFeatureCategories"> + <entity-condition entity-name="ProductFeatureCategory" list="productFeatureCategories"> <order-by field-name="description"/> </entity-condition> - <entity-condition entity-name="ProductFeatureGroup" list-name="productFeatureGroups"> + <entity-condition entity-name="ProductFeatureGroup" list="productFeatureGroups"> <order-by field-name="description"/> </entity-condition> </actions> @@ -377,13 +377,13 @@ <set field="productCategoryId" from-field="parameters.productCategoryId"/> <entity-one entity-name="ProductCategory" value-field="productCategory"/> - <entity-condition entity-name="ProductCategoryRole" list-name="productCategoryRoles"> + <entity-condition entity-name="ProductCategoryRole" list="productCategoryRoles"> <condition-expr field-name="productCategoryId" env-name="productCategoryId"/> <order-by field-name="roleTypeId"/> <order-by field-name="partyId"/> </entity-condition> - <entity-condition entity-name="RoleType" list-name="roleTypes"> + <entity-condition entity-name="RoleType" list="roleTypes"> <order-by field-name="description"/> </entity-condition> </actions> @@ -407,7 +407,7 @@ <set field="labelTitleProperty" value="ProductCategoryAttributes"/> <set field="productCategoryId" from-field="parameters.productCategoryId"/> <entity-one entity-name="ProductCategory" value-field="productCategory"/> - <entity-condition entity-name="ProductCategoryAttribute" list-name="categoryAttributes"> + <entity-condition entity-name="ProductCategoryAttribute" list="categoryAttributes"> <condition-expr field-name="productCategoryId" env-name="productCategoryId"/> </entity-condition> </actions> Modified: ofbiz/trunk/applications/product/widget/catalog/CommonScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/CommonScreens.xml?rev=739739&r1=739738&r2=739739&view=diff ============================================================================== --- ofbiz/trunk/applications/product/widget/catalog/CommonScreens.xml (original) +++ ofbiz/trunk/applications/product/widget/catalog/CommonScreens.xml Sun Feb 1 11:07:47 2009 @@ -71,7 +71,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> @@ -118,7 +118,7 @@ </condition> <widgets> <section> - <condition><not><if-empty field-name="prodCatalogId"/></not></condition> + <condition><not><if-empty field="prodCatalogId"/></not></condition> <widgets> <include-menu name="CatalogTabBar" location="component://product/widget/catalog/Menus.xml"/> </widgets> @@ -158,7 +158,7 @@ </condition> <widgets> <section> - <condition><not><if-empty field-name="productStoreId"/></not></condition> + <condition><not><if-empty field="productStoreId"/></not></condition> <widgets> <include-menu name="ProductStoreTabBar" location="component://product/widget/catalog/Menus.xml"/> Modified: ofbiz/trunk/applications/product/widget/catalog/ConfigScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/ConfigScreens.xml?rev=739739&r1=739738&r2=739739&view=diff ============================================================================== --- ofbiz/trunk/applications/product/widget/catalog/ConfigScreens.xml (original) +++ ofbiz/trunk/applications/product/widget/catalog/ConfigScreens.xml Sun Feb 1 11:07:47 2009 @@ -37,7 +37,7 @@ </condition> <widgets> <section> - <condition><not><if-empty field-name="configItemId"/></not></condition> + <condition><not><if-empty field="configItemId"/></not></condition> <widgets> <include-menu name="ConfigItemTabBar" location="component://product/widget/catalog/Menus.xml"/> <container> @@ -66,7 +66,7 @@ <set field="titleProperty" value="PageTitleFindConfigItems"/> <set field="headerItem" value="configs"/> - <entity-condition list-name="productConfigItems" entity-name="ProductConfigItem"> + <entity-condition list="productConfigItems" entity-name="ProductConfigItem"> <order-by field-name="configItemId"/> </entity-condition> </actions> @@ -143,11 +143,11 @@ <set field="productId" from-field="parameters.productId"/> <entity-one entity-name="ProductConfigProduct" value-field="productConfigProduct" auto-field-map="true"/> - <entity-condition entity-name="ProductConfigOption" list-name="configOptionList"> + <entity-condition entity-name="ProductConfigOption" list="configOptionList"> <condition-expr field-name="configItemId" env-name="configItemId"/> <order-by field-name="sequenceNum"/> </entity-condition> - <entity-condition entity-name="ProductConfigProduct" list-name="configProducts"> + <entity-condition entity-name="ProductConfigProduct" list="configProducts"> <condition-list combine="and"> <condition-expr field-name="configItemId" env-name="configItemId"/> <condition-expr field-name="configOptionId" env-name="configOptionId"/> Modified: ofbiz/trunk/applications/product/widget/catalog/ProductScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/ProductScreens.xml?rev=739739&r1=739738&r2=739739&view=diff ============================================================================== --- ofbiz/trunk/applications/product/widget/catalog/ProductScreens.xml (original) +++ ofbiz/trunk/applications/product/widget/catalog/ProductScreens.xml Sun Feb 1 11:07:47 2009 @@ -51,8 +51,8 @@ <section> <condition> <and> - <not><if-empty field-name="productId"/></not> - <not><if-empty field-name="product"/></not> + <not><if-empty field="productId"/></not> + <not><if-empty field="product"/></not> </and> </condition> <widgets> @@ -71,8 +71,8 @@ <section> <condition> <and> - <not><if-empty field-name="productId"/></not> - <not><if-empty field-name="product"/></not> + <not><if-empty field="productId"/></not> + <not><if-empty field="product"/></not> </and> </condition> <widgets> @@ -167,7 +167,7 @@ <set field="productId" from-field="parameters.productId"/> <entity-one entity-name="Product" value-field="product"/> - <entity-condition entity-name="SupplierProduct" list-name="supplierProductAgreements"> + <entity-condition entity-name="SupplierProduct" list="supplierProductAgreements"> <condition-list> <condition-expr field-name="productId" env-name="productId"/> <condition-expr field-name="agreementId" operator="not-equals" env-name="nullField"/> @@ -245,7 +245,7 @@ <set field="productId" from-field="parameters.productId"/> <entity-one entity-name="Product" value-field="product"/> - <entity-condition entity-name="ProductCategoryMember" list-name="productCategoryMembers"> + <entity-condition entity-name="ProductCategoryMember" list="productCategoryMembers"> <condition-expr field-name="productId" env-name="productId"/> <order-by field-name="sequenceNum"/> <order-by field-name="productCategoryId"/> @@ -349,7 +349,7 @@ <set field="productId" from-field="parameters.productId"/> <entity-one entity-name="Product" value-field="product"/> - <entity-condition entity-name="FixedAssetProduct" list-name="fixedAssetProducts"> + <entity-condition entity-name="FixedAssetProduct" list="fixedAssetProducts"> <condition-expr field-name="productId" env-name="productId"/> </entity-condition> </actions> @@ -686,11 +686,11 @@ <set field="productId" from-field="parameters.productId"/> <entity-one entity-name="Product" value-field="product"/> - <entity-condition entity-name="ProductFacility" list-name="productFacilities"> + <entity-condition entity-name="ProductFacility" list="productFacilities"> <condition-expr field-name="productId" env-name="productId"/> <order-by field-name="facilityId"/> </entity-condition> - <entity-condition entity-name="Facility" list-name="facilities"> + <entity-condition entity-name="Facility" list="facilities"> <order-by field-name="facilityName"/> </entity-condition> </actions> @@ -740,12 +740,12 @@ <set field="productId" from-field="parameters.productId"/> <entity-one entity-name="Product" value-field="product"/> - <entity-condition entity-name="ProductFacilityLocation" list-name="productFacilityLocations"> + <entity-condition entity-name="ProductFacilityLocation" list="productFacilityLocations"> <condition-expr field-name="productId" env-name="productId"/> <order-by field-name="facilityId"/> <order-by field-name="locationSeqId"/> </entity-condition> - <entity-condition entity-name="Facility" list-name="facilities"> + <entity-condition entity-name="Facility" list="facilities"> <order-by field-name="facilityName"/> </entity-condition> </actions> @@ -898,12 +898,12 @@ <set field="productId" from-field="parameters.productId"/> <entity-one entity-name="Product" value-field="product"/> - <entity-condition entity-name="GoodIdentification" list-name="goodIdentifications"> + <entity-condition entity-name="GoodIdentification" list="goodIdentifications"> <condition-expr field-name="productId" env-name="productId"/> <order-by field-name="goodIdentificationTypeId"/> <order-by field-name="idValue"/> </entity-condition> - <entity-condition entity-name="GoodIdentificationType" list-name="goodIdentificationTypes" use-cache="true"> + <entity-condition entity-name="GoodIdentificationType" list="goodIdentificationTypes" use-cache="true"> <order-by field-name="description"/> </entity-condition> </actions> @@ -953,14 +953,14 @@ <set field="productId" from-field="parameters.productId"/> <entity-one entity-name="Product" value-field="product"/> - <entity-condition entity-name="ProductGlAccount" list-name="productGlAccounts"> + <entity-condition entity-name="ProductGlAccount" list="productGlAccounts"> <condition-expr field-name="productId" env-name="productId"/> <order-by field-name="glAccountTypeId"/> </entity-condition> - <entity-condition entity-name="GlAccountType" list-name="productGlAccountTypes" use-cache="true"> + <entity-condition entity-name="GlAccountType" list="productGlAccountTypes" use-cache="true"> <order-by field-name="description"/> </entity-condition> - <entity-condition entity-name="GlAccount" list-name="glAccounts" use-cache="true"> + <entity-condition entity-name="GlAccount" list="glAccounts" use-cache="true"> <order-by field-name="accountCode"/> </entity-condition> </actions> @@ -977,8 +977,8 @@ <section> <condition> <and> - <not><if-empty field-name="productId"/></not> - <not><if-empty field-name="product"/></not> + <not><if-empty field="productId"/></not> + <not><if-empty field="product"/></not> </and> </condition> <widgets> @@ -997,8 +997,8 @@ <section> <condition> <and> - <not><if-empty field-name="productId"/></not> - <not><if-empty field-name="product"/></not> + <not><if-empty field="productId"/></not> + <not><if-empty field="product"/></not> </and> </condition> <widgets> @@ -1023,7 +1023,7 @@ <set field="productId" from-field="parameters.productId"/> <entity-one entity-name="Product" value-field="product"/> - <entity-condition entity-name="ProductPaymentMethodType" list-name="productPaymentMethodTypes"> + <entity-condition entity-name="ProductPaymentMethodType" list="productPaymentMethodTypes"> <condition-expr field-name="productId" env-name="productId"/> <order-by field-name="productPricePurposeId"/> <order-by field-name="paymentMethodTypeId"/> @@ -1185,7 +1185,7 @@ </container> </container> <section> - <condition><not><if-empty field-name="supplierProduct"/></not></condition> + <condition><not><if-empty field="supplierProduct"/></not></condition> <widgets><link target="EditProductSuppliers?productId=${productId}" style="buttontext" text="${uiLabelMap.ProductNewProductSupplier}"/></widgets> </section> <container style="screenlet"> @@ -1499,7 +1499,7 @@ <screen name="CreateVirtualWithVariantsFormInclude"> <section> <actions> - <entity-condition entity-name="ProductFeature" list-name="hazmatFeatures"> + <entity-condition entity-name="ProductFeature" list="hazmatFeatures"> <condition-expr field-name="productFeatureTypeId" value="HAZMAT"/> </entity-condition> </actions> @@ -1739,13 +1739,13 @@ <set field="productId" from-field="parameters.productId"/> <entity-one entity-name="Product" value-field="product"/> - <entity-condition entity-name="ProductRole" list-name="productRoles"> + <entity-condition entity-name="ProductRole" list="productRoles"> <condition-expr field-name="productId" env-name="productId"/> <order-by field-name="roleTypeId"/> <order-by field-name="partyId"/> </entity-condition> - <entity-condition entity-name="RoleType" list-name="roleTypes"> + <entity-condition entity-name="RoleType" list="roleTypes"> <order-by field-name="description"/> </entity-condition> </actions> @@ -1776,7 +1776,7 @@ <set field="labelTitleProperty" value="PartyVendor"/> <set field="productId" from-field="parameters.productId"/> - <entity-condition entity-name="VendorProduct" list-name="vendorProductList"> + <entity-condition entity-name="VendorProduct" list="vendorProductList"> <condition-expr field-name="productId" env-name="productId"/> </entity-condition> </actions> Modified: ofbiz/trunk/applications/product/widget/catalog/PromoScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/PromoScreens.xml?rev=739739&r1=739738&r2=739739&view=diff ============================================================================== --- ofbiz/trunk/applications/product/widget/catalog/PromoScreens.xml (original) +++ ofbiz/trunk/applications/product/widget/catalog/PromoScreens.xml Sun Feb 1 11:07:47 2009 @@ -37,7 +37,7 @@ </condition> <widgets> <section> - <condition><not><if-empty field-name="productPromoId"/></not></condition> + <condition><not><if-empty field="productPromoId"/></not></condition> <widgets> <include-menu name="PromoTabBar" location="component://product/widget/catalog/Menus.xml"/> Modified: ofbiz/trunk/applications/product/widget/catalog/StoreScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/StoreScreens.xml?rev=739739&r1=739738&r2=739739&view=diff ============================================================================== --- ofbiz/trunk/applications/product/widget/catalog/StoreScreens.xml (original) +++ ofbiz/trunk/applications/product/widget/catalog/StoreScreens.xml Sun Feb 1 11:07:47 2009 @@ -28,7 +28,7 @@ <set field="headerItem" value="store"/> <set field="tabButtonItem" value="EditProductStoreList"/> - <entity-condition entity-name="ProductStore" list-name="productStores"> + <entity-condition entity-name="ProductStore" list="productStores"> <order-by field-name="storeName"/> </entity-condition> </actions> @@ -127,7 +127,7 @@ <set field="userEntered" from-field="parameters.userEntered"/> <set field="activeOnly" from-field="parameters.activeOnly" default-value="true"/> - <entity-condition entity-name="ProductStorePromoAndAppl" list-name="productStorePromoAndAppls" filter-by-date="${activeOnly}"> + <entity-condition entity-name="ProductStorePromoAndAppl" list="productStorePromoAndAppls" filter-by-date="${activeOnly}"> <condition-list combine="and"> <condition-expr field-name="userEntered" env-name="userEntered" ignore-if-empty="true"/> <condition-expr field-name="productStoreId" env-name="productStoreId"/> @@ -195,7 +195,7 @@ <set field="productStoreId" from-field="parameters.productStoreId"/> <entity-one entity-name="ProductStore" value-field="productStore" auto-field-map="true"/> - <entity-condition entity-name="ProductStoreCatalog" list-name="productStoreCatalogs"> + <entity-condition entity-name="ProductStoreCatalog" list="productStoreCatalogs"> <condition-expr field-name="productStoreId" env-name="productStoreId"/> <order-by field-name="sequenceNum"/> <order-by field-name="productStoreId"/> @@ -249,11 +249,11 @@ <set field="productStoreId" from-field="parameters.productStoreId" default-value="${productStoreId}"/> <entity-one entity-name="ProductStore" value-field="productStore" auto-field-map="true"/> - <entity-condition entity-name="WebSite" list-name="storeWebSites"> + <entity-condition entity-name="WebSite" list="storeWebSites"> <condition-expr field-name="productStoreId" env-name="productStoreId"/> <order-by field-name="siteName"/> </entity-condition> - <entity-condition entity-name="WebSite" list-name="webSites"> + <entity-condition entity-name="WebSite" list="webSites"> <order-by field-name="siteName"/> </entity-condition> </actions> @@ -278,12 +278,12 @@ <set field="productStoreId" from-field="parameters.productStoreId"/> <entity-one entity-name="ProductStore" value-field="productStore" auto-field-map="true"/> - <entity-condition entity-name="ProductStoreShipmentMethView" list-name="storeShipMethods"> + <entity-condition entity-name="ProductStoreShipmentMethView" list="storeShipMethods"> <condition-expr field-name="productStoreId" env-name="productStoreId"/> <order-by field-name="sequenceNumber"/> </entity-condition> <entity-one entity-name="ProductStoreShipmentMeth" value-field="productStoreShipmentMeth" auto-field-map="true"/> - <entity-condition entity-name="CarrierShipmentMethod" list-name="carrierShipmentMethods"> + <entity-condition entity-name="CarrierShipmentMethod" list="carrierShipmentMethods"> <order-by field-name="sequenceNumber"/> </entity-condition> </actions> @@ -310,8 +310,8 @@ <section> <condition> <and> - <if-empty field-name="productStoreShipmentMeth"/> - <if-empty field-name="parameters.addCarrierShipMeth"/> + <if-empty field="productStoreShipmentMeth"/> + <if-empty field="parameters.addCarrierShipMeth"/> </and> </condition> <widgets> @@ -327,8 +327,8 @@ <section> <condition> <and> - <if-empty field-name="productStoreShipmentMeth"/> - <if-empty field-name="parameters.addCarrierShipMeth"/> + <if-empty field="productStoreShipmentMeth"/> + <if-empty field="parameters.addCarrierShipMeth"/> </and> </condition> <widgets> @@ -357,7 +357,7 @@ <set field="productStoreId" from-field="parameters.productStoreId"/> <entity-one entity-name="ProductStore" value-field="productStore" auto-field-map="true"/> - <entity-condition entity-name="ShipmentCostEstimate" list-name="estimates"> + <entity-condition entity-name="ShipmentCostEstimate" list="estimates"> <condition-expr field-name="productStoreId" env-name="productStoreId"/> <order-by field-name="geoIdFrom"/> <order-by field-name="shipmentMethodTypeId"/> @@ -387,7 +387,7 @@ <container style="h3"> <section> <condition> - <if-empty field-name="estimate"/> + <if-empty field="estimate"/> </condition> <widgets> <label text="${uiLabelMap.ProductNewShipmentEstimate}"/> @@ -401,7 +401,7 @@ <container style="screenlet-body"> <section> <condition> - <if-empty field-name="estimate"/> + <if-empty field="estimate"/> </condition> <widgets> <include-form name="AddShipmentCostEstimate" location="component://product/webapp/catalog/store/ProductStoreForms.xml"/> @@ -490,7 +490,7 @@ <set field="productStoreId" from-field="parameters.productStoreId"/> <entity-one entity-name="ProductStore" value-field="productStore" auto-field-map="true"/> - <entity-condition entity-name="ProductStoreEmailSetting" list-name="productStoreEmailSettings"> + <entity-condition entity-name="ProductStoreEmailSetting" list="productStoreEmailSettings"> <condition-expr field-name="productStoreId" env-name="productStoreId"/> <order-by field-name="emailType"/> </entity-condition> @@ -566,7 +566,7 @@ <set field="productStoreId" from-field="parameters.productStoreId"/> <entity-one entity-name="ProductStore" value-field="productStore" auto-field-map="true"/> - <entity-condition entity-name="ProductStoreKeywordOvrd" list-name="productStorekeywordOvrdList"> + <entity-condition entity-name="ProductStoreKeywordOvrd" list="productStorekeywordOvrdList"> <condition-expr field-name="productStoreId" env-name="productStoreId"/> </entity-condition> </actions> @@ -658,7 +658,7 @@ <entity-one entity-name="ProductStore" value-field="productStore" auto-field-map="true"/> <entity-one entity-name="ProductStoreFinActSetting" value-field="finAccountSetting"/> - <entity-condition entity-name="ProductStoreFinActSetting" list-name="productStoreFinActSettings"> + <entity-condition entity-name="ProductStoreFinActSetting" list="productStoreFinActSettings"> <condition-expr field-name="productStoreId" env-name="productStoreId"/> </entity-condition> </actions> @@ -710,7 +710,7 @@ <set field="productStoreId" from-field="parameters.productStoreId"/> - <entity-condition entity-name="ProductStoreVendorPayment" list-name="productStoreVendorPaymentList"> + <entity-condition entity-name="ProductStoreVendorPayment" list="productStoreVendorPaymentList"> <condition-expr field-name="productStoreId" env-name="productStoreId"/> </entity-condition> </actions> @@ -761,7 +761,7 @@ <set field="productStoreId" from-field="parameters.productStoreId"/> - <entity-condition entity-name="ProductStoreVendorShipment" list-name="productStoreVendorShipmentList"> + <entity-condition entity-name="ProductStoreVendorShipment" list="productStoreVendorShipmentList"> <condition-expr field-name="productStoreId" env-name="productStoreId"/> </entity-condition> </actions> Modified: ofbiz/trunk/applications/product/widget/catalog/SubscriptionScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/SubscriptionScreens.xml?rev=739739&r1=739738&r2=739739&view=diff ============================================================================== --- ofbiz/trunk/applications/product/widget/catalog/SubscriptionScreens.xml (original) +++ ofbiz/trunk/applications/product/widget/catalog/SubscriptionScreens.xml Sun Feb 1 11:07:47 2009 @@ -79,7 +79,7 @@ <widgets> <section> <condition> - <not><if-empty field-name="subscription"/></not> + <not><if-empty field="subscription"/></not> </condition> <widgets> <include-menu name="EditSubscription" location="component://product/widget/catalog/SubscriptionMenus.xml"/> @@ -113,7 +113,7 @@ </actions> <widgets> <section> - <condition><if-empty field-name="subscriptionId"/></condition> + <condition><if-empty field="subscriptionId"/></condition> <actions><set field="titleProperty" value="ProductNewSubscription"/></actions> <widgets/> </section> @@ -201,7 +201,7 @@ <widgets> <section> <condition> - <not><if-empty field-name="subscriptionResource"/></not> + <not><if-empty field="subscriptionResource"/></not> </condition> <widgets> <include-menu name="EditSubscriptionResource" location="component://product/widget/catalog/SubscriptionMenus.xml"/> @@ -238,7 +238,7 @@ </actions> <widgets> <section> - <condition><if-empty field-name="subscriptionResourceId"/></condition> + <condition><if-empty field="subscriptionResourceId"/></condition> <actions><set field="titleProperty" value="ProductNewSubscriptionResource"/></actions> <widgets/> </section> Modified: ofbiz/trunk/applications/product/widget/facility/CommonScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/facility/CommonScreens.xml?rev=739739&r1=739738&r2=739739&view=diff ============================================================================== --- ofbiz/trunk/applications/product/widget/facility/CommonScreens.xml (original) +++ ofbiz/trunk/applications/product/widget/facility/CommonScreens.xml Sun Feb 1 11:07:47 2009 @@ -66,8 +66,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> @@ -126,7 +126,7 @@ <widgets> <section> <condition> - <not><if-empty field-name="inventoryItemLabel"/></not> + <not><if-empty field="inventoryItemLabel"/></not> </condition> <widgets> <include-menu name="InventoryItemLabelsTabBar" location="component://product/widget/facility/Menus.xml"/> Modified: ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml?rev=739739&r1=739738&r2=739739&view=diff ============================================================================== --- ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml (original) +++ ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml Sun Feb 1 11:07:47 2009 @@ -139,7 +139,7 @@ <widgets> <section> <condition> - <not><if-empty field-name="facility"/></not> + <not><if-empty field="facility"/></not> </condition> <actions> <set field="titleProperty" value="ProductEditFacility"/> @@ -281,7 +281,7 @@ <widgets> <section> <condition> - <not><if-empty field-name="locationSeqId"/></not> + <not><if-empty field="locationSeqId"/></not> </condition> <actions> <set field="title" value="${uiLabelMap.PageTitleEditFacilityLocation}"/> @@ -343,7 +343,7 @@ <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="50"/> <entity-one entity-name="Facility" value-field="facility"/> - <entity-condition entity-name="InventoryItemLabelType" list-name="labelTypes"/> + <entity-condition entity-name="InventoryItemLabelType" list="labelTypes"/> <script location="component://product/webapp/facility/WEB-INF/actions/facility/FindInventoryItemsByLabels.groovy"/> </actions> <widgets> @@ -799,7 +799,7 @@ <widgets> <section> <condition> - <not><if-empty field-name="parameters.contactMechId"/></not> + <not><if-empty field="parameters.contactMechId"/></not> </condition> <actions> <set field="title" value="${uiLabelMap.PageTitleEditFacilityContactMech}"/> @@ -829,7 +829,7 @@ <entity-one entity-name="Facility" value-field="facility" auto-field-map="true"/> <entity-one entity-name="InventoryItem" value-field="inventoryItem" auto-field-map="true"/> - <entity-condition entity-name="OrderItemShipGrpInvRes" list-name="inventoryItemReservations"> + <entity-condition entity-name="OrderItemShipGrpInvRes" list="inventoryItemReservations"> <condition-list combine="and"> <condition-expr field-name="inventoryItemId" operator="equals" env-name="inventoryItemId"/> </condition-list> @@ -841,9 +841,9 @@ <condition> <and> <not> - <if-empty field-name="inventoryItem"/> + <if-empty field="inventoryItem"/> </not> - <if-empty field-name="facility"/> + <if-empty field="facility"/> </and> </condition> <actions> @@ -857,7 +857,7 @@ <decorator-section name="body"> <section> <condition> - <not><if-empty field-name="inventoryItem"/></not> + <not><if-empty field="inventoryItem"/></not> </condition> <widgets> <include-menu name="InventoryItemTabBar" location="component://product/widget/facility/Menus.xml"/> @@ -878,7 +878,7 @@ <include-form name="EditInventoryItem" location="component://product/webapp/facility/inventory/InventoryForms.xml"/> <section> <condition> - <not><if-empty field-name="inventoryItemId"/></not> + <not><if-empty field="inventoryItemId"/></not> </condition> <widgets> <screenlet id="inventory-item-reservations" title="${uiLabelMap.ProductInventoryItemReservations}" collapsible="true"> @@ -916,7 +916,7 @@ <set field="inventoryItemId" from-field="parameters.inventoryItemId" /> <set field="facilityId" from-field="parameters.facilityId" /> - <entity-condition entity-name="InventoryItemDetail" list-name="inventoryItemDetails"> + <entity-condition entity-name="InventoryItemDetail" list="inventoryItemDetails"> <condition-list combine="and"> <condition-expr field-name="inventoryItemId" operator="equals" env-name="inventoryItemId"/> </condition-list> @@ -971,7 +971,7 @@ <set field="inventoryItemId" from-field="parameters.inventoryItemId" /> <set field="facilityId" from-field="parameters.facilityId" /> - <entity-condition entity-name="InventoryItemLabelAppl" list-name="inventoryItemLabelAppls"> + <entity-condition entity-name="InventoryItemLabelAppl" list="inventoryItemLabelAppls"> <condition-list combine="and"> <condition-expr field-name="inventoryItemId" operator="equals" env-name="inventoryItemId"/> </condition-list> @@ -1113,7 +1113,7 @@ <field-map field-name="facilityId"/> </service> - <entity-condition entity-name="Picklist" list-name="picklistActiveList"> + <entity-condition entity-name="Picklist" list="picklistActiveList"> <condition-list combine="and"> <condition-expr field-name="facilityId" operator="equals" env-name="parameters.facilityId"/> <condition-expr field-name="statusId" operator="not-equals" value="PICKLIST_PICKED"/> @@ -1146,10 +1146,10 @@ <field-map field-name="facilityId"/> </service> - <entity-condition entity-name="PartyRoleAndPartyDetail" list-name="partyRoleAndPartyDetailList" use-cache="true"> + <entity-condition entity-name="PartyRoleAndPartyDetail" list="partyRoleAndPartyDetailList" use-cache="true"> <condition-expr field-name="roleTypeId" value="PICKER"/> </entity-condition> - <entity-condition entity-name="Picklist" list-name="picklistActiveList"> + <entity-condition entity-name="Picklist" list="picklistActiveList"> <condition-list combine="and"> <condition-expr field-name="facilityId" operator="equals" env-name="parameters.facilityId"/> <condition-expr field-name="statusId" operator="not-equals" value="PICKLIST_PICKED"/> @@ -1285,7 +1285,7 @@ <set field="facilityId" from-field="parameters.facilityId"/> <!-- get ShipmentRouteSegmentDetails that are PACKED and not CONFIRMED with carrier --> - <entity-condition entity-name="ShipmentRouteSegmentDetail" list-name="shipmentRouteSegments"> + <entity-condition entity-name="ShipmentRouteSegmentDetail" list="shipmentRouteSegments"> <condition-list combine="and"> <condition-expr field-name="originFacilityId" operator="equals" env-name="parameters.facilityId"/> <condition-expr field-name="statusId" operator="equals" value="SHIPMENT_PACKED"/> @@ -1334,7 +1334,7 @@ <set field="facilityId" from-field="parameters.facilityId"/> <!-- get all carrier CONFIRMED ShipmentPackageRouteDetails --> - <entity-condition entity-name="ShipmentPackageRouteDetail" list-name="shipmentPackageRouteSegments"> + <entity-condition entity-name="ShipmentPackageRouteDetail" list="shipmentPackageRouteSegments"> <condition-list combine="and"> <condition-expr field-name="labelPrinted" operator="not-equals" value="Y"/> <condition-expr field-name="carrierServiceStatusId" operator="equals" value="SHRSCS_CONFIRMED"/> Modified: ofbiz/trunk/applications/product/widget/facility/InventoryItemLabelScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/facility/InventoryItemLabelScreens.xml?rev=739739&r1=739738&r2=739739&view=diff ============================================================================== --- ofbiz/trunk/applications/product/widget/facility/InventoryItemLabelScreens.xml (original) +++ ofbiz/trunk/applications/product/widget/facility/InventoryItemLabelScreens.xml Sun Feb 1 11:07:47 2009 @@ -86,7 +86,7 @@ <widgets> <section> <condition> - <not><if-empty field-name="inventoryItemLabel"/></not> + <not><if-empty field="inventoryItemLabel"/></not> </condition> <widgets> <decorator-screen name="CommonInventoryItemLabelDecorator" location="${parameters.commonFacilityDecoratorLocation}"> Modified: ofbiz/trunk/applications/product/widget/facility/Menus.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/facility/Menus.xml?rev=739739&r1=739738&r2=739739&view=diff ============================================================================== --- ofbiz/trunk/applications/product/widget/facility/Menus.xml (original) +++ ofbiz/trunk/applications/product/widget/facility/Menus.xml Sun Feb 1 11:07:47 2009 @@ -28,7 +28,7 @@ <menu-item name="shipment" title="${uiLabelMap.ProductShipments}"><link target="FindShipment"/></menu-item> <menu-item name="reports" title="${uiLabelMap.CommonReports}"> <condition> - <not><if-empty field-name="facilityId"/></not> + <not><if-empty field="facilityId"/></not> </condition> <link target="InventoryReports?facilityId=${facilityId}"/> </menu-item> Modified: ofbiz/trunk/applications/product/widget/facility/ShipmentScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/facility/ShipmentScreens.xml?rev=739739&r1=739738&r2=739739&view=diff ============================================================================== --- ofbiz/trunk/applications/product/widget/facility/ShipmentScreens.xml (original) +++ ofbiz/trunk/applications/product/widget/facility/ShipmentScreens.xml Sun Feb 1 11:07:47 2009 @@ -84,7 +84,7 @@ <section> <condition> <not> - <if-empty field-name="shipment"/> + <if-empty field="shipment"/> </not> </condition> <widgets> Modified: ofbiz/trunk/applications/workeffort/widget/CommonScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/widget/CommonScreens.xml?rev=739739&r1=739738&r2=739739&view=diff ============================================================================== --- ofbiz/trunk/applications/workeffort/widget/CommonScreens.xml (original) +++ ofbiz/trunk/applications/workeffort/widget/CommonScreens.xml Sun Feb 1 11:07:47 2009 @@ -69,7 +69,7 @@ <section> <condition> <not> - <if-empty field-name="workEffortId"/> + <if-empty field="workEffortId"/> </not> </condition> <widgets> @@ -107,7 +107,7 @@ </condition> <widgets> <section> - <condition><not><if-empty field-name="timesheetId"/></not></condition> + <condition><not><if-empty field="timesheetId"/></not></condition> <widgets> <include-menu name="TimesheetTabBar" location="component://workeffort/widget/TimesheetMenus.xml"/> <container><label style="h1">${uiLabelMap.WorkEffortTimesheetTimesheetId} ${timesheetId}</label></container> @@ -138,13 +138,13 @@ <if-has-permission permission="WORKEFFORTMGR" 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> - <entity-condition entity-name="WorkEffortType" list-name="allWorkEffortTypes"> + <entity-condition entity-name="WorkEffortType" list="allWorkEffortTypes"> <order-by field-name="description"/> </entity-condition> </actions> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |