[Erp5-report] r32141 fabien - in /erp5/trunk/bt5/erp5_pdm: SkinTemplateItem/portal_skins/er...

[nobody at svn.erp5.org]

Author: fabien
Date: Mon Feb  1 14:52:02 2010
New Revision: 32141

URL: http://svn.erp5.org?rev=32141&view=rev
Log:
Add use_list and clean the script :
- use default values [] for preferences.
- use only one edit, and no if

Modified:
    erp5/trunk/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_init.xml
    erp5/trunk/bt5/erp5_pdm/bt/revision

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=32141&r1=32140&r2=32141&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 Feb  1 14:52:02 2010
@@ -55,17 +55,15 @@
             <key> <string>_body</string> </key>
             <value> <string>portal_type = context.getPortalType().lower().replace(\' \', \'_\')\n
 \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_list\' % portal_type)\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_list\' % portal_type, [])\n
+use_list = context.portal_preferences.getPreference(\'preferred_%s_use_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_list=individual)\n
-else:\n
-  context.edit(variation_base_category_list=base,\n
-      optional_variation_base_category_list=optional)\n
+context.edit(variation_base_category_list=base,\n
+    optional_variation_base_category_list=optional,\n
+    individual_variation_base_category_list=individual,\n
+    use_list=use_list)\n
 </string> </value>
         </item>
         <item>
@@ -110,6 +108,7 @@
                             <string>base</string>
                             <string>optional</string>
                             <string>individual</string>
+                            <string>use_list</string>
                           </tuple>
                         </value>
                     </item>

Modified: erp5/trunk/bt5/erp5_pdm/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_pdm/bt/revision?rev=32141&r1=32140&r2=32141&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_pdm/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_pdm/bt/revision [utf8] Mon Feb  1 14:52:02 2010
@@ -1,1 +1,1 @@
-433
+436