[Erp5-report] r20357 - /erp5/trunk/products/ERP5/Document/Resource.py
nobody at svn.erp5.org
nobody at svn.erp5.org
Tue Apr 8 16:31:01 CEST 2008
Author: alex
Date: Tue Apr 8 16:31:01 2008
New Revision: 20357
URL: http://svn.erp5.org?rev=20357&view=rev
Log:
getVariationCategoryItemList:
- add support for omit_optional_variation parameter
- add backwards compatibility for omit_individual_variation parameter handling
Modified:
erp5/trunk/products/ERP5/Document/Resource.py
Modified: erp5/trunk/products/ERP5/Document/Resource.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/Resource.py?rev=20357&r1=20356&r2=20357&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/Resource.py (original)
+++ erp5/trunk/products/ERP5/Document/Resource.py Tue Apr 8 16:31:01 2008
@@ -154,6 +154,7 @@
security.declareProtected(Permissions.AccessContentsInformation,
'getVariationCategoryItemList')
def getVariationCategoryItemList(self, base_category_list=(),
+ omit_optional_variation=0,
omit_individual_variation=1, base=1,
current_category=None,
display_base_category=1,
@@ -173,8 +174,16 @@
self.getVariationBaseCategoryList()
individual_bc_list = self.getIndividualVariationBaseCategoryList()
- other_bc_list = [x for x in base_category_list if x not
- in individual_bc_list]
+ other_bc_list = [x for x in base_category_list
+ if not x in individual_bc_list]
+
+ if omit_optional_variation:
+ optional_bc_list = self.getOptionalVariationBaseCategoryList()\
+ or self.getPortalOptionBaseCategoryList()
+ if optional_bc_list:
+ other_bc_list = [x for x in other_bc_list
+ if not x in optional_bc_list]
+
result = Variated.getVariationCategoryItemList(self,
base_category_list=other_bc_list,
@@ -189,8 +198,12 @@
for variation in individual_variation_list:
for base_category in variation.getVariationBaseCategoryList():
- if (base_category_list is () or base_category in
- base_category_list) and base_category in individual_bc_list:
+ # backwards compatbility: if individual_bc_list is empty, allow
+ # all individual variation base categories.
+ if (base_category_list is ()
+ or base_category in base_category_list)\
+ and (not len(individual_bc_list)
+ or base_category in individual_bc_list):
# XXX append object, relative_url ?
# XXX now, call Renderer a lot of time.
# Better implementation needed
More information about the Erp5-report
mailing list