[Erp5-report] r24865 - in /erp5/trunk/products/ERP5/bootstrap/erp5_core: SkinTemplateItem/p...

[nobody at svn.erp5.org]

Author: jerome
Date: Thu Dec 11 15:31:41 2008
New Revision: 24865

URL: http://svn.erp5.org?rev=24865&view=rev
Log:
fix bug when making two templates from same document

Modified:
    erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_makeTemplateFromDocument.xml
    erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision

Modified: erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_makeTemplateFromDocument.xml
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_makeTemplateFromDocument.xml?rev=24865&r1=24864&r2=24865&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_makeTemplateFromDocument.xml [utf8] (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_makeTemplateFromDocument.xml [utf8] Thu Dec 11 15:31:41 2008
@@ -65,9 +65,9 @@
 parent = context.getParentValue()\n
 document_id = context.getId()\n
 cp = parent.manage_copyObjects(ids=[document_id])\n
-preference.manage_pasteObjects(cb_copy_data=cp)\n
+paste_info, = preference.manage_pasteObjects(cb_copy_data=cp)\n
 \n
-template = getattr(preference, document_id)\n
+template = getattr(preference, paste_info[\'new_id\'])\n
 template.makeTemplate()\n
 \n
 context.portal_caches.clearCacheFactory(\'erp5_ui_medium\')\n
@@ -122,7 +122,10 @@
                             <string>parent</string>
                             <string>document_id</string>
                             <string>cp</string>
+                            <string>_getiter_</string>
+                            <string>paste_info</string>
                             <string>getattr</string>
+                            <string>_getitem_</string>
                             <string>template</string>
                             <string>_apply_</string>
                             <string>dict</string>

Modified: erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision?rev=24865&r1=24864&r2=24865&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision [utf8] (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision [utf8] Thu Dec 11 15:31:41 2008
@@ -1,1 +1,1 @@
-1036
+1037