Author: ashish
Date: Wed Apr 16 03:05:27 2008
New Revision: 648654
URL: http://svn.apache.org/viewvc?rev=648654&view=rev
Log:
Added content lookup,minor fix of fromDate in PromoServices.xml and Create New
Category link added.
Modified:
ofbiz/trunk/applications/product/script/org/ofbiz/product/promo/PromoServices.xml
ofbiz/trunk/applications/product/webapp/catalog/category/CategoryForms.xml
ofbiz/trunk/applications/product/widget/catalog/CommonScreens.xml
Modified:
ofbiz/trunk/applications/product/script/org/ofbiz/product/promo/PromoServices.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/promo/PromoServices.xml?rev=648654&r1=648653&r2=648654&view=diff
==============================================================================
---
ofbiz/trunk/applications/product/script/org/ofbiz/product/promo/PromoServices.xml
(original)
+++
ofbiz/trunk/applications/product/script/org/ofbiz/product/promo/PromoServices.xml
Wed Apr 16 03:05:27 2008
@@ -361,7 +361,7 @@
<if-empty field-name="fromDate" map-name="newEntity">
<now-timestamp-to-env env-name="nowTimestamp"/>
- <set from-field="nowTimestamp.fromDate" set-if-empty="true"
field="newEntity.fromDate"/>
+ <set from-field="nowTimestamp" set-if-empty="true"
field="newEntity.fromDate"/>
</if-empty>
<create-value value-name="newEntity"/>
Modified:
ofbiz/trunk/applications/product/webapp/catalog/category/CategoryForms.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/category/CategoryForms.xml?rev=648654&r1=648653&r2=648654&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/category/CategoryForms.xml
(original)
+++ ofbiz/trunk/applications/product/webapp/catalog/category/CategoryForms.xml
Wed Apr 16 03:05:27 2008
@@ -41,6 +41,9 @@
header-row-style="header-row" default-table-style="basic-table">
<auto-fields-entity entity-name="ProductCategoryContent"/>
<field name="productCategoryId"
map-name="productCategory"><hidden/></field>
+ <field name="contentId">
+ <lookup target-form-name="LookupContent"/>
+ </field>
<field name="prodCatContentTypeId">
<drop-down>
<entity-options entity-name="ProductCategoryContentType"
description="${description}">
Modified: ofbiz/trunk/applications/product/widget/catalog/CommonScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/CommonScreens.xml?rev=648654&r1=648653&r2=648654&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/widget/catalog/CommonScreens.xml (original)
+++ ofbiz/trunk/applications/product/widget/catalog/CommonScreens.xml Wed Apr
16 03:05:27 2008
@@ -87,6 +87,9 @@
<widgets>
<decorator-screen name="main-decorator"
location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
+ <container>
+ <link target="EditCategory"
text="${uiLabelMap.ProductNewCategory}" style="buttontext"/>
+ </container>
<platform-specific><html><html-template
location="component://product/webapp/catalog/ChooseTopCategory.ftl"/></html></platform-specific>
</decorator-section>
</decorator-screen>
