[Erp5-report] r32408 nicolas - in /erp5/trunk/bt5/erp5_administration: ActionTemplateItem/p...
nobody at svn.erp5.org
nobody at svn.erp5.org
Wed Feb 10 13:50:42 CET 2010
Author: nicolas
Date: Wed Feb 10 13:50:42 2010
New Revision: 32408
URL: http://svn.erp5.org?rev=32408&view=rev
Log:
revert r32407, This change can not remove unindexed objects
Removed:
erp5/trunk/bt5/erp5_administration/ActionTemplateItem/portal_types/Template%20Tool/
erp5/trunk/bt5/erp5_administration/SkinTemplateItem/portal_skins/erp5_administration/TemplateTool_getObsoleteTemplateList.xml
erp5/trunk/bt5/erp5_administration/SkinTemplateItem/portal_skins/erp5_administration/TemplateTool_viewDeleteObsoleteTemplateListDialog/
erp5/trunk/bt5/erp5_administration/SkinTemplateItem/portal_skins/erp5_administration/TemplateTool_viewDeleteObsoleteTemplateListDialog.xml
Modified:
erp5/trunk/bt5/erp5_administration/SkinTemplateItem/portal_skins/erp5_administration/SimulationMovement_view.xml
erp5/trunk/bt5/erp5_administration/SkinTemplateItem/portal_skins/erp5_administration/TemplateTool_deleteObsoleteTemplateList.xml
erp5/trunk/bt5/erp5_administration/bt/revision
erp5/trunk/bt5/erp5_administration/bt/template_action_path_list
Modified: erp5/trunk/bt5/erp5_administration/SkinTemplateItem/portal_skins/erp5_administration/SimulationMovement_view.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_administration/SkinTemplateItem/portal_skins/erp5_administration/SimulationMovement_view.xml?rev=32408&r1=32407&r2=32408&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_administration/SkinTemplateItem/portal_skins/erp5_administration/SimulationMovement_view.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_administration/SkinTemplateItem/portal_skins/erp5_administration/SimulationMovement_view.xml [utf8] Wed Feb 10 13:50:42 2010
@@ -86,6 +86,7 @@
<value>
<list>
<string>my_categories_list</string>
+ <string>my_recorded_property_list</string>
</list>
</value>
</item>
Modified: erp5/trunk/bt5/erp5_administration/SkinTemplateItem/portal_skins/erp5_administration/TemplateTool_deleteObsoleteTemplateList.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_administration/SkinTemplateItem/portal_skins/erp5_administration/TemplateTool_deleteObsoleteTemplateList.xml?rev=32408&r1=32407&r2=32408&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_administration/SkinTemplateItem/portal_skins/erp5_administration/TemplateTool_deleteObsoleteTemplateList.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_administration/SkinTemplateItem/portal_skins/erp5_administration/TemplateTool_deleteObsoleteTemplateList.xml [utf8] Wed Feb 10 13:50:42 2010
@@ -53,21 +53,29 @@
</item>
<item>
<key> <string>_body</string> </key>
- <value> <string>portal = context.getPortalObject()\n
-uid_list = portal.portal_selections.getSelectionCheckedUidsFor(\'delete_template_list_selection\')\n
+ <value> <string encoding="cdata"><![CDATA[
+
+portal_templates = context.getPortalObject().portal_templates\n
+delete_list = []\n
+bt_list = portal_templates.objectValues()\n
+for bt in bt_list:\n
+ bt_id = bt.getId()\n
+ installation_state = bt.getInstallationState()\n
+ if installation_state in (\'deleted\', \'replaced\'):\n
+ delete_list.append(bt_id)\n
+ elif installation_state == \'not_installed\':\n
+ if len([x for x in bt_list \\\n
+ if x.getTitle() == bt.getTitle() and \\\n
+ x.getInstallationState() == \'installed\' and \\\n
+ int(x.getRevision() or \'0\') > int(bt.getRevision() or \'0\')]):\n
+ delete_list.append(bt_id)\n
\n
-if uid_list:\n
- # if parameter is empty, catalog query will discard it and return all objects.\n
- id_list = [content.getId() for content in portal.portal_catalog(uid=uid_list)]\n
- message = \'Templates deleted: ${len_template_list}.\'\n
- mapping = {\'len_template_list\': len(id_list)}\n
- context.manage_delObjects(id_list)\n
- translated_message = context.Base_translateString(message, mapping=mapping)\n
-else:\n
- translated_message = context.Base_translateString(\'No Business Template deleted.\')\n
-\n
-portal.ERP5Site_redirect(context.getAbsoluteUrl(), keep_items={\'portal_status_message\': translated_message})\n
-</string> </value>
+print \'Deleted id list:%r\' % delete_list\n
+portal_templates.manage_delObjects(delete_list)\n
+return printed\n
+
+
+]]></string> </value>
</item>
<item>
<key> <string>_code</string> </key>
@@ -77,7 +85,7 @@
</item>
<item>
<key> <string>_params</string> </key>
- <value> <string>*args, **kw</string> </value>
+ <value> <string></string> </value>
</item>
<item>
<key> <string>errors</string> </key>
@@ -103,21 +111,22 @@
<key> <string>co_varnames</string> </key>
<value>
<tuple>
- <string>args</string>
- <string>kw</string>
+ <string>_print_</string>
+ <string>_print</string>
<string>_getattr_</string>
<string>context</string>
- <string>portal</string>
- <string>uid_list</string>
+ <string>portal_templates</string>
+ <string>delete_list</string>
+ <string>bt_list</string>
+ <string>_getiter_</string>
+ <string>bt</string>
+ <string>bt_id</string>
+ <string>installation_state</string>
+ <string>len</string>
<string>append</string>
<string>$append0</string>
- <string>_getiter_</string>
- <string>content</string>
- <string>id_list</string>
- <string>message</string>
- <string>len</string>
- <string>mapping</string>
- <string>translated_message</string>
+ <string>x</string>
+ <string>int</string>
</tuple>
</value>
</item>
Removed: erp5/trunk/bt5/erp5_administration/SkinTemplateItem/portal_skins/erp5_administration/TemplateTool_getObsoleteTemplateList.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_administration/SkinTemplateItem/portal_skins/erp5_administration/TemplateTool_getObsoleteTemplateList.xml?rev=32407&view=auto
==============================================================================
--- erp5/trunk/bt5/erp5_administration/SkinTemplateItem/portal_skins/erp5_administration/TemplateTool_getObsoleteTemplateList.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_administration/SkinTemplateItem/portal_skins/erp5_administration/TemplateTool_getObsoleteTemplateList.xml (removed)
@@ -1,161 +1,0 @@
-<?xml version="1.0"?>
-<ZopeData>
- <record id="1" aka="AAAAAAAAAAE=">
- <pickle>
- <tuple>
- <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
- <tuple/>
- </tuple>
- </pickle>
- <pickle>
- <dictionary>
- <item>
- <key> <string>Script_magic</string> </key>
- <value> <int>3</int> </value>
- </item>
- <item>
- <key> <string>_bind_names</string> </key>
- <value>
- <object>
- <klass>
- <global name="NameAssignments" module="Shared.DC.Scripts.Bindings"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>_asgns</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>name_container</string> </key>
- <value> <string>container</string> </value>
- </item>
- <item>
- <key> <string>name_context</string> </key>
- <value> <string>context</string> </value>
- </item>
- <item>
- <key> <string>name_m_self</string> </key>
- <value> <string>script</string> </value>
- </item>
- <item>
- <key> <string>name_subpath</string> </key>
- <value> <string>traverse_subpath</string> </value>
- </item>
- </dictionary>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
- <item>
- <key> <string>_body</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-portal = context.getPortalObject()\n
-obsolete_list = []\n
-\n
-business_template_list = context.objectValues(**kw)\n
-for business_template in business_template_list:\n
- business_template_id = business_template.getId()\n
- installation_state = business_template.getInstallationState()\n
- if installation_state in (\'deleted\', \'replaced\'):\n
- obsolete_list.append(business_template)\n
- elif installation_state == \'not_installed\':\n
- if len([x for x in business_template_list \\\n
- if x.getTitle() == business_template.getTitle() and \\\n
- x.getInstallationState() == \'installed\' and \\\n
- int(x.getRevision() or \'0\') > int(business_template.getRevision() or \'0\')]):\n
- obsolete_list.append(business_template)\n
-\n
-# Select all by default in selection\n
-uid_list = [business_template.getUid() for business_template in obsolete_list]\n
-portal.portal_selections.setSelectionCheckedUidsFor(kw.get(\'selection_name\'), uid_list)\n
-return obsolete_list\n
-
-
-]]></string> </value>
- </item>
- <item>
- <key> <string>_code</string> </key>
- <value>
- <none/>
- </value>
- </item>
- <item>
- <key> <string>_params</string> </key>
- <value> <string>*args, **kw</string> </value>
- </item>
- <item>
- <key> <string>errors</string> </key>
- <value>
- <tuple/>
- </value>
- </item>
- <item>
- <key> <string>func_code</string> </key>
- <value>
- <object>
- <klass>
- <global name="FuncCode" module="Shared.DC.Scripts.Signature"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>co_argcount</string> </key>
- <value> <int>0</int> </value>
- </item>
- <item>
- <key> <string>co_varnames</string> </key>
- <value>
- <tuple>
- <string>args</string>
- <string>kw</string>
- <string>_getattr_</string>
- <string>context</string>
- <string>portal</string>
- <string>obsolete_list</string>
- <string>_apply_</string>
- <string>business_template_list</string>
- <string>_getiter_</string>
- <string>business_template</string>
- <string>business_template_id</string>
- <string>installation_state</string>
- <string>len</string>
- <string>append</string>
- <string>$append0</string>
- <string>x</string>
- <string>int</string>
- <string>uid_list</string>
- </tuple>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
- <item>
- <key> <string>func_defaults</string> </key>
- <value>
- <none/>
- </value>
- </item>
- <item>
- <key> <string>id</string> </key>
- <value> <string>TemplateTool_getObsoleteTemplateList</string> </value>
- </item>
- <item>
- <key> <string>warnings</string> </key>
- <value>
- <tuple/>
- </value>
- </item>
- </dictionary>
- </pickle>
- </record>
-</ZopeData>
Removed: erp5/trunk/bt5/erp5_administration/SkinTemplateItem/portal_skins/erp5_administration/TemplateTool_viewDeleteObsoleteTemplateListDialog.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_administration/SkinTemplateItem/portal_skins/erp5_administration/TemplateTool_viewDeleteObsoleteTemplateListDialog.xml?rev=32407&view=auto
==============================================================================
--- erp5/trunk/bt5/erp5_administration/SkinTemplateItem/portal_skins/erp5_administration/TemplateTool_viewDeleteObsoleteTemplateListDialog.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_administration/SkinTemplateItem/portal_skins/erp5_administration/TemplateTool_viewDeleteObsoleteTemplateListDialog.xml (removed)
@@ -1,155 +1,0 @@
-<?xml version="1.0"?>
-<ZopeData>
- <record id="1" aka="AAAAAAAAAAE=">
- <pickle>
- <tuple>
- <global name="ERP5Form" module="Products.ERP5Form.Form"/>
- <tuple/>
- </tuple>
- </pickle>
- <pickle>
- <dictionary>
- <item>
- <key> <string>_bind_names</string> </key>
- <value>
- <object>
- <klass>
- <global name="NameAssignments" module="Shared.DC.Scripts.Bindings"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>_asgns</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
- <item>
- <key> <string>_objects</string> </key>
- <value>
- <tuple/>
- </value>
- </item>
- <item>
- <key> <string>action</string> </key>
- <value> <string>TemplateTool_deleteObsoleteTemplateList</string> </value>
- </item>
- <item>
- <key> <string>description</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>edit_order</string> </key>
- <value>
- <list/>
- </value>
- </item>
- <item>
- <key> <string>encoding</string> </key>
- <value> <string>UTF-8</string> </value>
- </item>
- <item>
- <key> <string>enctype</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>group_list</string> </key>
- <value>
- <list>
- <string>left</string>
- <string>right</string>
- <string>center</string>
- <string>bottom</string>
- <string>hidden</string>
- </list>
- </value>
- </item>
- <item>
- <key> <string>groups</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>bottom</string> </key>
- <value>
- <list>
- <string>listbox</string>
- </list>
- </value>
- </item>
- <item>
- <key> <string>center</string> </key>
- <value>
- <list/>
- </value>
- </item>
- <item>
- <key> <string>hidden</string> </key>
- <value>
- <list/>
- </value>
- </item>
- <item>
- <key> <string>left</string> </key>
- <value>
- <list/>
- </value>
- </item>
- <item>
- <key> <string>right</string> </key>
- <value>
- <list/>
- </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>id</string> </key>
- <value> <string>TemplateTool_viewDeleteObsoleteTemplateListDialog</string> </value>
- </item>
- <item>
- <key> <string>method</string> </key>
- <value> <string>POST</string> </value>
- </item>
- <item>
- <key> <string>name</string> </key>
- <value> <string>TemplateTool_viewDeleteObsoleteTemplateListDialog</string> </value>
- </item>
- <item>
- <key> <string>pt</string> </key>
- <value> <string>form_dialog</string> </value>
- </item>
- <item>
- <key> <string>row_length</string> </key>
- <value> <int>4</int> </value>
- </item>
- <item>
- <key> <string>stored_encoding</string> </key>
- <value> <string>UTF-8</string> </value>
- </item>
- <item>
- <key> <string>title</string> </key>
- <value> <string>Delete Obsolete Templates</string> </value>
- </item>
- <item>
- <key> <string>unicode_mode</string> </key>
- <value> <int>0</int> </value>
- </item>
- <item>
- <key> <string>update_action</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>update_action_title</string> </key>
- <value> <string></string> </value>
- </item>
- </dictionary>
- </pickle>
- </record>
-</ZopeData>
Modified: erp5/trunk/bt5/erp5_administration/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_administration/bt/revision?rev=32408&r1=32407&r2=32408&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_administration/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_administration/bt/revision [utf8] Wed Feb 10 13:50:42 2010
@@ -1,1 +1,1 @@
-90
+89
Modified: erp5/trunk/bt5/erp5_administration/bt/template_action_path_list
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_administration/bt/template_action_path_list?rev=32408&r1=32407&r2=32408&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_administration/bt/template_action_path_list [utf8] (original)
+++ erp5/trunk/bt5/erp5_administration/bt/template_action_path_list [utf8] Wed Feb 10 13:50:42 2010
@@ -1,5 +1,4 @@
Applied Rule | view
Simulation Movement | view
Simulation Tool | view
-Template Tool | delete_obsolete_template_list
portal_properties | consistency
More information about the Erp5-report
mailing list