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

[nobody at svn.erp5.org]

Author: chris
Date: Tue Aug  1 17:44:43 2006
New Revision: 8966

URL: http://svn.erp5.org?rev=8966&view=rev
Log:
- Fixed intallation order to fix dependencies handling problems..

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=8966&r1=8965&r2=8966&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 Tue Aug  1 17:44:43 2006
@@ -82,18 +82,14 @@
     bt_dict[bt_id][object_id] = item[\'choice\']\n
 \n
 bt_title_list = []\n
-for bt_id in bt_dict.keys():\n
-  object_list = bt_dict[bt_id]\n
+for bt_id in bt_id_list:\n
+  if bt_id not in bt_dict.keys():\n
+    object_list=[]\n
+  else:\n
+    object_list = bt_dict[bt_id]\n
   bt = context.portal_templates[bt_id]\n
   bt.install(force=0, object_to_update=object_list)\n
   bt_title_list.append(bt.getTitle())\n
-\n
-for id in bt_id_list:\n
-  if id not in bt_dict.keys():\n
-    bt = context.portal_templates[id]\n
-    bt.install(force=0, object_to_update=[])\n
-    bt_title_list.append(bt.getTitle())\n
-\n
 \n
 REQUEST = container.REQUEST\n
 RESPONSE = REQUEST.RESPONSE\n
@@ -164,7 +160,6 @@
                             <string>bt_title_list</string>
                             <string>object_list</string>
                             <string>bt</string>
-                            <string>id</string>
                             <string>container</string>
                             <string>REQUEST</string>
                             <string>RESPONSE</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=8966&r1=8965&r2=8966&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision Tue Aug  1 17:44:43 2006
@@ -1,1 +1,1 @@
-36
+38