[Erp5-report] r43828 gabriel - in /erp5/trunk/bt5/erp5_web_ung_theme: SkinTemplateItem/port...

[nobody at svn.erp5.org]

Author: gabriel
Date: Mon Feb 28 19:36:24 2011
New Revision: 43828

URL: http://svn.erp5.org?rev=43828&view=rev
Log:
- add asserts
- clean up the code in script

Modified:
    erp5/trunk/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/WebSection_deleteObjectList.xml
    erp5/trunk/bt5/erp5_web_ung_theme/TestTemplateItem/testUNG.py
    erp5/trunk/bt5/erp5_web_ung_theme/bt/revision

Modified: erp5/trunk/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/WebSection_deleteObjectList.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/WebSection_deleteObjectList.xml?rev=43828&r1=43827&r2=43828&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/WebSection_deleteObjectList.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/WebSection_deleteObjectList.xml [utf8] Mon Feb 28 19:36:24 2011
@@ -50,10 +50,9 @@
         </item>
         <item>
             <key> <string>_body</string> </key>
-            <value> <string>portal_type_list = ["Web Page", "Web Table", "Web Illustration"]\n
+            <value> <string>portal_type_list = ["Web Page", "Web Table", "Web Illustration", "Email Thread"]\n
 \n
 portal = context.getPortalObject()\n
-website_url = context.absolute_url()\n
 uid_list = context.REQUEST.get("uids")\n
 \n
 if uid_list is not None:\n
@@ -61,8 +60,8 @@ if uid_list is not None:\n
                                       uid=uid_list):\n
     object = context.restrictedTraverse(catalog_object.getPath())\n
     if object.getValidationState() == "deleted":\n
-      portal.web_page_module.deleteContent(object.getId())\n
-      continue\n
+      parent_folder = object.getParent()\n
+      parent_folder.deleteContent(object.getId())\n
     else:\n
       object.delete()\n
 \n

Modified: erp5/trunk/bt5/erp5_web_ung_theme/TestTemplateItem/testUNG.py
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_web_ung_theme/TestTemplateItem/testUNG.py?rev=43828&r1=43827&r2=43828&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_web_ung_theme/TestTemplateItem/testUNG.py [utf8] (original)
+++ erp5/trunk/bt5/erp5_web_ung_theme/TestTemplateItem/testUNG.py [utf8] Mon Feb 28 19:36:24 2011
@@ -133,8 +133,14 @@ class TestUNG(ERP5TypeTestCase):
   def testWebSection_deleteObjectList(self):
     """Test if objects are deleted correctly"""
     web_page = self.portal.web_page_module.newContent(portal_type="Web Page")
+    relative_url = web_page.getRelativeUrl()
     self.portal.REQUEST.set("uids", [web_page.getUid(),])
     self.stepTic()
     self.portal.WebSection_deleteObjectList()
     self.stepTic()
-    self.assertEquals(web_page.getValidationState(), "deleted")
\ No newline at end of file
+    self.assertEquals(web_page.getValidationState(), "deleted")
+    self.portal.REQUEST.set("uids", [web_page.getUid(),])
+    self.stepTic()
+    self.portal.WebSection_deleteObjectList()
+    self.stepTic()
+    self.assertEquals(len(self.portal.portal_catalog(relative_url=relative_url)), 0)

Modified: erp5/trunk/bt5/erp5_web_ung_theme/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_web_ung_theme/bt/revision?rev=43828&r1=43827&r2=43828&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_web_ung_theme/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_web_ung_theme/bt/revision [utf8] Mon Feb 28 19:36:24 2011
@@ -1 +1 @@
-253
\ No newline at end of file
+254
\ No newline at end of file