[Erp5-report] r30943 - in /erp5/trunk: bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/...

[nobody at svn.erp5.org]

Author: seb
Date: Mon Nov 30 19:07:36 2009
New Revision: 30943

URL: http://svn.erp5.org?rev=30943&view=rev
Log:
* several preferences where not well configured in testResource
* make Resource_init supporting several individual variations

Modified:
    erp5/trunk/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_init.xml
    erp5/trunk/bt5/erp5_pdm/bt/revision
    erp5/trunk/products/ERP5/tests/testResource.py

Modified: erp5/trunk/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_init.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_init.xml?rev=30943&r1=30942&r2=30943&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_init.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_init.xml [utf8] Mon Nov 30 19:07:36 2009
@@ -57,12 +57,12 @@
 \n
 base = context.portal_preferences.getPreference(\'preferred_%s_variation_base_category_list\' % portal_type)\n
 optional = context.portal_preferences.getPreference(\'preferred_%s_optional_variation_base_category_list\' % portal_type)\n
-individual = context.portal_preferences.getPreference(\'preferred_%s_individual_variation_base_category\' % portal_type)\n
+individual = context.portal_preferences.getPreference(\'preferred_%s_individual_variation_base_category_list\' % portal_type)\n
 \n
 if individual:\n
   context.edit(variation_base_category_list=base,\n
       optional_variation_base_category_list=optional,\n
-      individual_variation_base_category=individual)\n
+      individual_variation_base_category_list=individual)\n
 else:\n
   context.edit(variation_base_category_list=base,\n
       optional_variation_base_category_list=optional)\n

Modified: erp5/trunk/bt5/erp5_pdm/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_pdm/bt/revision?rev=30943&r1=30942&r2=30943&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_pdm/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_pdm/bt/revision [utf8] Mon Nov 30 19:07:36 2009
@@ -1,1 +1,1 @@
-392
+393

Modified: erp5/trunk/products/ERP5/tests/testResource.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/tests/testResource.py?rev=30943&r1=30942&r2=30943&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/tests/testResource.py [utf8] (original)
+++ erp5/trunk/products/ERP5/tests/testResource.py [utf8] Mon Nov 30 19:07:36 2009
@@ -85,9 +85,10 @@
       if preference.getPreferenceState() == 'disabled':
         preference.enable()
 
-    preference.setPreferredApparelModelVariationBaseCategoryList(('colour', 'size', 'morphology', 'industrial_phase',))
+    preference.setPreferredApparelModelVariationBaseCategoryList(('size', 'industrial_phase',))
     preference.setPreferredApparelClothVariationBaseCategoryList(('size',))
     preference.setPreferredApparelComponentVariationBaseCategoryList(('variation',))
+    preference.setPreferredApparelModelIndividualVariationBaseCategoryList(('morphology', 'colour',))
     if preference.getPreferenceState() == 'disabled':
       preference.enable()
     transaction.commit()