2006-04-25 yo

* Folder_cut must redirect to the original form even when it fails.
* Reduce the duplicated code in Folder_copy.


git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@6917 20353a03-c40f-0410-a6d1-a30d3c3de9de

product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Folder_copy.xml

@@ -85,10 +85,9 @@ if uids != []:\n
   #context.manage_copyObjects(uids=REQUEST[\'uids\'], REQUEST=REQUEST, RESPONSE=REQUEST.RESPONSE)\n
   context.manage_copyObjects(uids=uids, REQUEST=REQUEST, RESPONSE=REQUEST.RESPONSE)\n
   message = N_("Item(s)+Copied.")\n
-  return REQUEST.RESPONSE.redirect(context.absolute_url() + \'/\' + form_id + \'?portal_status_message=%s\' % message)\n
 else:\n
   message = N_("Please+select+one+or+more+items+to+copy+first.")\n
-  return REQUEST.RESPONSE.redirect(context.absolute_url() + \'/\' + form_id + \'?portal_status_message=%s\' % message)\n
+return REQUEST.RESPONSE.redirect(context.absolute_url() + \'/\' + form_id + \'?portal_status_message=%s\' % message)\n
 </string> </value>
         </item>
         <item>

product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Folder_cut.xml

@@ -84,10 +84,9 @@ if uids != []:\n
   #context.manage_cutObjects(uids=REQUEST[\'uids\'], REQUEST=REQUEST)\n
   context.manage_cutObjects(uids=uids, REQUEST=REQUEST)\n
   message = N_("Item(s)+Cut.")\n
-  return REQUEST.RESPONSE.redirect(context.absolute_url() + \'/\' + form_id + \'?portal_status_message=%s\' % message)\n
 else:\n
   message = N_("Please+select+one+or+more+items+to+cut+first.")\n
-  return REQUEST.RESPONSE.redirect(context.absolute_url() + \'/Folder_viewContentList?portal_status_message=%s\' % message)\n
+return REQUEST.RESPONSE.redirect(context.absolute_url() + \'/\' + form_id + \'?portal_status_message=%s\' % message)\n
 </string> </value>
         </item>
         <item>

product/ERP5/bootstrap/erp5_core/bt/change_log

+2006-04-25 yo
+* Folder_cut must redirect to the original form even when it fails.
+* Reduce the duplicated code in Folder_copy.
+
 2006-04-18 jerome
 * update ERP5Site_reindexAll to reindex portal_alarms and to reindex the whole site in 2 stages, persons in stage 1, and everything again in stage 2 (ERP5Security requires Persons to be indexed)