You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by ja...@apache.org on 2007/09/20 18:57:27 UTC
svn commit: r577814 - in /ofbiz/trunk/applications/product:
script/org/ofbiz/product/product/ servicedef/ webapp/catalog/WEB-INF/
webapp/catalog/WEB-INF/actions/product/ webapp/catalog/product/
widget/catalog/
Author: jacopoc
Date: Thu Sep 20 09:57:26 2007
New Revision: 577814
URL: http://svn.apache.org/viewvc?rev=577814&view=rev
Log:
Misc cleanups and improvements to the Edit product content screen.
Implemented new service (and forms) to make relatively simple the creation of text contents (simple texts) in alternate locale: there is still room for improvements here...
Modified:
ofbiz/trunk/applications/product/script/org/ofbiz/product/product/ProductContentServices.xml
ofbiz/trunk/applications/product/servicedef/services.xml
ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/actions/product/EditProductContent.bsh
ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/controller.xml
ofbiz/trunk/applications/product/webapp/catalog/product/EditProductContent.ftl
ofbiz/trunk/applications/product/webapp/catalog/product/ProductForms.xml
ofbiz/trunk/applications/product/widget/catalog/ProductScreens.xml
Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/product/ProductContentServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/product/ProductContentServices.xml?rev=577814&r1=577813&r2=577814&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/script/org/ofbiz/product/product/ProductContentServices.xml (original)
+++ ofbiz/trunk/applications/product/script/org/ofbiz/product/product/ProductContentServices.xml Thu Sep 20 09:57:26 2007
@@ -102,6 +102,15 @@
<set-service-fields service-name="updateSimpleTextContent" map-name="parameters" to-map-name="updateSimpleText"/>
<call-service service-name="updateSimpleTextContent" in-map-name="updateSimpleText"/>
</simple-method>
+ <simple-method method-name="createSimpleTextContentForAlternateLocale" short-description="Create Simple Text Content For Alternate Locale">
+ <set-service-fields service-name="createSimpleTextContent" map-name="parameters" to-map-name="createSimpleTextMap"/>
+ <call-service service-name="createSimpleTextContent" in-map-name="createSimpleTextMap">
+ <result-to-field result-name="contentId" field-name="createContentAssocMap.contentIdTo"/>
+ </call-service>
+ <set field="createContentAssocMap.contentId" from-field="parameters.mainContentId"/>
+ <set field="createContentAssocMap.contentAssocTypeId" value="ALTERNATE_LOCALE"/>
+ <call-service service-name="createContentAssoc" in-map-name="createContentAssocMap"/>
+ </simple-method>
<!-- ProductFeatureDataResource -->
<simple-method method-name="createProductFeatureDataResource" short-description="Create ProductFeature-DataResource">
Modified: ofbiz/trunk/applications/product/servicedef/services.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/servicedef/services.xml?rev=577814&r1=577813&r2=577814&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/servicedef/services.xml (original)
+++ ofbiz/trunk/applications/product/servicedef/services.xml Thu Sep 20 09:57:26 2007
@@ -401,6 +401,14 @@
<attribute name="text" type="String" mode="IN" optional="true"/>
</service>
+ <service name="createSimpleTextContentForAlternateLocale" engine="simple" location="org/ofbiz/product/product/ProductContentServices.xml" invoke="createSimpleTextContentForAlternateLocale">
+ <auto-attributes mode="IN" entity-name="Content" optional="true"/>
+ <attribute name="mainContentId" type="String" mode="IN" optional="false"/>
+ <attribute name="text" type="String" mode="IN" optional="false"/>
+ <override name="localeString" optional="false"/>
+ <override name="contentId" mode="INOUT"/>
+ </service>
+
<!-- SupplierProduct Services -->
<service name="createSupplierProduct" default-entity-name="SupplierProduct" engine="simple"
location="org/ofbiz/product/supplier/SupplierProductServices.xml" invoke="createSupplierProduct" auth="true">
Modified: ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/actions/product/EditProductContent.bsh
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/actions/product/EditProductContent.bsh?rev=577814&r1=577813&r2=577814&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/actions/product/EditProductContent.bsh (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/actions/product/EditProductContent.bsh Thu Sep 20 09:57:26 2007
@@ -50,17 +50,6 @@
if (product != null) productContent = product.getRelated("ProductContent", null, UtilMisc.toList("productContentTypeId"));
context.put("productContent", productContent);
-if (productContent != null) {
- List productContentDatas = new LinkedList();
- Iterator productContentIter = productContent.iterator();
- while (productContentIter.hasNext()) {
- GenericValue productContent = (GenericValue) productContentIter.next();
- GenericValue content = productContent.getRelatedOne("Content");
- productContentDatas.add(UtilMisc.toMap("productContent", productContent, "content", content));
- }
-
- context.put("productContentList", productContentDatas);
-}
// End ProductContent stuff
boolean tryEntity = true;
Modified: ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/controller.xml?rev=577814&r1=577813&r2=577814&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/controller.xml Thu Sep 20 09:57:26 2007
@@ -716,6 +716,12 @@
<response name="success" type="view" value="EditProductContent"/>
<response name="error" type="view" value="EditProductContentContent"/>
</request-map>
+ <request-map uri="createSimpleTextContentForAlternateLocale">
+ <security https="true" auth="true"/>
+ <event type="service" path="" invoke="createSimpleTextContentForAlternateLocale"/>
+ <response name="success" type="view" value="EditProductContent"/>
+ <response name="error" type="view" value="EditProductContentContent"/>
+ </request-map>
<!-- ================ Product GoodIdentification Requests ================= -->
<request-map uri="EditProductGoodIdentifications">
Modified: ofbiz/trunk/applications/product/webapp/catalog/product/EditProductContent.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/product/EditProductContent.ftl?rev=577814&r1=577813&r2=577814&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/product/EditProductContent.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/product/EditProductContent.ftl Thu Sep 20 09:57:26 2007
@@ -16,72 +16,27 @@
specific language governing permissions and limitations
under the License.
-->
-<script language="JavaScript" type="text/javascript">
-function insertNowTimestamp(field) {
- eval('document.productForm.' + field + '.value="${nowTimestampString}";');
-};
-function insertImageName(type,nameValue) {
- eval('document.productForm.' + type + 'ImageUrl.value=nameValue;');
-};
-</script>
+<#if product?exists>
+ <script language="JavaScript" type="text/javascript">
+ function insertNowTimestamp(field) {
+ eval('document.productForm.' + field + '.value="${nowTimestampString}";');
+ };
+ function insertImageName(type,nameValue) {
+ eval('document.productForm.' + type + 'ImageUrl.value=nameValue;');
+ };
+ </script>
-<#if fileType?has_content>
- <h3>${uiLabelMap.ProductResultOfImageUpload}</h3>
- <#if !(clientFileName?has_content)>
- <div class='tabletext'>${uiLabelMap.ProductNoFileSpecifiedForUpload}.</div>
- <#else>
- <div class='tabletext'>${uiLabelMap.ProductTheFileOnYourComputer}: <b>${clientFileName?if_exists}</b></div>
- <div class='tabletext'>${uiLabelMap.ProductServerFileName}: <b>${fileNameToUse?if_exists}</b></div>
- <div class='tabletext'>${uiLabelMap.ProductServerDirectory}: <b>${imageServerPath?if_exists}</b></div>
- <div class='tabletext'>${uiLabelMap.ProductTheUrlOfYourUploadedFile}: <b><a href="<@o...@ofbizContentUrl>">${imageUrl?if_exists}</a></b></div>
- </#if>
-<br/>
-</#if>
-
-<#if !(product?exists)>
- <h3>${uiLabelMap.ProductCouldNotFindProduct} "${productId}".</h3>
-<#else>
- <table border="1" cellpadding="2" cellspacing="0">
- <tr class="tableheadtext">
- <td>${uiLabelMap.ProductContent}</td>
- <td>${uiLabelMap.ProductType}</td>
- <td>${uiLabelMap.CommonFrom}</td>
- <td>${uiLabelMap.CommonThru}</td>
- <td>${uiLabelMap.ProductPurchaseFrom}</td>
- <td>${uiLabelMap.ProductPurchaseThru}</td>
- <td>${uiLabelMap.ProductUseCount}</td>
- <td>${uiLabelMap.ProductUseTime}</td>
- <td>${uiLabelMap.ProductUseTimeUom}</td>
- <td>${uiLabelMap.ProductUseRole}</td>
- <td> </td>
- <td> </td>
- </tr>
- <#list productContentList as entry>
- <#assign productContent=entry.productContent/>
- <#assign productContentType=productContent.getRelatedOneCache("ProductContentType")/>
- <tr class="tabletext">
- <td><a href="<@o...@ofbizUrl>" class="buttontext">${entry.content.description?default("[${uiLabelMap.ProductNoDescription}]")} [${entry.content.contentId}]</td>
- <td>${productContentType.get("description",locale)?default(productContent.productContentTypeId)}</td>
- <td>${productContent.fromDate?default("${uiLabelMap.CommonNA}")}</td>
- <td>${productContent.thruDate?default("${uiLabelMap.CommonNA}")}</td>
- <td>${productContent.purchaseFromDate?default("${uiLabelMap.CommonNA}")}</td>
- <td>${productContent.purchaseThruDate?default("${uiLabelMap.CommonNA}")}</td>
- <td>${productContent.useCountLimit?default("${uiLabelMap.CommonNA}")}</td>
- <td>${productContent.useTime?default("${uiLabelMap.CommonNA}")}</td>
- <td>${productContent.useTimeUomId?default("${uiLabelMap.CommonNA}")}</td>
- <td>${productContent.useRoleTypeId?default("${uiLabelMap.CommonNA}")}</td>
- <td><a href="<@o...@ofbizUrl>" class="buttontext">[${uiLabelMap.CommonDelete}]</a></td>
- <td><a href="/content/control/EditContent?contentId=${productContent.contentId}&externalLoginKey=${requestAttributes.externalLoginKey?if_exists}" class="buttontext">[${uiLabelMap.ProductEditContent} ${entry.content.contentId}]</td>
- </tr>
- </#list>
- </table>
- <h2>${uiLabelMap.ProductCreateNewProductContent}</h2>
- <#if productId?has_content && product?has_content>
- ${sections.render("PrepareAddProductContentAssoc")}
- </#if>
- <h2>${uiLabelMap.ProductAddContentProduct}</h2>
- <#if productId?has_content && product?has_content>
- ${sections.render("AddProductContentAssoc")}
+ <#if fileType?has_content>
+ <h3>${uiLabelMap.ProductResultOfImageUpload}</h3>
+ <#if !(clientFileName?has_content)>
+ <div class='tabletext'>${uiLabelMap.ProductNoFileSpecifiedForUpload}.</div>
+ <#else>
+ <div class='tabletext'>${uiLabelMap.ProductTheFileOnYourComputer}: <b>${clientFileName?if_exists}</b></div>
+ <div class='tabletext'>${uiLabelMap.ProductServerFileName}: <b>${fileNameToUse?if_exists}</b></div>
+ <div class='tabletext'>${uiLabelMap.ProductServerDirectory}: <b>${imageServerPath?if_exists}</b></div>
+ <div class='tabletext'>${uiLabelMap.ProductTheUrlOfYourUploadedFile}: <b><a href="<@o...@ofbizContentUrl>">${imageUrl?if_exists}</a></b></div>
+ </#if>
+ <br/>
</#if>
<hr class="sepbar"/>
Modified: ofbiz/trunk/applications/product/webapp/catalog/product/ProductForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/product/ProductForms.xml?rev=577814&r1=577813&r2=577814&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/product/ProductForms.xml (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/product/ProductForms.xml Thu Sep 20 09:57:26 2007
@@ -351,6 +351,38 @@
</form>
<!-- ProductContent -->
+ <form name="ListProductContentInfos" type="list" title="" list-name="productContentInfos">
+ <actions>
+ <entity-and entity-name="ProductContentAndInfo" list-name="productContentInfos">
+ <field-map field-name="productId" env-name="productId"/>
+ <order-by field-name="productContentTypeId"/>
+ </entity-and>
+ </actions>
+ <field name="editProductContentInfo" title="${uiLabelMap.ProductContent}" widget-style="buttontext">
+ <hyperlink target="EditProductContentContent?productId=${productId}&contentId=${contentId}&productContentTypeId=${productContentTypeId}&fromDate=${fromDate}"
+ description="${description} [${contentId}]" also-hidden="false"/>
+ </field>
+ <field name="productContentTypeId" title="${uiLabelMap.ProductType}">
+ <display-entity entity-name="ProductContentType" also-hidden="false" description="${description}"/>
+ </field>
+ <field name="fromDate"><display/></field>
+ <field name="thruDate"><display/></field>
+ <field name="purchaseFromDate"><display/></field>
+ <field name="purchaseThruDate"><display/></field>
+ <field name="useCountLimit"><display/></field>
+ <field name="useTime"><display/></field>
+ <field name="useTimeUomId"><display/></field>
+ <field name="useRoleTypeId"><display/></field>
+ <field name="removeContent" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext">
+ <hyperlink target="removeContentFromProduct?productId=${productId}&contentId=${contentId}&productContentTypeId=${productContentTypeId}&fromDate=${fromDate}"
+ description="${uiLabelMap.CommonDelete}" also-hidden="false"/>
+ </field>
+ <field name="editContent" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext">
+ <hyperlink target="/content/control/EditContent?contentId=${contentId}" target-type="inter-app"
+ description="${uiLabelMap.ProductEditContent} ${contentId}" also-hidden="false"/>
+ </field>
+ </form>
+
<form name="AddProductContentAssoc" type="single" target="addContentToProduct" title="${uiLabelMap.ProductAddProductContentFromDate}"
default-title-style="tableheadtext" default-widget-style="inputBox" default-tooltip-style="tabletext">
<auto-fields-entity entity-name="ProductContent"/>
@@ -421,8 +453,68 @@
description="${uiLabelMap.CommonDelete}" also-hidden="false"/>
</field>
</form>
- <form name="EditProductContentEmail" type="single" target="updateEmailContentForProduct" title="${uiLabelMap.ProductUpdateEmailContentProduct}"
- default-title-style="tableheadtext" default-widget-style="inputBox" default-tooltip-style="tabletext">
+ <form name="ListAssociatedContentInfos" type="list" title="" list-name="contentInfos">
+ <actions>
+ <entity-and entity-name="ContentAssocDataResourceViewTo" list-name="contentInfos">
+ <field-map field-name="contentIdStart" env-name="contentId"/>
+ </entity-and>
+ </actions>
+ <field name="caContentAssocTypeId">
+ <display-entity entity-name="ContentAssocType" key-field-name="contentAssocTypeId" also-hidden="false" description="${description}"/>
+ </field>
+ <field name="contentTypeId">
+ <display-entity entity-name="ContentType" also-hidden="false" description="${description}"/>
+ </field>
+ <field name="localeString"><display/></field>
+ <field name="drDataResourceTypeId" title="${uiLabelMap.FormFieldTitle_dataResourceTypeId}">
+ <display-entity entity-name="DataResourceType" key-field-name="dataResourceTypeId" also-hidden="false" description="${description}"/>
+ </field>
+ <field name="editDataResource" widget-style="buttontext">
+ <hyperlink target="/content/control/editDataResource?dataResourceId=${dataResourceId}" target-type="inter-app"
+ description="${dataResourceId}" also-hidden="false"/>
+ </field>
+ <field name="editContent" widget-style="buttontext">
+ <hyperlink target="/content/control/EditContent?contentId=${contentId}" target-type="inter-app"
+ description="${contentId}" also-hidden="false"/>
+ </field>
+ </form>
+ <form name="CreateSimpleTextContentForAlternateLocale" type="single" target="createSimpleTextContentForAlternateLocale" title="${uiLabelMap.ProductCreateSimpleTextContentForAlternateLocale}">
+ <field name="productId"><hidden/></field>
+ <field name="mainContentId" entry-name="contentId"><hidden/></field>
+ <field name="localeString"><text/></field>
+ <field name="text"><text/></field>
+ <!--
+ <auto-fields-service service-name="createSimpleTextContentForAlternateLocale"/>
+ <field name="fromDate" title="${uiLabelMap.CommonFromDate}" ></field>
+ <field name="thruDate" title="${uiLabelMap.CommonThruDate}"></field>
+ <field name="purchaseFromDate" title="${uiLabelMap.ProductPurchaseFromDate}"></field>
+ <field name="purchaseThruDate" title="${uiLabelMap.ProductPurchaseThruDate}"></field>
+ <field name="useCountLimit" title="${uiLabelMap.ProductUseCountLimit}"></field>
+ <field name="useTime" title="${uiLabelMap.ProductUseTime}"></field>
+ <field name="useTimeUomId" title="${uiLabelMap.ProductUseTimeUom}" widget-style="selectBox">
+ <drop-down allow-empty="true">
+ <entity-options entity-name="Uom" key-field-name="uomId" description="${description}">
+ <entity-constraint name="uomTypeId" value="TIME_FREQ_MEASURE"/>
+ <entity-order-by field-name="description"/>
+ </entity-options>
+ </drop-down>
+ </field>
+ <field name="useRoleTypeId" title="${uiLabelMap.ProductUseRole}"></field>
+ <field name="description" title="${uiLabelMap.ProductDescription}" map-name="content"><text size="40"/></field>
+ <field name="subject" title="${uiLabelMap.ProductSubject}" map-name="emailData"><text size="40"/></field>
+ <field name="plainBody" title="${uiLabelMap.ContentPlainBody}" widget-style="textAreaBox" map-name="emailData"><textarea cols="60" rows="7"/></field>
+ <field name="htmlBody" title="${uiLabelMap.ContentHtmlBody}" widget-style="textAreaBox" map-name="emailData"><textarea cols="60" rows="7"/></field>
+ <field use-when="contentId == null" name="contentId" title="${uiLabelMap.ProductContentId}" tooltip="${uiLabelMap.ProductOptional}"><text maxlength="20"/></field>
+ <field use-when="contentId != null" name="contentId" title="${uiLabelMap.ProductContentId}" tooltip="${uiLabelMap.ProductNotModificationRecrationProductContentAssociation}" map-name="productContentData" ><display/></field>
+ <field name="productId"><hidden/></field>
+ <field name="subjectDataResourceId" map-name="emailData"><hidden/></field>
+ <field name="plainBodyDataResourceId" map-name="emailData"><hidden/></field>
+ <field name="htmlBodyDataResourceId" map-name="emailData"><hidden/></field>
+ <field name="productContentTypeId"><hidden/></field>
+ -->
+ <field name="submitButton" title="${uiLabelMap.CommonCreate}"><submit button-type="button"/></field>
+ </form>
+ <form name="EditProductContentEmail" type="single" target="updateEmailContentForProduct" title="${uiLabelMap.ProductUpdateEmailContentProduct}">
<alt-target use-when="contentId==null" target="createEmailContentForProduct"/>
<auto-fields-entity entity-name="ProductContent" map-name="productContentData"/>
<field name="fromDate" title="${uiLabelMap.CommonFromDate}" ></field>
@@ -454,8 +546,7 @@
<field use-when="contentId == null" name="submitButton" title="${uiLabelMap.CommonCreate}" widget-style="smallSubmit"><submit button-type="button"/></field>
<field use-when="contentId != null" name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field>
</form>
- <form name="EditProductContentDownload" type="single" target="updateDownloadContentForProduct" title="${uiLabelMap.ProductUpdateDownloadContentProduct}"
- default-title-style="tableheadtext" default-widget-style="inputBox" default-tooltip-style="tabletext">
+ <form name="EditProductContentDownload" type="single" target="updateDownloadContentForProduct" title="${uiLabelMap.ProductUpdateDownloadContentProduct}">
<alt-target use-when="contentId==null" target="createDownloadContentForProduct"/>
<auto-fields-entity entity-name="ProductContent" map-name="productContentData"/>
<field name="fromDate" title="${uiLabelMap.CommonFromDate}" ></field>
@@ -483,8 +574,7 @@
<field use-when="contentId == null" name="submitButton" title="${uiLabelMap.CommonCreate}" widget-style="smallSubmit"><submit button-type="button"/></field>
<field use-when="contentId != null" name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field>
</form>
- <form name="EditProductContentExternal" type="single" target="updateExternalContentForProduct" title="${uiLabelMap.ProductUpdateExternalContentProduct}"
- default-title-style="tableheadtext" default-widget-style="inputBox" default-tooltip-style="tabletext">
+ <form name="EditProductContentExternal" type="single" target="updateExternalContentForProduct" title="${uiLabelMap.ProductUpdateExternalContentProduct}">
<alt-target use-when="contentId==null" target="createExternalContentForProduct"/>
<auto-fields-entity entity-name="ProductContent" map-name="productContentData"/>
<field name="description" title="${uiLabelMap.ProductDescription}" map-name="content"><text size="40"/></field>
@@ -498,11 +588,11 @@
<field use-when="contentId == null" name="submitButton" title="${uiLabelMap.CommonCreate}" widget-style="smallSubmit"><submit button-type="button"/></field>
<field use-when="contentId != null" name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field>
</form>
- <form name="EditProductContentSimpleText" type="single" target="updateSimpleTextContentForProduct" title="${uiLabelMap.ProductUpdateSimpleTextContentProduct}"
- default-title-style="tableheadtext" default-widget-style="inputBox" default-tooltip-style="tabletext">
+ <form name="EditProductContentSimpleText" type="single" target="updateSimpleTextContentForProduct" title="${uiLabelMap.ProductUpdateSimpleTextContentProduct}">
<alt-target use-when="contentId==null" target="createSimpleTextContentForProduct"/>
<auto-fields-entity entity-name="ProductContent" map-name="productContentData"/>
- <field name="fromDate" title="${uiLabelMap.CommonFromDate}*" ></field>
+ <field name="fromDate" use-when="contentId==null" title="${uiLabelMap.CommonFromDate}*" ><date-time/></field>
+ <field name="fromDate" use-when="contentId!=null" title="${uiLabelMap.CommonFromDate}" ><display/></field>
<field name="thruDate" title="${uiLabelMap.CommonThruDate}"></field>
<field name="description" title="${uiLabelMap.ProductDescription}" map-name="content"><text size="40"/></field>
<field name="localeString" title="${uiLabelMap.ProductLocaleString}" map-name="content"><text size="40"/></field>
Modified: ofbiz/trunk/applications/product/widget/catalog/ProductScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/ProductScreens.xml?rev=577814&r1=577813&r2=577814&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/widget/catalog/ProductScreens.xml (original)
+++ ofbiz/trunk/applications/product/widget/catalog/ProductScreens.xml Thu Sep 20 09:57:26 2007
@@ -667,17 +667,17 @@
<widgets>
<decorator-screen name="CommonProductDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
+ <include-form name="ListProductContentInfos" location="component://product/webapp/catalog/product/ProductForms.xml"/>
+ <container>
+ <label style="head2">${uiLabelMap.ProductCreateNewProductContent}</label>
+ </container>
+ <include-form name="PrepareAddProductContentAssoc" location="component://product/webapp/catalog/product/ProductForms.xml"/>
+ <container>
+ <label style="head2">${uiLabelMap.ProductAddContentProduct}</label>
+ </container>
+ <include-form name="AddProductContentAssoc" location="component://product/webapp/catalog/product/ProductForms.xml"/>
<platform-specific>
- <html>
- <html-template-decorator location="component://product/webapp/catalog/product/EditProductContent.ftl">
- <html-template-decorator-section name="PrepareAddProductContentAssoc">
- <include-form name="PrepareAddProductContentAssoc" location="component://product/webapp/catalog/product/ProductForms.xml"/>
- </html-template-decorator-section>
- <html-template-decorator-section name="AddProductContentAssoc">
- <include-form name="AddProductContentAssoc" location="component://product/webapp/catalog/product/ProductForms.xml"/>
- </html-template-decorator-section>
- </html-template-decorator>
- </html>
+ <html><html-template location="component://product/webapp/catalog/product/EditProductContent.ftl"/></html>
</platform-specific>
</decorator-section>
</decorator-screen>
@@ -693,12 +693,15 @@
<set field="productId" from-field="parameters.productId"/>
<entity-one entity-name="Product" value-name="product"/>
+ <entity-one entity-name="ProductContent" value-name="productContent"/>
<script location="component://product/webapp/catalog/WEB-INF/actions/product/EditProductContentContent.bsh"/>
</actions>
<widgets>
<decorator-screen name="CommonProductDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<include-form name="${contentFormName}" location="component://product/webapp/catalog/product/ProductForms.xml"/>
+ <include-form name="ListAssociatedContentInfos" location="component://product/webapp/catalog/product/ProductForms.xml"/>
+ <include-form name="CreateSimpleTextContentForAlternateLocale" location="component://product/webapp/catalog/product/ProductForms.xml"/>
</decorator-section>
</decorator-screen>
</widgets>