[Erp5-report] r24674 - in /erp5/trunk/bt5/erp5_egov: PortalTypeWorkflowChainTemplateItem/ S...

[nobody at svn.erp5.org]

Author: fabien
Date: Mon Nov 24 17:41:08 2008
New Revision: 24674

URL: http://svn.erp5.org?rev=24674&view=rev
Log:
add a workflow on attachments. Now, if an agent delete an attachment, the attachment just pass the transition delete_action and he's not deleted as it was before.

Added:
    erp5/trunk/bt5/erp5_egov/PortalTypeWorkflowChainTemplateItem/
    erp5/trunk/bt5/erp5_egov/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml
Modified:
    erp5/trunk/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov/PDFDocument_deleteAttachment.xml
    erp5/trunk/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov/PDFDocument_getReportSectionList.xml
    erp5/trunk/bt5/erp5_egov/bt/revision
    erp5/trunk/bt5/erp5_egov/bt/template_portal_type_workflow_chain_list

Added: erp5/trunk/bt5/erp5_egov/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_egov/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml?rev=24674&view=auto
==============================================================================
--- erp5/trunk/bt5/erp5_egov/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml (added)
+++ erp5/trunk/bt5/erp5_egov/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml [utf8] Mon Nov 24 17:41:08 2008
@@ -1,0 +1,6 @@
+<workflow_chain>
+ <chain>
+  <type>File</type>
+  <workflow>validation_workflow</workflow>
+ </chain>
+</workflow_chain>

Modified: erp5/trunk/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov/PDFDocument_deleteAttachment.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov/PDFDocument_deleteAttachment.xml?rev=24674&r1=24673&r2=24674&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov/PDFDocument_deleteAttachment.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov/PDFDocument_deleteAttachment.xml [utf8] Mon Nov 24 17:41:08 2008
@@ -53,7 +53,9 @@
         </item>
         <item>
             <key> <string>_body</string> </key>
-            <value> <string>request=context.REQUEST\n
+            <value> <string encoding="cdata"><![CDATA[
+
+request=context.REQUEST\n
 portal = context.getPortalObject()\n
 N_ = portal.Base_translateString\n
 \n
@@ -65,11 +67,20 @@
 if not same_type(id_list, []):\n
   id_list=[id_list,]\n
 \n
-context.manage_delObjects(id_list)\n
+if len(id_list) >1:\n
+  message = N_("Please+select+only+one+item+to+delete.")\n
+  qs = \'?portal_status_message=%s\' % message\n
+  return request.RESPONSE.redirect( context.absolute_url() + \'/\' + form_id + qs )\n
+\n
+object = getattr(context, id_list[0], None)\n
+portal.portal_workflow.doActionFor(object, \'delete_action\')\n
+#context.manage_delObjects(id_list)\n
 message = N_(\'Attachment ${file_name} has been deleted\', mapping = { \'file_name\': \'"%s"\' % file_name})\n
 qs = \'?portal_status_message=%s\' % message\n
 return request.RESPONSE.redirect( context.absolute_url() + \'/\' + form_id + qs )\n
-</string> </value>
+
+
+]]></string> </value>
         </item>
         <item>
             <key> <string>_code</string> </key>
@@ -123,6 +134,10 @@
                             <string>message</string>
                             <string>qs</string>
                             <string>same_type</string>
+                            <string>len</string>
+                            <string>getattr</string>
+                            <string>_getitem_</string>
+                            <string>object</string>
                           </tuple>
                         </value>
                     </item>

Modified: erp5/trunk/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov/PDFDocument_getReportSectionList.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov/PDFDocument_getReportSectionList.xml?rev=24674&r1=24673&r2=24674&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov/PDFDocument_getReportSectionList.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov/PDFDocument_getReportSectionList.xml [utf8] Mon Nov 24 17:41:08 2008
@@ -67,6 +67,8 @@
 viewable_content_list = context.contentValues(portal_type=file_type_list, checked_permission=\'View\')\n
 content_group_dict = {}\n
 for content in viewable_content_list:\n
+  if content.getValidationState() != \'draft\':\n
+    continue\n
   title = content.getTitle()\n
   content_group_dict.setdefault(title, [])\n
   content_group_dict[title].append(content)\n

Modified: erp5/trunk/bt5/erp5_egov/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_egov/bt/revision?rev=24674&r1=24673&r2=24674&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_egov/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_egov/bt/revision [utf8] Mon Nov 24 17:41:08 2008
@@ -1,1 +1,1 @@
-455
+456

Modified: erp5/trunk/bt5/erp5_egov/bt/template_portal_type_workflow_chain_list
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_egov/bt/template_portal_type_workflow_chain_list?rev=24674&r1=24673&r2=24674&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_egov/bt/template_portal_type_workflow_chain_list [utf8] (original)
+++ erp5/trunk/bt5/erp5_egov/bt/template_portal_type_workflow_chain_list [utf8] Mon Nov 24 17:41:08 2008
@@ -1,0 +1,1 @@
+File | validation_workflow