diff --git a/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/WebSection_deleteObjectList.xml b/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/WebSection_deleteObjectList.xml index a1ca8127c09722b799d5a1c3d8ccf7996a911e83..8654851768a9d6a86bbd24573e275caeec87c946 100644 --- a/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/WebSection_deleteObjectList.xml +++ b/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/WebSection_deleteObjectList.xml @@ -60,11 +60,11 @@ if uid_list is not None:\n for catalog_object in portal.portal_catalog(portal_type=portal_type_list, \n uid=uid_list):\n if catalog_object.getValidationState() == "deleted":\n + portal.web_page_module.deleteContent(catalog_object.getId())\n continue\n object = context.restrictedTraverse(catalog_object.getPath())\n + object.setPublicationSection("trash")\n object.delete()\n - \n - #portal.web_page_module.deleteContent(id_list)\n \n return context.ERP5Site_redirect(website_url, keep_items={"reset": 1})\n </string> </value> diff --git a/bt5/erp5_web_ung_theme/bt/change_log b/bt5/erp5_web_ung_theme/bt/change_log index aa37e797a7d8ad18103ffd118927fb37fa79ea9c..89fca7a87bdd778e46ce7cff2c3869a2194bb8af 100644 --- a/bt5/erp5_web_ung_theme/bt/change_log +++ b/bt5/erp5_web_ung_theme/bt/change_log @@ -1,3 +1,6 @@ +2010-12-06 gabriel +* refactor the script WebSection_deleteObjectList to remove completely the objects with state 'deleted'. + 2010-12-06 gabriel * Added one domain and categories to filter the documents in listbox. diff --git a/bt5/erp5_web_ung_theme/bt/revision b/bt5/erp5_web_ung_theme/bt/revision index d7f3668a68034370ad1e355d05f4659541b0db5e..d97edbb29fa140807215ea46cfdc2b84f4c97dcd 100644 --- a/bt5/erp5_web_ung_theme/bt/revision +++ b/bt5/erp5_web_ung_theme/bt/revision @@ -1 +1 @@ -98 \ No newline at end of file +99 \ No newline at end of file