[Erp5-report] r12015 - in /erp5/trunk/products/ERP5/bootstrap/erp5_core: SkinTemplateItem/p...
nobody at svn.erp5.org
nobody at svn.erp5.org
Thu Jan 11 13:38:06 CET 2007
Author: aurel
Date: Thu Jan 11 13:38:04 2007
New Revision: 12015
URL: http://svn.erp5.org?rev=12015&view=rev
Log:
get uid from selection when installing bt thus we can use listbox with multiple pages
and when installing multiple bt at a time, do not check dependencies again at preinstall as it has already been made before
Modified:
erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/TemplateTool_downloadRepositoryBusinessTemplateList.xml
erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/TemplateTool_getModifiedObjectList.xml
erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/TemplateTool_installRepositoryBusinessTemplateList.xml
erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision
erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/template_update_business_template_workflow
Modified: erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/TemplateTool_downloadRepositoryBusinessTemplateList.xml
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/TemplateTool_downloadRepositoryBusinessTemplateList.xml?rev=12015&r1=12014&r2=12015&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/TemplateTool_downloadRepositoryBusinessTemplateList.xml (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/TemplateTool_downloadRepositoryBusinessTemplateList.xml Thu Jan 11 13:38:04 2007
@@ -71,9 +71,11 @@
<value> <string>REQUEST = container.REQUEST\n
RESPONSE = REQUEST.RESPONSE\n
\n
-uids = getattr(REQUEST, \'uids\', ())\n
+selection_name = kw[\'list_selection_name\']\n
+uids = context.portal_selections.getSelectionCheckedUidsFor(selection_name)\n
+\n
ret_url = \'/\'.join([context.absolute_url(), REQUEST.get(\'form_id\', \'view\')])\n
-#return repr(len(uids))\n
+\n
if len(uids) == 0:\n
RESPONSE.redirect("%s?portal_status_message=No+Business+Template+Specified" % ret_url)\n
return\n
@@ -139,9 +141,10 @@
<string>container</string>
<string>REQUEST</string>
<string>RESPONSE</string>
- <string>getattr</string>
+ <string>_getitem_</string>
+ <string>selection_name</string>
+ <string>context</string>
<string>uids</string>
- <string>context</string>
<string>ret_url</string>
<string>len</string>
<string>id_list</string>
Modified: erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/TemplateTool_getModifiedObjectList.xml
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/TemplateTool_getModifiedObjectList.xml?rev=12015&r1=12014&r2=12015&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/TemplateTool_getModifiedObjectList.xml (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/TemplateTool_getModifiedObjectList.xml Thu Jan 11 13:38:04 2007
@@ -70,15 +70,21 @@
<key> <string>_body</string> </key>
<value> <string>REQUEST = container.REQUEST\n
\n
+\n
bt_id_list = getattr(REQUEST, \'bt_list\', ())\n
if len(bt_id_list) == 0:\n
bt_id_list = kw.get(\'bt_list\', ())\n
\n
+if \'MultiInstallationDialog\' in getattr(REQUEST, \'current_form_id\', \'\'):\n
+ check_dependencies = 0\n
+else:\n
+ check_dependencies = 1\n
+\n
from Products.ERP5Type.Document import newTempBase\n
from Products.ERP5Type.Cache import CachingMethod\n
\n
def getModifiedObjectList(bt):\n
- return bt.preinstall()\n
+ return bt.preinstall(check_dependencies = check_dependencies)\n
\n
getModifiedObjectList = CachingMethod(getModifiedObjectList, id=\'BusinessTemplate_getModifiedObjectList\', cache_duration=36000)\n
\n
@@ -174,6 +180,7 @@
<string>getattr</string>
<string>bt_id_list</string>
<string>len</string>
+ <string>check_dependencies</string>
<string>Products.ERP5Type.Document</string>
<string>newTempBase</string>
<string>Products.ERP5Type.Cache</string>
Modified: erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/TemplateTool_installRepositoryBusinessTemplateList.xml
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/TemplateTool_installRepositoryBusinessTemplateList.xml?rev=12015&r1=12014&r2=12015&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/TemplateTool_installRepositoryBusinessTemplateList.xml (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/TemplateTool_installRepositoryBusinessTemplateList.xml Thu Jan 11 13:38:04 2007
@@ -74,8 +74,9 @@
\n
REQUEST = container.REQUEST\n
RESPONSE = REQUEST.RESPONSE\n
-\n
-uids = getattr(REQUEST, \'uids\', ())\n
+selection_name = kw[\'list_selection_name\']\n
+\n
+uids = context.portal_selections.getSelectionCheckedUidsFor(selection_name)\n
\n
if len(uids) == 0:\n
return context.REQUEST.RESPONSE.redirect(\'%s/TemplateTool_viewInstallRepositoryBusinessTemplateListDialog?portal_status_message=%s\'%(context.absolute_url(), context.urlQuote(\'No Business Template specified.\')))\n
@@ -122,6 +123,8 @@
for uid in uids:\n
tuple_list.append(context.decodeRepositoryBusinessTemplateUid(uid))\n
tuple_list = context.sortBusinessTemplateList(tuple_list)\n
+\n
+context.log(\'uids = %s\' %(uids,), \'tuple list = %s\' %(tuple_list,))\n
\n
bt_list = []\n
for repository, id in tuple_list:\n
@@ -187,10 +190,11 @@
<string>container</string>
<string>REQUEST</string>
<string>RESPONSE</string>
- <string>getattr</string>
+ <string>_getitem_</string>
+ <string>selection_name</string>
+ <string>context</string>
<string>uids</string>
<string>len</string>
- <string>context</string>
<string>id_list</string>
<string>portal_status_message</string>
<string>current_uid_list</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=12015&r1=12014&r2=12015&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision Thu Jan 11 13:38:04 2007
@@ -1,1 +1,1 @@
-235
+238
Modified: erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/template_update_business_template_workflow
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/template_update_business_template_workflow?rev=12015&r1=12014&r2=12015&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/template_update_business_template_workflow (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/template_update_business_template_workflow Thu Jan 11 13:38:04 2007
@@ -1,1 +1,1 @@
-1
+0
More information about the Erp5-report
mailing list