merge with stable
authorPierre-Yves David <pierre-yves.david@logilab.fr>
Fri, 08 Mar 2013 18:43:42 +0100
changeset 8711 64a400eea6dd
parent 8708 78a99960286a (current diff)
parent 8710 becbbbc840b8 (diff)
child 8712 ce5ae7b80d2c
merge with stable
ext/rest.py
web/application.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:
--- 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: