svn commit: r472127 - in /incubator/ofbiz/trunk/applica
Locked
 
|
Author: jacopoc
Date: Tue Nov 7 06:51:10 2006 New Revision: 472127 URL: http://svn.apache.org/viewvc?view=rev&rev=472127 Log: Removed other duplicated stuff... this component is a total mess. Removed: incubator/ofbiz/trunk/applications/content/webapp/content/data/ incubator/ofbiz/trunk/applications/content/widget/data/ Modified: incubator/ofbiz/trunk/applications/content/widget/content/DataResourceForms.xml incubator/ofbiz/trunk/applications/content/widget/content/DataResourceMenus.xml incubator/ofbiz/trunk/applications/content/widget/content/DataResourceScreens.xml Modified: incubator/ofbiz/trunk/applications/content/widget/content/DataResourceForms.xml URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/content/widget/content/DataResourceForms.xml?view=diff&rev=472127&r1=472126&r2=472127 ============================================================================== --- incubator/ofbiz/trunk/applications/content/widget/content/DataResourceForms.xml (original) +++ incubator/ofbiz/trunk/applications/content/widget/content/DataResourceForms.xml Tue Nov 7 06:51:10 2006 @@ -16,7 +16,7 @@ --> <forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:noNamespaceSchemaLocation="http://www.ofbiz.org/dtds/dtd/widget-form.xsd"> + xsi:noNamespaceSchemaLocation="http://www.ofbiz.org/dtds/widget-form.xsd"> <!-- DataResource forms --> <form name="FindDataResource" target="findDataResource" type="single" default-title-style="tableheadtext" default-tooltip-style="tabletext" default-widget-style="inputBox"> @@ -77,8 +77,10 @@ <field name="dataCategoryId"><display-entity entity-name="DataCategory" description="${categoryName}[${datacategoryId}]"></display-entity></field> </form> - <form name="LookupDataResource" target="LookupDataResource" type="single" extends="FindDataResource" - default-tooltip-style="tabletext"> + <form name="LookupDataResource" target="LookupDataResource" title="" type="single" + default-title-style="tableheadtext" default-tooltip-style="tabletext" default-widget-style="inputBox"> + <auto-fields-entity entity-name="DataResource" default-field-type="find"/> + <field name="submitButton" title="Lookup" widget-style="smallSubmit"><submit button-type="button"/></field> </form> <form name="ListLookupDataResource" extends="ListDataResource" paginate-target="LookupDataResource" type="list" list-name="listIt" default-widget-style="tabletext"> @@ -94,7 +96,6 @@ </field> <field name="dataResourceName" title="Name"><display/></field> </form> - <form name="mruLookupDataResource" default-entity-name="DataResource" list-name="mruList" target="" title="" type="list" default-title-style="tableheadtext" default-tooltip-style="tabletext" default-widget-style="display"> <field name="contentId" title="Id" widget-style="buttontext"> @@ -103,7 +104,6 @@ <field name="dataResourceName" title="Name" widget-style="buttontext"><display/></field> <field name="dataCategoryId" title="Category" widget-style="buttontext"><display/></field> </form> - <form name="EditDataResource" target="updateDataResource" title="" type="single" default-title-style="tableheadtext" default-tooltip-style="tabletext" default-widget-style="inputBox" default-map-name="currentValue"> <actions> @@ -155,7 +155,7 @@ <field name="createButton" title="${uiLabelMap.CommonCreate}" use-when="currentValue==null" widget-style="smallSubmit"><submit button-type="button"/></field> <field name="updateButton" title="${uiLabelMap.CommonUpdate}" use-when="currentValue!=null" widget-style="smallSubmit"><submit button-type="button"/></field> </form> - <!--form name="DataResourceMaster" target="createDataResource" title="" type="single" default-map-name="currentValue" + <form name="DataResourceMaster" target="createDataResource" title="" type="single" default-map-name="currentValue" default-title-style="tableheadtext" default-tooltip-style="tabletext" default-widget-style="inputBox"> <auto-fields-entity entity-name="DataResource" default-field-type="edit"/> <field name="dataResourceId"></field> @@ -198,18 +198,18 @@ <field name="lastModifiedDate"><display/></field> <field name="createdByUserLogin"><display/></field> <field name="lastModifiedByUserLogin"><display/></field> - </form--> + </form> <!-- use-when="(dataResource != void) && (dataResource.dataResourceId != void) && (dataResource.dataResourceId.length()>0)" --> - <!--form name="AddDataResource" target="createDataResource" title="" type="single" + <form name="AddDataResource" target="createDataResource" title="" type="single" default-title-style="tableheadtext" default-tooltip-style="tabletext" default-widget-style="inputBox" extends="DataResourceMaster"> <field name="dataResourceId"><text/></field> - <field name="submitButton" title="Create" widget-style="smallSubmit"><submit button-type="button"/></field> + <field name="submitButton" title="${uiLabelMap.CommonCreate}" widget-style="smallSubmit"><submit button-type="button"/></field> <field name="objectInfo" title="URL"/> <field name="mode"><hidden value="CREATE"/></field> - </form--> + </form> <form name="AddDataResourceText" target="createDataResourceAndText" title="" type="single" default-title-style="tableheadtext" default-tooltip-style="tabletext" default-widget-style="inputBox" @@ -219,8 +219,8 @@ <field name="dataResourceTypeIdDisplay" title="Type Id" field-name="dataResourceTypeId"> <display description="ELECTRONIC_TEXT" also-hidden="false"/> </field> - <field name="textData" title="Text" id-name="textData"><textarea rows="20" cols="120"/></field> - <field name="submitButton" title="Create" widget-style="smallSubmit"><submit button-type="button"/></field> + <field name="textData" id-name="textData"><textarea rows="20" cols="120"/></field> + <field name="submitButton" title="${uiLabelMap.CommonCreate}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> <form name="AddDataResourceUrl" target="createDataResourceUrl" title="" type="single" default-title-style="tableheadtext" default-tooltip-style="tabletext" default-widget-style="inputBox" @@ -231,7 +231,7 @@ <field name="dataResourceTypeIdDisplay" title="Type Id" field-name="dataResourceTypeId"> <display description="URL_RESOURCE" also-hidden="false"/> </field> - <field name="submitButton" title="Create" widget-style="smallSubmit"><submit button-type="button"/></field> + <field name="submitButton" title="${uiLabelMap.CommonCreate}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> <form name="AddDataResourceUpload" target="createDataResourceUpload" title="" type="single" default-title-style="tableheadtext" default-tooltip-style="tabletext" default-widget-style="inputBox" @@ -241,7 +241,7 @@ <field name="dataResourceTypeIdDisplay" title="Type Id" field-name="dataResourceTypeId"> <display description="IMAGE_OBJECT" also-hidden="false"/> </field> - <field name="submitButton" title="Create" widget-style="smallSubmit"><submit button-type="button"/></field> + <field name="submitButton" title="${uiLabelMap.CommonCreate}" widget-style="smallSubmit"><submit button-type="button"/></field> <field name="objectInfo" title="Uploaded File"><display/></field> </form> <form name="EditDataResourceText" target="updateDataResourceText" title="" type="single" @@ -252,8 +252,8 @@ <field name="dataResourceTypeIdDisplay" title="Type Id" field-name="dataResourceTypeId"> <display description="ELECTRONIC_TEXT" also-hidden="false"/> </field> - <field name="textData" title="Text" id-name="textData"><textarea rows="20" cols="120"/> </field> - <field name="submitButton" title="Create" widget-style="smallSubmit"><submit button-type="button"/></field> + <field name="textData" id-name="textData"><textarea rows="20" cols="120"/> </field> + <field name="submitButton" title="${uiLabelMap.CommonCreate}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> <form name="EditDataResourceUpload" target="updateDataResourceUpload" title="" type="single" default-title-style="tableheadtext" default-tooltip-style="tabletext" default-widget-style="inputBox" @@ -263,7 +263,7 @@ <field name="dataResourceTypeIdDisplay" title="Type Id" field-name="dataResourceTypeId"> <display description="IMAGE_OBJECT" also-hidden="false"/> </field> - <field name="submitButton" title="Update" widget-style="smallSubmit"><submit button-type="button"/></field> + <field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field> <field name="objectInfo" title="Uploaded File"><display/></field> </form> <form name="EditDataResourceUrl" target="updateDataResourceUrl" title="" type="single" @@ -273,10 +273,10 @@ </form> <form name="ImageUpload" target="uploadImage" title="" type="upload" default-title-style="tableheadtext" default-tooltip-style="tabletext" default-widget-style="inputBox"> - <field name="dataResourceId"><display/></field> - <field name="objectInfo" title="Image File Name"><display description="${currentValue.objectInfo}"/></field> + <field name="dataResourceId" widget-style="tabletext"><display/></field> + <field name="objectInfo" widget-style="tabletext"><display description="${currentValue.objectInfo}"/></field> <field name="imageData" entity-name="ImageDataResource"><file/></field> - <field name="submitButton" title="Upload" widget-style="smallSubmit"><submit button-type="button"/></field> + <field name="submitButton" title="${uiLabelMap.CommonUpload}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> <!-- DataResourceAttribute forms --> <form name="AddDataResourceAttribute" @@ -284,13 +284,13 @@ default-tooltip-style="tabletext" default-widget-style="inputBox" target="addDataResourceAttribute" title="" type="single"> <auto-fields-service service-name="createDataResourceAttribute"/> - <field name="dataResourceId" title="" widget-style="buttontext" map-name="currentValue"><display/></field> - <field name="submitButton" title="Add" widget-style="smallSubmit"><submit button-type="button"/></field> + <field name="dataResourceId" title="" widget-style="tabletext" map-name="currentValue"><display/></field> + <field name="submitButton" title="${uiLabelMap.CommonAdd}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> <form name="ListDataResourceAttribute" default-title-style="tableheadtext" - default-tooltip-style="tabletext" default-widget-style="inputBox" - list-name="contentList" + default-tooltip-style="tabletext" default-widget-style="tabletext" + list-name="dataResourceAttribute" target="updateDataResourceAttribute" title="" type="list"> <actions> <service service-name="performFind" result-map-list-name="listIt"> @@ -299,10 +299,10 @@ </service> </actions> <auto-fields-service service-name="updateDataResourceAttribute" default-field-type="display"/> - <field name="attrValue" widget-style="buttontext"><text/></field> - <field name="submitButton" title="Update" widget-style="smallSubmit"><submit button-type="button"/></field> + <field name="attrValue" widget-style="tabletext"><text/></field> + <field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field> <field name="deleteLink" title="" widget-style="buttontext"> - <hyperlink also-hidden="false" description="[Delete]" target="removeDataResourceAttribute?dataResourceId=${dataResourceId}&attrName=${attrName}"/> + <hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="removeDataResourceAttribute?dataResourceId=${dataResourceId}&attrName=${attrName}"/> </field> </form> @@ -312,28 +312,28 @@ default-tooltip-style="tabletext" default-widget-style="inputBox" target="addDataResourceRole" title="" type="single"> <auto-fields-entity entity-name="DataResourceRole"/> - <field name="dataResourceId" title="" widget-style="buttontext" map-name="currentValue"><display/></field> - <field name="partyId" title="" widget-style="buttontext"><lookup target-form-name="LookupPerson"/></field> - <field name="roleTypeId"> + <field name="dataResourceId" title="" widget-style="tabletext" map-name="currentValue"><display/></field> + <field name="partyId" title="" widget-style="tabletext"><lookup target-form-name="LookupPerson"/></field> + <field name="roleTypeId" widget-style="selectBox"> <drop-down allow-empty="true"> <entity-options description="${description}" entity-name="RoleType" key-field-name="roleTypeId"/> </drop-down> </field> - <field name="submitButton" title="Add" widget-style="smallSubmit"><submit button-type="button"/></field> + <field name="submitButton" title="${uiLabelMap.CommonAdd}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> - <form name="ListDataResourceRole" list-name="contentList" target="updateDataResourceRole" title="" type="list" + <form name="ListDataResourceRole" list-name="dataResourceRole" target="updateDataResourceRole" title="" type="list" default-title-style="tableheadtext" default-tooltip-style="tabletext" default-widget-style="inputBox"> <actions> <service service-name="performFind" result-map-list-name="listIt"> <field-map field-name="inputFields" env-name="parameters"/> - <field-map field-name="entityName" env-name="entityName" value="DataResourceAttribute"/> + <field-map field-name="entityName" env-name="entityName" value="DataResourceRole"/> </service> </actions> <auto-fields-service service-name="updateDataResourceRole" default-field-type="display"/> <field name="thruDate" widget-style="buttontext"><date-time/></field> - <field name="submitButton" title="Update" widget-style="smallSubmit"><submit button-type="button"/></field> + <field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field> <field name="deleteLink" title="" widget-style="buttontext"> - <hyperlink also-hidden="false" description="[Delete]" target="removeDataResourceRole?dataResourceId=${dataResourceId}&roleTypeId=${roleTypeId}&partyId=${partyId}&fromDate=${fromDate}"/> + <hyperlink also-hidden="false" description="[${uiLabelMap.CommonDelete}]" target="removeDataResourceRole?dataResourceId=${dataResourceId}&roleTypeId=${roleTypeId}&partyId=${partyId}&fromDate=${fromDate}"/> </field> </form> @@ -341,22 +341,21 @@ <form name="AddDataResourceProductFeature" target="createDataResourceProductFeature" title="" type="single" default-title-style="tableheadtext" default-tooltip-style="tabletext" default-widget-style="inputBox"> <auto-fields-service service-name="createProductFeatureDataResource"/> - <field name="dataResourceId" widget-style="buttontext" map-name="currentValue"><display/></field> + <field name="dataResourceId" widget-style="tabletext" map-name="currentValue"><display/></field> <field name="productFeatureId" widget-style="buttontext"><lookup target-form-name="LookupProductFeature"/></field> - <field name="submitButton" title="Add" widget-style="smallSubmit"><submit button-type="button"/></field> + <field name="submitButton" title="${uiLabelMap.CommonAdd}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> - <form name="ListDataResourceProductFeature" list-name="contentList" target="" title="" type="list" - default-title-style="tableheadtext" default-tooltip-style="tabletext" default-widget-style="inputBox"> + <form name="ListDataResourceProductFeature" list-name="productFeatureDataResource" target="" title="" type="list" + default-title-style="tableheadtext" default-tooltip-style="tabletext" default-widget-style="tabletext"> <actions> <service service-name="performFind" result-map-list-name="listIt"> <field-map field-name="inputFields" env-name="parameters"/> - <field-map field-name="entityName" env-name="entityName" value="ProductFeature"/> + <field-map field-name="entityName" env-name="entityName" value="ProductFeatureDataResource"/> </service> </actions> - <auto-fields-entity entity-name="ProductFeatureDataResource" default-field-type="display"/> - <field name="dataResourceId"><hidden/></field> + <auto-fields-entity entity-name="ProductFeatureDataResource" default-field-type="display"/> <field name="deleteLink" title="" widget-style="buttontext"> - <hyperlink also-hidden="false" description="[Delete]" target="removeDataResourceProductFeature?dataResourceId=${dataResourceId}&productFeatureId=${productFeatureId}"/> + <hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="removeDataResourceProductFeature?dataResourceId=${dataResourceId}&productFeatureId=${productFeatureId}"/> </field> </form> <form name="lookupProductFeature" target="LookupProductFeature" title="" type="single" @@ -376,7 +375,7 @@ </entity-options> </drop-down> </field> - <field name="submitButton" title="Lookup" widget-style="smallSubmit"><submit button-type="button"/></field> + <field name="submitButton" title="${uiLabelMap.CommonLookup}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> <form name="listLookupProductFeature" list-name="entityList" paginate-target="LookupProductFeature" title="" type="list" default-title-style="tableheadtext" default-tooltip-style="tabletext" default-widget-style="display"> @@ -405,17 +404,17 @@ </entity-one> </actions> <field name="dataResourceId" title="" widget-style="buttontext"><display also-hidden="true"/></field> - <field name="textData" title="Text" widget-style="buttontext"> + <field name="textData" widget-style="buttontext"> <textarea cols="120" rows="24" default-value="${eText.textData}" /> </field> - <field name="submitButton" title="Update" widget-style="smallSubmit"><submit button-type="button"/></field> + <field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> <form name="AddElectronicText" target="addElectronicText" title="" type="single" default-title-style="tableheadtext" default-tooltip-style="tabletext" default-widget-style="inputBox"> <auto-fields-service service-name="createElectronicText"/> <field name="dataResourceId" title="" widget-style="buttontext" map-name="currentValue"><display also-hidden="true"/></field> - <field name="textData" title="" widget-style="buttontext"><textarea cols="120" rows="24"/></field> - <field name="submitButton" title="Add" widget-style="smallSubmit"><submit button-type="button"/></field> + <field name="textData" widget-style="buttontext"><textarea cols="120" rows="24"/></field> + <field name="submitButton" title="${uiLabelMap.CommonAdd}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> <!-- Html forms --> @@ -423,14 +422,14 @@ default-title-style="tableheadtext" default-tooltip-style="tabletext" default-widget-style="inputBox"> <auto-fields-entity entity-name="ElectronicText"/> <field name="dataResourceId" title="" widget-style="buttontext" map-name="currentValue"><display/></field> - <field name="textData" title="Text" id-name="textData"><textarea rows="24" cols="120"/></field> - <field name="submitButton" title="Add" widget-style="smallSubmit"><submit button-type="button"/></field> + <field name="textData" id-name="textData"><textarea rows="24" cols="120"/></field> + <field name="submitButton" title="${uiLabelMap.CommonAdd}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> <form name="EditHtmlText" target="updateHtmlText" title="" type="single" default-map-name="currentValue" default-title-style="tableheadtext" default-tooltip-style="tabletext" default-widget-style="inputBox"> <auto-fields-entity entity-name="ElectronicText"/> <field name="dataResourceId" title="" widget-style="buttontext"><display/></field> - <field name="textData" title="Text_" id-name="textData"><textarea rows="20" cols="120" visual-editor-enable="true"/></field> - <field name="submitButton" title="Update" widget-style="smallSubmit"><submit button-type="button"/></field> + <field name="textData" id-name="textData"><textarea rows="20" cols="120" visual-editor-enable="true"/></field> + <field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> </forms> Modified: incubator/ofbiz/trunk/applications/content/widget/content/DataResourceMenus.xml URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/content/widget/content/DataResourceMenus.xml?view=diff&rev=472127&r1=472126&r2=472127 ============================================================================== --- incubator/ofbiz/trunk/applications/content/widget/content/DataResourceMenus.xml (original) +++ incubator/ofbiz/trunk/applications/content/widget/content/DataResourceMenus.xml Tue Nov 7 06:51:10 2006 @@ -72,7 +72,6 @@ </menu-item> </menu> <menu name="dataresource"> - <menu-item name="editDataResource" title="${uiLabelMap.ContentDataResource}" > <condition> <not><if-empty field-name="currentValue.dataResourceId"/></not> Modified: incubator/ofbiz/trunk/applications/content/widget/content/DataResourceScreens.xml URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/content/widget/content/DataResourceScreens.xml?view=diff&rev=472127&r1=472126&r2=472127 ============================================================================== --- incubator/ofbiz/trunk/applications/content/widget/content/DataResourceScreens.xml (original) +++ incubator/ofbiz/trunk/applications/content/widget/content/DataResourceScreens.xml Tue Nov 7 06:51:10 2006 @@ -118,7 +118,7 @@ <widgets> <decorator-screen name="commonDataResourceDecorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> - <include-form name="ImageUpload" location="component://content/webapp/content/data/DataResourceForms.xml"/> + <include-form name="ImageUpload" location="component://content/widget/content/DataResourceForms.xml"/> </decorator-section> </decorator-screen> </widgets> @@ -136,7 +136,7 @@ <widgets> <decorator-screen name="commonDataResourceDecorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> - <include-form name="AddDataResource" location="component://content/webapp/content/data/DataResourceForms.xml"/> + <include-form name="AddDataResource" location="component://content/widget/content/DataResourceForms.xml"/> </decorator-section> </decorator-screen> </widgets> @@ -150,12 +150,12 @@ <actions> <set field="titleProperty" value="PageTitleAddDataResourceText"/> <set field="headerItem" value="DataResource"/> - <set field="currentMenuItemName" to-scope="user" value="adddataresourcetext"/> + <set field="tabButtonItem" value="adddataresourcetext"/> </actions> <widgets> <decorator-screen name="commonDataResourceDecorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> - <include-form name="AddDataResourceText" location="component://content/webapp/content/data/DataResourceForms.xml"/> + <include-form name="AddDataResourceText" location="component://content/widget/content/DataResourceForms.xml"/> </decorator-section> </decorator-screen> </widgets> @@ -169,12 +169,12 @@ <actions> <set field="titleProperty" value="PageTitleAddDataResourceUrl"/> <set field="headerItem" value="DataResource"/> - <set field="currentMenuItemName" to-scope="user" value="adddataresourceurl"/> + <set field="tabButtonItem" value="adddataresourceurl"/> </actions> <widgets> <decorator-screen name="commonDataResourceDecorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> - <include-form name="AddDataResourceUrl" location="component://content/webapp/content/data/DataResourceForms.xml"/> + <include-form name="AddDataResourceUrl" location="component://content/widget/content/DataResourceForms.xml"/> </decorator-section> </decorator-screen> @@ -189,12 +189,12 @@ <actions> <set field="titleProperty" value="PageTitleAddDataResourceUpload"/> <set field="headerItem" value="DataResource"/> - <set field="currentMenuItemName" to-scope="user" value="adddataresourceupload"/> + <set field="tabButtonItem" value="adddataresourceupload"/> </actions> <widgets> <decorator-screen name="commonDataResourceDecorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> - <include-form name="AddDataResourceUpload" location="component://content/webapp/content/data/DataResourceForms.xml"/> + <include-form name="AddDataResourceUpload" location="component://content/widget/content/DataResourceForms.xml"/> </decorator-section> </decorator-screen> </widgets> @@ -208,12 +208,12 @@ <actions> <set field="titleProperty" value="PageTitleEditDataResourceText"/> <set field="headerItem" value="DataResource"/> - <set field="currentMenuItemName" to-scope="user" value="editdataresourcetext"/> + <set field="tabButtonItem" value="editdataresourcetext"/> </actions> <widgets> <decorator-screen name="commonDataResourceDecorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> - <include-form name="EditDataResourceText" location="component://content/webapp/content/data/DataResourceForms.xml"/> + <include-form name="EditDataResourceText" location="component://content/widget/content/DataResourceForms.xml"/> </decorator-section> </decorator-screen> </widgets> @@ -227,12 +227,12 @@ <actions> <set field="titleProperty" value="PageTitleEditDataResourceUrl"/> <set field="headerItem" value="DataResource"/> - <set field="currentMenuItemName" to-scope="user" value="editdataresourceurl"/> + <set field="tabButtonItem" value="editdataresourceurl"/> </actions> <widgets> <decorator-screen name="commonDataResourceDecorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> - <include-form name="EditDataResourceUrl" location="component://content/webapp/content/data/DataResourceForms.xml"/> + <include-form name="EditDataResourceUrl" location="component://content/widget/content/DataResourceForms.xml"/> </decorator-section> </decorator-screen> </widgets> @@ -246,12 +246,12 @@ <actions> <set field="titleProperty" value="PageTitleEditDataResourceUpload"/> <set field="headerItem" value="DataResource"/> - <set field="currentMenuItemName" to-scope="user" value="editdataresourceupload"/> + <set field="tabButtonItem" value="editdataresourceupload"/> </actions> <widgets> <decorator-screen name="commonDataResourceDecorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> - <include-form name="EditDataResourceUpload" location="component://content/webapp/content/data/DataResourceForms.xml"/> + <include-form name="EditDataResourceUpload" location="component://content/widget/content/DataResourceForms.xml"/> </decorator-section> </decorator-screen> </widgets> @@ -265,7 +265,6 @@ <actions> <set field="titleProperty" value="PageTitleEditElectronicText"/> <set field="headerItem" value="DataResource"/> - <set field="currentMenuItemName" to-scope="user" value="editelectronictext"/> <set field="tabButtonItem" value="editElectronicText"/> <entity-one entity-name="DataResource" value-name="currentValue"> <field-map field-name="dataResourceId" env-name="parameters.dataResourceId"/> @@ -274,7 +273,7 @@ <widgets> <decorator-screen name="commonDataResourceDecorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> - <include-form name="EditElectronicText" location="component://content/webapp/content/data/DataResourceForms.xml"/> + <include-form name="EditElectronicText" location="component://content/widget/content/DataResourceForms.xml"/> </decorator-section> </decorator-screen> </widgets> @@ -289,17 +288,16 @@ <set field="titleProperty" value="PageTitleEditDataResourceAttribute"/> <set field="headerItem" value="DataResource"/> <set field="tabButtonItem" value="editDataResourceAttribute"/> - <set field="dataResourceId" from-field="parameters.dataResourceId"/> - <entity-one entity-name="DataResource" value-name="dataResource"/> - <entity-and entity-name="DataResourceAttribute" list-name="dataResourceAttribute"> - <field-map env-name="dataResourceId" field-name="dataResourceId"/> - </entity-and> + <entity-one entity-name="DataResource" value-name="currentValue"> + <field-map field-name="dataResourceId" env-name="parameters.dataResourceId"/> + </entity-one> + <get-related value-name="currentValue" relation-name="DataResourceAttribute" list-name="dataResourceAttribute"/> </actions> <widgets> <decorator-screen name="commonDataResourceDecorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> - <include-form name="ListDataResourceAttribute" location="component://content/webapp/content/data/DataResourceForms.xml"/> - <include-form name="AddDataResourceAttribute" location="component://content/webapp/content/data/DataResourceForms.xml"/> + <include-form name="ListDataResourceAttribute" location="component://content/widget/content/DataResourceForms.xml"/> + <include-form name="AddDataResourceAttribute" location="component://content/widget/content/DataResourceForms.xml"/> </decorator-section> </decorator-screen> </widgets> @@ -314,17 +312,16 @@ <set field="titleProperty" value="PageTitleEditDataResourceRole"/> <set field="headerItem" value="DataResource"/> <set field="tabButtonItem" value="editDataResourceRole"/> - <set field="dataResourceId" from-field="parameters.dataResourceId"/> - <entity-one entity-name="DataResource" value-name="dataResource"/> - <entity-and entity-name="DataResourceRole" list-name="dataResourceRole"> - <field-map env-name="dataResourceId" field-name="dataResourceId"/> - </entity-and> + <entity-one entity-name="DataResource" value-name="currentValue"> + <field-map field-name="dataResourceId" env-name="parameters.dataResourceId"/> + </entity-one> + <get-related value-name="currentValue" relation-name="DataResourceRole" list-name="dataResourceRole"/> </actions> <widgets> <decorator-screen name="commonDataResourceDecorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> - <include-form name="ListDataResourceRole" location="component://content/webapp/content/data/DataResourceForms.xml"/> - <include-form name="AddDataResourceRole" location="component://content/webapp/content/data/DataResourceForms.xml"/> + <include-form name="ListDataResourceRole" location="component://content/widget/content/DataResourceForms.xml"/> + <include-form name="AddDataResourceRole" location="component://content/widget/content/DataResourceForms.xml"/> </decorator-section> </decorator-screen> </widgets> @@ -339,19 +336,18 @@ <set field="titleProperty" value="PageTitleEditDataResourceProductFeatures"/> <set field="headerItem" value="DataResource"/> <set field="tabButtonItem" value="editDataResourceProductFeatures"/> - <set field="dataResourceId" from-field="parameters.dataResourceId"/> - <entity-one entity-name="DataResource" value-name="dataResource"/> - <entity-and entity-name="ProductFeatureDataResource" list-name="productFeatureDataResource"> - <field-map env-name="dataResourceId" field-name="dataResourceId"/> - </entity-and> + <entity-one entity-name="DataResource" value-name="currentValue"> + <field-map field-name="dataResourceId" env-name="parameters.dataResourceId"/> + </entity-one> + <get-related value-name="currentValue" relation-name="ProductFeatureDataResource" list-name="productFeatureDataResource"/> </actions> <widgets> - <decorator-screen name="commonDataResourceDecorator" location="${parameters.mainDecoratorLocation}"> - <decorator-section name="body"> - <include-form name="ListDataResourceProductFeature" location="component://content/webapp/content/data/DataResourceForms.xml"/> - <include-form name="AddDataResourceProductFeature" location="component://content/webapp/content/data/DataResourceForms.xml"/> - </decorator-section> - </decorator-screen> + <decorator-screen name="commonDataResourceDecorator" location="${parameters.mainDecoratorLocation}"> + <decorator-section name="body"> + <include-form name="ListDataResourceProductFeature" location="component://content/widget/content/DataResourceForms.xml"/> + <include-form name="AddDataResourceProductFeature" location="component://content/widget/content/DataResourceForms.xml"/> + </decorator-section> + </decorator-screen> </widgets> </section> </screen> @@ -363,7 +359,6 @@ <actions> <set field="titleProperty" value="PageTitleEditHtmlText"/> <set field="headerItem" value="DataResource"/> - <set field="currentMenuItemName" to-scope="user" value="edithtmltext"/> <set field="tabButtonItem" value="editHtmlText"/> <entity-one entity-name="DataResource" value-name="currentValue"> <field-map field-name="dataResourceId" env-name="parameters.dataResourceId"/> @@ -372,7 +367,7 @@ <widgets> <decorator-screen name="commonDataResourceDecorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> - <include-form name="EditHtmlText" location="component://content/webapp/content/data/DataResourceForms.xml"/> + <include-form name="EditHtmlText" location="component://content/widget/content/DataResourceForms.xml"/> </decorator-section> </decorator-screen> </widgets> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |