Author: lektran
Date: Tue Jan 19 22:41:08 2010
New Revision: 900992
URL: http://svn.apache.org/viewvc?rev=900992&view=rev
Log:
Partial revert of r830846 (I left the demo data file name change) and full
revert of r887580 (was committed to avoid problems with the prior commit) as
discussed in OFBIZ-3307.
The problem is that while ProductTypeAttr can be used in this way to constrain
the ProductAttribute.attrName values, it shouldn't be enforced unless the data
model is also enforcing this constraint.
The other problem is that I think there is no way currently to add
ProductTypeAttr records, which means that with these changes no new attributes
can be created via the UI.
Modified:
ofbiz/trunk/applications/product/data/ProductDemoData.xml
ofbiz/trunk/applications/product/widget/catalog/ProductForms.xml
Modified: ofbiz/trunk/applications/product/data/ProductDemoData.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/data/ProductDemoData.xml?rev=900992&r1=900991&r2=900992&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/data/ProductDemoData.xml (original)
+++ ofbiz/trunk/applications/product/data/ProductDemoData.xml Tue Jan 19
22:41:08 2010
@@ -22,29 +22,5 @@
<!-- Limited user demo -->
<UserLoginSecurityGroup groupId="CATALOGADMIN_LTD" userLoginId="ltdadmin"
fromDate="2001-01-01 12:00:00.0"/>
<UserLoginSecurityGroup groupId="CATALOGADMIN_LTD" userLoginId="ltdadmin1"
fromDate="2001-01-01 12:00:00.0"/>
-
-
- <!-- example product attributes -->
- <ProductTypeAttr productTypeId="FINISHED_GOOD" attrName="Pictures
Taken?"/>
- <ProductTypeAttr productTypeId="FINISHED_GOOD" attrName="Pictures
Uploaded?"/>
- <ProductTypeAttr productTypeId="FINISHED_GOOD" attrName="Qual.
Assurance"/>
- <ProductTypeAttr productTypeId="FINISHED_GOOD" attrName="Descriptions
ok?"/>
- <ProductTypeAttr productTypeId="FINISHED_GOOD" attrName="Pricing
Complete?"/>
- <ProductTypeAttr productTypeId="FINISHED_GOOD" attrName="Listing
Approved?"/>
-
- <!-- Not real examples just put there to avoid error -->
- <ProductTypeAttr productTypeId="ASSET_USAGE" attrName="Asset usage?"/>
- <ProductTypeAttr productTypeId="SERVICE" attrName="Service?"/>
- <ProductTypeAttr productTypeId="GOOD" attrName="Good?"/>
- <ProductTypeAttr productTypeId="RAW_MATERIAL" attrName="Raw material?"/>
- <ProductTypeAttr productTypeId="SUBASSEMBLY" attrName="Subassembly?"/>
- <ProductTypeAttr productTypeId="DIGITAL_GOOD" attrName="Digital Good?"/>
- <ProductTypeAttr productTypeId="FINDIG_GOOD" attrName="Finished/Digital
Good"/>
- <ProductTypeAttr productTypeId="AGGREGATED" attrName="Configurable
Good?"/>
- <ProductTypeAttr productTypeId="MARKETING_PKG" attrName="Marketing
Package?"/>
- <ProductTypeAttr productTypeId="MARKETING_PKG_AUTO" attrName="Marketing
Package: Auto Manufactured?"/>
- <ProductTypeAttr productTypeId="MARKETING_PKG_PICK" attrName="Marketing
Package: Pick Assembly?"/>
- <ProductTypeAttr productTypeId="WIP" attrName="Work In Process?"/>
- <ProductTypeAttr productTypeId="AGGREGATED_CONF" attrName="Configurable
Good Configuration?"/>
-
+
</entity-engine-xml>
Modified: ofbiz/trunk/applications/product/widget/catalog/ProductForms.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/ProductForms.xml?rev=900992&r1=900991&r2=900992&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/widget/catalog/ProductForms.xml (original)
+++ ofbiz/trunk/applications/product/widget/catalog/ProductForms.xml Tue Jan 19
22:41:08 2010
@@ -1887,13 +1887,7 @@
header-row-style="header-row" default-table-style="basic-table">
<auto-fields-service service-name="createProductAttribute"/>
<field name="productId"><hidden/></field>
- <field name="attrName">
- <drop-down>
- <entity-options description="${attrName}"
entity-name="ProductTypeAttr">
- <entity-constraint name="productTypeId" operator="equals"
value="${product.productTypeId}"/>
- </entity-options>
- </drop-down>
- </field>
+ <field name="attrName"></field>
<field name="submitButton" title="${uiLabelMap.CommonCreate}"><submit
button-type="button"/></field>
</form>
<form name="UpdateProductAttribute" type="list"
target="updateProductAttribute" title="" list-name="productAttributes"
