diff docs/api/api.rst @ 2249:12ceeda33339 beta

#404 API extensions for showing permission for users - added permissions to get_user function - added last_login to get_user and get_users function - modified custom JSON encoder to handle non standard python types, like set, OrderedDict, datetime, date
author Marcin Kuzminski <marcin@python-works.com>
date Wed, 21 Mar 2012 21:00:55 +0200
parents ee45677c4edc
children dc2584ba5fbc 347b00545b60
line wrap: on
line diff
--- a/docs/api/api.rst	Wed Mar 21 19:19:22 2012 +0200
+++ b/docs/api/api.rst	Wed Mar 21 21:00:55 2012 +0200
@@ -113,7 +113,15 @@
                 "email" :    "<email>",
                 "active" :   "<bool>",
                 "admin" :    "<bool>",
-                "ldap_dn" :  "<ldap_dn>"
+                "ldap_dn" :  "<ldap_dn>",
+                "last_login": "<last_login>",
+                "permissions": {
+                    "global": ["hg.create.repository",
+                               "repository.read",
+                               "hg.register.manual_activate"],
+                    "repositories": {"repo1": "repository.none"},
+                    "repositories_groups": {"Group1": "group.read"}
+                 },
             }
 
     error:  null
@@ -144,7 +152,8 @@
                 "email" :    "<email>",
                 "active" :   "<bool>",
                 "admin" :    "<bool>",
-                "ldap_dn" :  "<ldap_dn>"
+                "ldap_dn" :  "<ldap_dn>",
+                "last_login": "<last_login>",
               },

             ]