[Erp5-report] r37395 jerome - in /erp5/trunk/bt5/erp5_ooo_import: SkinTemplateItem/portal_s...

[nobody at svn.erp5.org]

Author: jerome
Date: Mon Aug  2 12:07:48 2010
New Revision: 37395

URL: http://svn.erp5.org?rev=37395&view=rev
Log:
support importing id

Added:
    erp5/trunk/bt5/erp5_ooo_import/bt/template_registered_skin_selection_list
Modified:
    erp5/trunk/bt5/erp5_ooo_import/SkinTemplateItem/portal_skins/erp5_ooo_import/Base_getModulePortalTypeDefaultProperty.xml
    erp5/trunk/bt5/erp5_ooo_import/SkinTemplateItem/portal_skins/erp5_ooo_import/Base_getModulePortalTypeSortedPropertyList.xml
    erp5/trunk/bt5/erp5_ooo_import/SkinTemplateItem/portal_skins/erp5_ooo_import/Base_importFileLineDefaultScript.xml
    erp5/trunk/bt5/erp5_ooo_import/bt/revision

Modified: erp5/trunk/bt5/erp5_ooo_import/SkinTemplateItem/portal_skins/erp5_ooo_import/Base_getModulePortalTypeDefaultProperty.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_ooo_import/SkinTemplateItem/portal_skins/erp5_ooo_import/Base_getModulePortalTypeDefaultProperty.xml?rev=37395&r1=37394&r2=37395&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_ooo_import/SkinTemplateItem/portal_skins/erp5_ooo_import/Base_getModulePortalTypeDefaultProperty.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_ooo_import/SkinTemplateItem/portal_skins/erp5_ooo_import/Base_getModulePortalTypeDefaultProperty.xml [utf8] Mon Aug  2 12:07:48 2010
@@ -55,7 +55,7 @@
             <key> <string>_body</string> </key>
             <value> <string encoding="cdata"><![CDATA[
 
-forbidden_property = (\'uid\', \'id\', \'portal_type\',)\n
+forbidden_property = (\'uid\', \'portal_type\',)\n
 match_property_list = []\n
 \n
 \n

Modified: erp5/trunk/bt5/erp5_ooo_import/SkinTemplateItem/portal_skins/erp5_ooo_import/Base_getModulePortalTypeSortedPropertyList.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_ooo_import/SkinTemplateItem/portal_skins/erp5_ooo_import/Base_getModulePortalTypeSortedPropertyList.xml?rev=37395&r1=37394&r2=37395&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_ooo_import/SkinTemplateItem/portal_skins/erp5_ooo_import/Base_getModulePortalTypeSortedPropertyList.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_ooo_import/SkinTemplateItem/portal_skins/erp5_ooo_import/Base_getModulePortalTypeSortedPropertyList.xml [utf8] Mon Aug  2 12:07:48 2010
@@ -55,7 +55,7 @@
             <key> <string>_body</string> </key>
             <value> <string>module = context\n
 \n
-forbidden_property = [\'uid\', \'id\', \'portal_type\']\n
+forbidden_property = [\'uid\', \'portal_type\']\n
 property_list = []\n
 \n
 for portal_type in module.allowedContentTypes():\n

Modified: erp5/trunk/bt5/erp5_ooo_import/SkinTemplateItem/portal_skins/erp5_ooo_import/Base_importFileLineDefaultScript.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_ooo_import/SkinTemplateItem/portal_skins/erp5_ooo_import/Base_importFileLineDefaultScript.xml?rev=37395&r1=37394&r2=37395&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_ooo_import/SkinTemplateItem/portal_skins/erp5_ooo_import/Base_importFileLineDefaultScript.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_ooo_import/SkinTemplateItem/portal_skins/erp5_ooo_import/Base_importFileLineDefaultScript.xml [utf8] Mon Aug  2 12:07:48 2010
@@ -101,18 +101,17 @@ else:\n
   # Get portal type objects\n
   base_category_list = portal_type_object.getInstanceBaseCategoryList()\n
   \n
-  # Create the object\n
-  new_object = container.newContent(portal_type=portal_type)\n
-\n
   # Separate categories from properties\n
   imported_line_category_dict = {}\n
   for prop_key in imported_line_property_dict.keys():\n
     if prop_key in base_category_list:\n
       imported_line_category_dict[prop_key] = imported_line_property_dict.pop(prop_key)\n
 \n
+  new_object = None\n
   # Save properties on object\n
   try:\n
-    new_object.edit(**imported_line_property_dict)\n
+    new_object = container.newContent(portal_type=portal_type,\n
+                                      **imported_line_property_dict)\n
   except ConflictError:\n
     raise\n
   except Exception, error:\n
@@ -239,10 +238,10 @@ else:\n
                             <string>dict</string>
                             <string>translated_msg</string>
                             <string>base_category_list</string>
-                            <string>new_object</string>
                             <string>imported_line_category_dict</string>
                             <string>prop_key</string>
                             <string>_write_</string>
+                            <string>new_object</string>
                             <string>_apply_</string>
                             <string>Exception</string>
                             <string>error</string>

Modified: erp5/trunk/bt5/erp5_ooo_import/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_ooo_import/bt/revision?rev=37395&r1=37394&r2=37395&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_ooo_import/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_ooo_import/bt/revision [utf8] Mon Aug  2 12:07:48 2010
@@ -1 +1 @@
-404
\ No newline at end of file
+405
\ No newline at end of file

Added: erp5/trunk/bt5/erp5_ooo_import/bt/template_registered_skin_selection_list
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_ooo_import/bt/template_registered_skin_selection_list?rev=37395&view=auto
==============================================================================
    (empty)