Author: jonesde
Date: Sun Jan 21 18:07:00 2007 New Revision: 498508 URL: http://svn.apache.org/viewvc?view=rev&rev=498508 Log: Added ProductAndCategoryMember entity for general use; used now in the getProductCategoryAndLimitedMembers service when ordering by fields on the Product entity Modified: ofbiz/trunk/applications/product/entitydef/entitygroup.xml ofbiz/trunk/applications/product/entitydef/entitymodel.xml ofbiz/trunk/applications/product/src/org/ofbiz/product/category/CategoryServices.java Modified: ofbiz/trunk/applications/product/entitydef/entitygroup.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/entitydef/entitygroup.xml?view=diff&rev=498508&r1=498507&r2=498508 ============================================================================== --- ofbiz/trunk/applications/product/entitydef/entitygroup.xml (original) +++ ofbiz/trunk/applications/product/entitydef/entitygroup.xml Sun Jan 21 18:07:00 2007 @@ -33,6 +33,7 @@ <!-- org.ofbiz.product.category --> <!-- ========================================================= --> + <entity-group group="org.ofbiz" entity="ProductAndCategoryMember" /> <entity-group group="org.ofbiz" entity="ProductCategory" /> <entity-group group="org.ofbiz" entity="ProductCategoryAndMember" /> <entity-group group="org.ofbiz" entity="ProductCategoryAttribute" /> Modified: ofbiz/trunk/applications/product/entitydef/entitymodel.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/entitydef/entitymodel.xml?view=diff&rev=498508&r1=498507&r2=498508 ============================================================================== --- ofbiz/trunk/applications/product/entitydef/entitymodel.xml (original) +++ ofbiz/trunk/applications/product/entitydef/entitymodel.xml Sun Jan 21 18:07:00 2007 @@ -150,6 +150,27 @@ <!-- org.ofbiz.product.category --> <!-- ========================================================= --> + <view-entity entity-name="ProductAndCategoryMember" + package-name="org.ofbiz.product.category" + title="Product And ProductCategoryMember View Entity"> + <member-entity entity-alias="PROD" entity-name="Product"/> + <member-entity entity-alias="PCM" entity-name="ProductCategoryMember"/> + <alias-all entity-alias="PROD"/> + <alias-all entity-alias="PCM"> + <exclude field="comments"/> + </alias-all> + <view-link entity-alias="PROD" rel-entity-alias="PCM"> + <key-map field-name="productId"/> + </view-link> + <relation type="one-nofk" rel-entity-name="ProductCategoryMember"> + <key-map field-name="productCategoryId"/> + <key-map field-name="productId"/> + <key-map field-name="fromDate"/> + </relation> + <relation type="one-nofk" rel-entity-name="Product"> + <key-map field-name="productId"/> + </relation> + </view-entity> <entity entity-name="ProductCategory" package-name="org.ofbiz.product.category" title="Product Category Entity"> Modified: ofbiz/trunk/applications/product/src/org/ofbiz/product/category/CategoryServices.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/src/org/ofbiz/product/category/CategoryServices.java?view=diff&rev=498508&r1=498507&r2=498508 ============================================================================== --- ofbiz/trunk/applications/product/src/org/ofbiz/product/category/CategoryServices.java (original) +++ ofbiz/trunk/applications/product/src/org/ofbiz/product/category/CategoryServices.java Sun Jan 21 18:07:00 2007 @@ -164,7 +164,7 @@ String orderByField = (String) orderByFieldIter.next(); if (!productCategoryMemberModel.isField(orderByField)) { if (productModel.isField(orderByField)) { - entityName = "ProductCategoryAndMember"; + entityName = "ProductAndCategoryMember"; // that's what we wanted to find out, so we can quit now break; } else { |
Free forum by Nabble | Edit this page |