diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Folder_delete.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Folder_delete.xml index 852513f10d969045c2f98e8e2af5e7c253816a29..d42789a7a1bdcf9266bfb151e782306ad05a94b4 100644 --- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Folder_delete.xml +++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Folder_delete.xml @@ -85,14 +85,17 @@ REQUEST=context.REQUEST\n qs = \'\'\n ret_url = \'\'\n \n -def Object_hasRelation(object):\n +def Object_hasRelation(obj):\n # Check if there is some related objets.\n result = 0\n - for o in object.getIndexableChildValueList():\n - for related in object.portal_categories.getRelatedValueList(o):\n - if related.getRelativeUrl().startswith(object.getRelativeUrl()):\n + for o in obj.getIndexableChildValueList():\n + for related in obj.portal_categories.getRelatedValueList(o):\n + related_url = related.getRelativeUrl()\n + if related_url.startswith(obj.getRelativeUrl()):\n continue\n - elif related.getRelativeUrl().startswith(\'portal_simulation\') :\n + elif related_url.startswith(\'portal_simulation\'):\n + continue\n + elif related_url.startswith(\'portal_trash\'):\n continue\n else:\n result = 1\n @@ -135,14 +138,14 @@ elif uids is not None:\n object_to_delete_list.append(object)\n \n # Remove some objects\n - try: \n + try:\n if object_to_remove_list != []:\n context.manage_delObjects(\n uids=[x.getUid() for x in object_to_remove_list],\n REQUEST=REQUEST)\n - except ConflictError: \n + except ConflictError:\n raise\n - except Exception, message : \n + except Exception, message:\n qs = \'?portal_status_message=%s\' % message\n else:\n object_ids = [x.getId() for x in object_to_remove_list]\n diff --git a/product/ERP5/bootstrap/erp5_core/bt/revision b/product/ERP5/bootstrap/erp5_core/bt/revision index 4b74f2216dbbf61c34b833c71a1bf5ce78c85b6a..832f62a3cbee4ea0a1147819b77db56a04e3de4c 100644 --- a/product/ERP5/bootstrap/erp5_core/bt/revision +++ b/product/ERP5/bootstrap/erp5_core/bt/revision @@ -1 +1 @@ -338 \ No newline at end of file +339 \ No newline at end of file