[Erp5-report] r41623 nicolas - /erp5/trunk/products/ERP5/mixin/discoverable.py

[nobody at svn.erp5.org]

Author: nicolas
Date: Tue Dec 21 17:31:36 2010
New Revision: 41623

URL: http://svn.erp5.org?rev=41623&view=rev
Log:
Always keep portal_type choosed by user

Modified:
    erp5/trunk/products/ERP5/mixin/discoverable.py

Modified: erp5/trunk/products/ERP5/mixin/discoverable.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/mixin/discoverable.py?rev=41623&r1=41622&r2=41623&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/mixin/discoverable.py [utf8] (original)
+++ erp5/trunk/products/ERP5/mixin/discoverable.py [utf8] Tue Dec 21 17:31:36 2010
@@ -154,7 +154,13 @@ class DiscoverableMixin(CachedConvertabl
           if value not in (None, ''):
             kw[key]=value
     # Prepare the content edit parameters
-    portal_type = kw.pop('portal_type', None)
+    portal_type = None
+    if input_parameter_dict is not None:
+      # User decision take precedence, never try to change this value
+      portal_type = input_parameter_dict.get('portal_type')
+    if not portal_type:
+      # Read discovered portal_type
+      portal_type = kw.pop('portal_type')
     if portal_type and portal_type != self.getPortalType():
       # Reingestion is required to update portal_type
       return self.migratePortalType(portal_type)