svn commit: r446771 - in /incubator/ofbiz/trunk/applica
Locked
svn commit: r446771 - in /incubator/ofbiz/trunk/applica
 
|
Author: jleroux
Date: Fri Sep 15 15:13:07 2006 New Revision: 446771 URL: http://svn.apache.org/viewvc?view=rev&rev=446771 Log: Attributes/Roles/Features was not shown on the list into Data Resource tab of Content application (https://issues.apache.org/jira/browse/OFBIZ-250) This patch corrects this problem. Thanks Marco. Modified: incubator/ofbiz/trunk/applications/content/webapp/content/data/DataResourceForms.xml incubator/ofbiz/trunk/applications/content/widget/content/DataResourceScreens.xml Modified: incubator/ofbiz/trunk/applications/content/webapp/content/data/DataResourceForms.xml URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/content/webapp/content/data/DataResourceForms.xml?view=diff&rev=446771&r1=446770&r2=446771 ============================================================================== --- incubator/ofbiz/trunk/applications/content/webapp/content/data/DataResourceForms.xml (original) +++ incubator/ofbiz/trunk/applications/content/webapp/content/data/DataResourceForms.xml Fri Sep 15 15:13:07 2006 @@ -52,7 +52,7 @@ <entity-options description="${categoryName}" entity-name="DataCategory"/> </drop-down> </field> - <field name="searchButton" title="${UiLabelMap.CommonFind}" widget-style="smallSubmit"><submit button-type="button"/></field> + <field name="searchButton" title="${uiLabelMap.CommonFind}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> <form name="ListDataResource" paginate-target="findDataResource" title="" type="list" list-name="listIt" default-entity-name="DataResource" @@ -169,7 +169,7 @@ default-title-style="tableheadtext" default-tooltip-style="tabletext" default-widget-style="inputBox" extends="DataResourceMaster"> <field name="dataResourceId"><text/></field> - <field name="submitButton" title="${UiLabelMap.CommonCreate}" 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> @@ -183,7 +183,7 @@ <display description="ELECTRONIC_TEXT" also-hidden="false"/> </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> + <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" @@ -194,7 +194,7 @@ <field name="dataResourceTypeIdDisplay" title="Type Id" field-name="dataResourceTypeId"> <display description="URL_RESOURCE" also-hidden="false"/> </field> - <field name="submitButton" title="${UiLabelMap.CommonCreate}" 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" @@ -204,7 +204,7 @@ <field name="dataResourceTypeIdDisplay" title="Type Id" field-name="dataResourceTypeId"> <display description="IMAGE_OBJECT" also-hidden="false"/> </field> - <field name="submitButton" title="${UiLabelMap.CommonCreate}" 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" @@ -216,7 +216,7 @@ <display description="ELECTRONIC_TEXT" also-hidden="false"/> </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> + <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" @@ -226,7 +226,7 @@ <field name="dataResourceTypeIdDisplay" title="Type Id" field-name="dataResourceTypeId"> <display description="IMAGE_OBJECT" also-hidden="false"/> </field> - <field name="submitButton" title="${UiLabelMap.CommonUpdate}" 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" @@ -248,12 +248,12 @@ 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="${UiLabelMap.CommonAdd}" 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="ListDataResourceAttribute" default-title-style="tableheadtext" default-tooltip-style="tabletext" default-widget-style="inputBox" - list-name="contentList" + list-name="dataResourceAttribute" target="updateDataResourceAttribute" title="" type="list"> <actions> <service service-name="performFind" result-map-list-name="listIt"> @@ -263,9 +263,9 @@ </actions> <auto-fields-service service-name="updateDataResourceAttribute" default-field-type="display"/> <field name="attrValue" widget-style="buttontext"><text/></field> - <field name="submitButton" title="${UiLabelMap.CommonUpdate}" 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="[${UiLabelMap.CommonDelete}]" target="removeDataResourceAttribute?dataResourceId=${dataResourceId}&attrName=${attrName}"/> + <hyperlink also-hidden="false" description="[${uiLabelMap.CommonDelete}]" target="removeDataResourceAttribute?dataResourceId=${dataResourceId}&attrName=${attrName}"/> </field> </form> @@ -282,21 +282,21 @@ <entity-options description="${description}" entity-name="RoleType" key-field-name="roleTypeId"/> </drop-down> </field> - <field name="submitButton" title="${UiLabelMap.CommonAdd}" 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="${UiLabelMap.CommonUpdate}" 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="[${UiLabelMap.CommonDelete}]" 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> @@ -306,20 +306,19 @@ <auto-fields-service service-name="createProductFeatureDataResource"/> <field name="dataResourceId" widget-style="buttontext" map-name="currentValue"><display/></field> <field name="productFeatureId" widget-style="buttontext"><lookup target-form-name="LookupProductFeature"/></field> - <field name="submitButton" title="${UiLabelMap.CommonAdd}" 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" + <form name="ListDataResourceProductFeature" list-name="productFeatureDataResource" target="" 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="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="[${UiLabelMap.CommonDelete}]" 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" @@ -339,7 +338,7 @@ </entity-options> </drop-down> </field> - <field name="submitButton" title="${UiLabelMap.CommonLookup}" 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"> @@ -371,14 +370,14 @@ <field name="textData" widget-style="buttontext"> <textarea cols="120" rows="24" default-value="${eText.textData}" /> </field> - <field name="submitButton" title="${UiLabelMap.CommonUpdate}" 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" widget-style="buttontext"><textarea cols="120" rows="24"/></field> - <field name="submitButton" title="${UiLabelMap.CommonAdd}" widget-style="smallSubmit"><submit button-type="button"/></field> + <field name="submitButton" title="${uiLabelMap.CommonAdd}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> <!-- Html forms --> @@ -387,13 +386,13 @@ <auto-fields-entity entity-name="ElectronicText"/> <field name="dataResourceId" title="" widget-style="buttontext" map-name="currentValue"><display/></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> + <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" 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> + <field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> </forms> 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=446771&r1=446770&r2=446771 ============================================================================== --- incubator/ofbiz/trunk/applications/content/widget/content/DataResourceScreens.xml (original) +++ incubator/ofbiz/trunk/applications/content/widget/content/DataResourceScreens.xml Fri Sep 15 15:13:07 2006 @@ -289,9 +289,11 @@ <set field="titleProperty" value="PageTitleEditDataResourceAttribute"/> <set field="headerItem" value="DataResource"/> <set field="tabButtonItem" value="editDataResourceAttribute"/> - <entity-one entity-name="DataResource" value-name="currentValue"> - <field-map field-name="dataResourceId" env-name="parameters.dataResourceId"/> - </entity-one> + <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> </actions> <widgets> <decorator-screen name="commonDataResourceDecorator" location="${parameters.mainDecoratorLocation}"> @@ -312,9 +314,11 @@ <set field="titleProperty" value="PageTitleEditDataResourceRole"/> <set field="headerItem" value="DataResource"/> <set field="tabButtonItem" value="editDataResourceRole"/> - <entity-one entity-name="DataResource" value-name="currentValue"> - <field-map field-name="dataResourceId" env-name="parameters.dataResourceId"/> - </entity-one> + <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> </actions> <widgets> <decorator-screen name="commonDataResourceDecorator" location="${parameters.mainDecoratorLocation}"> @@ -335,9 +339,11 @@ <set field="titleProperty" value="PageTitleEditDataResourceProductFeatures"/> <set field="headerItem" value="DataResource"/> <set field="tabButtonItem" value="editDataResourceProductFeatures"/> - <entity-one entity-name="DataResource" value-name="currentValue"> - <field-map field-name="dataResourceId" env-name="parameters.dataResourceId"/> - </entity-one> + <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> </actions> <widgets> <decorator-screen name="commonDataResourceDecorator" location="${parameters.mainDecoratorLocation}"> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |