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

[nobody at svn.erp5.org]

Author: gabriel
Date: Sat Dec  4 13:25:56 2010
New Revision: 41119

URL: http://svn.erp5.org?rev=41119&view=rev
Log:
2010-12-04 gabriel
* Refactor script to not delete object completely but only change the state in the first time. The goals is only remove the object completely on the trash section.

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/bt/change_log
    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=41119&r1=41118&r2=41119&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] Sat Dec  4 13:25:56 2010
@@ -57,10 +57,14 @@ website_url = context.absolute_url()\n
 uid_list = context.REQUEST.get("uids")\n
 \n
 if uid_list is not None:\n
-  object_list = portal.portal_catalog(portal_type=portal_type_list, \n
-                                      uid=uid_list)\n
-  id_list = [object.getId() for object in object_list]\n
-  portal.web_page_module.deleteContent(id_list)\n
+  for catalog_object in portal.portal_catalog(portal_type=portal_type_list, \n
+                                      uid=uid_list):\n
+    if catalog_object.getValidationState() == "deleted":\n
+      continue\n
+    object = context.restrictedTraverse(catalog_object.getPath())\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>
@@ -106,12 +110,9 @@ return context.ERP5Site_redirect(website
                             <string>website_url</string>
                             <string>uid_list</string>
                             <string>None</string>
-                            <string>object_list</string>
-                            <string>append</string>
-                            <string>$append0</string>
                             <string>_getiter_</string>
+                            <string>catalog_object</string>
                             <string>object</string>
-                            <string>id_list</string>
                           </tuple>
                         </value>
                     </item>

Modified: erp5/trunk/bt5/erp5_web_ung_theme/bt/change_log
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_web_ung_theme/bt/change_log?rev=41119&r1=41118&r2=41119&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_web_ung_theme/bt/change_log [utf8] (original)
+++ erp5/trunk/bt5/erp5_web_ung_theme/bt/change_log [utf8] Sat Dec  4 13:25:56 2010
@@ -1,3 +1,6 @@
+2010-12-04 gabriel
+* Refactor script to not delete object completely but only change the state in the first time. The goals is only remove the object completely on the trash section.
+
 2010-11-12 gabriel
 * clean up css to show records number of listbox in toolbar
 

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=41119&r1=41118&r2=41119&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_web_ung_theme/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_web_ung_theme/bt/revision [utf8] Sat Dec  4 13:25:56 2010
@@ -1 +1 @@
-94
\ No newline at end of file
+95
\ No newline at end of file