Retrait du nettoyage automatique de html : encore une lubie de geek…

[Plinn.git] / skins / custom_content / document_edit_form.py

diff --git a/skins/custom_content/document_edit_form.py b/skins/custom_content/document_edit_form.py
index 82602ec..c23a9a3 100644 (file)
--- a/skins/custom_content/document_edit_form.py
+++ b/skins/custom_content/document_edit_form.py
@@ -1,25 +1,20 @@
 ##parameters=change='', change_and_view='', ajax=''
-##
+from Products.CMFCore.utils import getToolByName
+atool = getToolByName(context, 'portal_attachment')
+attachments = atool.getAttachmentsFor(context)
+
 form = context.REQUEST.form
 text = form.get('text')
 if text and same_type(text, []) :
-       # when javascript is disabled,
-       # there's a hidden textarea from epoz
-       # and an other from <noscript> tag
-       form.update({'text' : text[1]}) 
+    # when javascript is disabled,
+    # there's a hidden textarea from epoz
+    # and an other from <noscript> tag
+    form.update({'text' : text[1]}) 
 
-if change and \
-               context.validateTextFile(**form) and \
-               context.validateHTML(**form) and \
-               context.document_edit_control(**form) and \
-               context.setRedirect(context, 'object/edit', **{'ajax':ajax}):
-       return
-elif change_and_view and \
-               context.validateTextFile(**form) and \
-               context.validateHTML(**form) and \
-               context.document_edit_control(**form) and \
-               context.setRedirect(context, 'object/view', **{'ajax':ajax}):
-       return
+if change_and_view and \
+        context.document_edit_control(text=form.get('text'), text_format='html') :
+    attachments.removeUnusedAttachments(context.EditableBody())
+    return context.setRedirect(context, 'object/view', **{'ajax':ajax})
 
 
 options = {}
@@ -29,6 +24,6 @@ target = context.getActionInfo('object/edit')['url']
 buttons.append( {'name': 'change', 'value': 'Change'} )
 buttons.append( {'name': 'change_and_view', 'value': 'Change and View'} )
 options['form'] = { 'action': target,
-                                       'listButtonInfos': tuple(buttons) }
+                    'listButtonInfos': tuple(buttons) }
 
 return context.document_edit_template(**options)