# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@logilab.fr>
# Date 1362764622 -3600
# Node ID 64a400eea6dd4971e3ee41e9cca1c7b0038f55ec
# Parent  78a99960286a58a2d8d63702eb7a18aea8f793e8# Parent  becbbbc840b8b0a836aedba67eb846e3acfbb84b
merge with stable

diff -r 78a99960286a -r 64a400eea6dd ext/rest.py
--- a/ext/rest.py	Tue Dec 18 12:42:56 2012 +0100
+++ b/ext/rest.py	Fri Mar 08 18:43:42 2013 +0100
@@ -96,7 +96,16 @@
                             **options)], []
 
 def rql_role(role, rawtext, text, lineno, inliner, options={}, content=[]):
-    """:rql:`Any X,Y WHERE X is CWUser, X login Y:table`"""
+    """:rql:`<rql-expr>` or :rql:`<rql-expr>:<vid>`
+
+    Example: :rql:`Any X,Y WHERE X is CWUser, X login Y:table`
+
+    Replace the directive with the output of applying the view to the resultset
+    returned by the query.
+
+    "X eid %(userid)s" can be used in the RQL query for this query will be
+    executed with the argument {'userid': _cw.user.eid}.
+    """
     _cw = inliner.document.settings.context._cw
     text = text.strip()
     if ':' in text:
diff -r 78a99960286a -r 64a400eea6dd web/application.py
--- a/web/application.py	Tue Dec 18 12:42:56 2012 +0100
+++ b/web/application.py	Fri Mar 08 18:43:42 2013 +0100
@@ -541,7 +541,7 @@
         req.reset_message()
         req.reset_headers()
         if req.ajax_request:
-            return ajax_error_handler(req, ex)
+            return self.ajax_error_handler(req, ex)
         try:
             req.data['ex'] = ex
             if tb: