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

[nobody at svn.erp5.org]

Author: jerome
Date: Tue May 22 18:00:45 2007
New Revision: 14547

URL: http://svn.erp5.org?rev=14547&view=rev
Log:
related documents in portal_trash should not prevent from deleting a document

Modified:
    erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Folder_delete.xml
    erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision

Modified: erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Folder_delete.xml
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Folder_delete.xml?rev=14547&r1=14546&r2=14547&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Folder_delete.xml (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Folder_delete.xml Tue May 22 18:00:45 2007
@@ -85,14 +85,17 @@
 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 @@
         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

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=14547&r1=14546&r2=14547&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision Tue May 22 18:00:45 2007
@@ -1,1 +1,1 @@
-338
+339