# HG changeset patch
# User Aurelien Campeas <aurelien.campeas@logilab.fr>
# Date 1243436910 -7200
# Node ID 2d015f8fafaeaeb3a4ca513b97271bc1177f75e2
# Parent  5e6799e8608851786795507f22cdbab92f3c20e3# Parent  f14f8465269d02291f2e870142a4a2e8ea8cd009
merge

diff -r f14f8465269d -r 2d015f8fafae web/data/cubicweb.edition.js
--- a/web/data/cubicweb.edition.js	Wed May 27 16:41:24 2009 +0200
+++ b/web/data/cubicweb.edition.js	Wed May 27 17:08:30 2009 +0200
@@ -505,7 +505,7 @@
 	return false;
     }
     d.addCallback(function (result, req) {
-	    handleFormValidationResponse(formid, noop, noop, result);
+        handleFormValidationResponse(formid, noop, noop, result);
 	var fieldview = getNode(divid);
         fieldview.innerHTML = result[2];
 	// switch inline form off only if no error
diff -r f14f8465269d -r 2d015f8fafae web/views/basecontrollers.py
--- a/web/views/basecontrollers.py	Wed May 27 16:41:24 2009 +0200
+++ b/web/views/basecontrollers.py	Wed May 27 17:08:30 2009 +0200
@@ -14,6 +14,7 @@
 import simplejson
 
 from logilab.common.decorators import cached
+from logilab.mtconverter import html_escape
 
 from cubicweb import NoSelectableObject, ValidationError, ObjectNotFound, typed_eid
 from cubicweb.utils import strptime
@@ -416,6 +417,8 @@
             rset = entity.related(rtype, role)
             if rset:
                 output = self.view(vid, rset)
+                if vid == 'textoutofcontext':
+                    output = html_escape(output)
             else:
                 output = default
             return (success, args, output)