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

[nobody at svn.erp5.org]

Author: jerome
Date: Fri Aug 22 17:46:12 2008
New Revision: 23123

URL: http://svn.erp5.org?rev=23123&view=rev
Log:
Apply Boris Kocherov patch to fix installation of business templates from repositories

http://mail.nexedi.com/pipermail/erp5-dev/2008-August/002024.html

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

Modified: erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/TemplateTool_installBusinessTemplateListAction.xml
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/TemplateTool_installBusinessTemplateListAction.xml?rev=23123&r1=23122&r2=23123&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/TemplateTool_installBusinessTemplateListAction.xml (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/TemplateTool_installBusinessTemplateListAction.xml Fri Aug 22 17:46:12 2008
@@ -75,10 +75,10 @@
 for item in listbox:\n
   bt_id, object_id = item[\'listbox_key\'].split(\'|\')\n
   if bt_dict.has_key(bt_id):\n
-    bt_dict[bt_id][object_id] = item[\'choice\']\n
+    bt_dict[bt_id][object_id] = item[\'choice\'][0]\n
   else:\n
     bt_dict[bt_id] = {}\n
-    bt_dict[bt_id][object_id] = item[\'choice\']\n
+    bt_dict[bt_id][object_id] = item[\'choice\'][0]\n
 \n
 bt_title_list = []\n
 for bt_id in bt_id_list:\n
@@ -185,6 +185,12 @@
             <value> <string>TemplateTool_installBusinessTemplateListAction</string> </value>
         </item>
         <item>
+            <key> <string>uid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
             <key> <string>warnings</string> </key>
             <value>
               <tuple/>

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=23123&r1=23122&r2=23123&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision Fri Aug 22 17:46:12 2008
@@ -1,1 +1,1 @@
-936
+937