# HG changeset patch # User Mads Kiilerich # Date 2022-10-14 13:36:21 # Node ID 379392017b6e56a628854509cf77dfe98d861ccd # Parent d69c3e30f8b5511660ec74a8db6265885579c056 api docs: various minor changes diff --git a/docs/api/api.rst b/docs/api/api.rst --- a/docs/api/api.rst +++ b/docs/api/api.rst @@ -182,7 +182,7 @@ OUTPUT:: id : result : { - "ip_addr_server": ", + "ip_addr_server": ", "user_ips": [ { "ip_addr": "", @@ -225,7 +225,7 @@ OUTPUT:: "emails": "", "ip_addresses": "", "active" : "", - "admin" :  "", + "admin" : "", "ldap_dn" : "", "last_login": "", "permissions": { @@ -265,7 +265,7 @@ OUTPUT:: "emails": "", "ip_addresses": "", "active" : "", - "admin" :  "", + "admin" : "", "ldap_dn" : "", "last_login": "", }, @@ -310,7 +310,7 @@ OUTPUT:: "email" : "", "emails": "", "active" : "", - "admin" :  "", + "admin" : "", "ldap_dn" : "", "last_login": "", }, @@ -358,7 +358,7 @@ OUTPUT:: "email" : "", "emails": "", "active" : "", - "admin" :  "", + "admin" : "", "ldap_dn" : "", "last_login": "", }, @@ -422,7 +422,7 @@ OUTPUT:: "email" : "", "emails": "", "active" : "", - "admin" :  "", + "admin" : "", "ldap_dn" : "", "last_login": "", }, @@ -596,7 +596,7 @@ OUTPUT:: "email" : "", "emails": "", "active" : "", - "admin" :  "", + "admin" : "", "ldap_dn" : "", "last_login": "", "permission" : "repository.(read|write|admin)" @@ -622,7 +622,7 @@ OUTPUT:: "emails": "", "ip_addresses": "", "active" : "", - "admin" :  "", + "admin" : "", "ldap_dn" : "", "last_login": "", }, @@ -1062,7 +1062,7 @@ OUTPUT:: result: [ { "raw_id": "", - "short_id": "short_id": "", + "short_id": "", "author": "", "date": "", "message": "", diff --git a/kallithea/controllers/api/api.py b/kallithea/controllers/api/api.py --- a/kallithea/controllers/api/api.py +++ b/kallithea/controllers/api/api.py @@ -308,7 +308,7 @@ class ApiController(JSONRPCController): id : result : { - "server_ip_addr": "", + "server_ip_addr": "", "user_ips": [ { "ip_addr": "", @@ -317,7 +317,7 @@ class ApiController(JSONRPCController): ... ] } - + error : null """ if userid is None: userid = request.authuser.user_id @@ -858,7 +858,7 @@ class ApiController(JSONRPCController): """ Adds a user to a user group. If user exists in that group success will be `false`. This command can be executed only using api_key - belonging to user with admin rights or an admin of given user group + belonging to user with admin rights or an admin of a given user group :param usergroupid: :type usergroupid: str or int @@ -870,7 +870,7 @@ class ApiController(JSONRPCController): id : result : { "success": True|False # depends on if member is in group - "msg": "added member `` to user group `` | + "msg": "added member `` to a user group `` | User is already in that group" } @@ -973,7 +973,6 @@ class ApiController(JSONRPCController): id : result : { - { "repo_id" : "", "repo_name" : "" "repo_type" : "", @@ -1022,7 +1021,6 @@ class ApiController(JSONRPCController): "": "", ... }, - } } error : null @@ -1082,7 +1080,7 @@ class ApiController(JSONRPCController): "repo_name" : "" "repo_type" : "", "clone_uri" : "", - "private": : "", + "private" : "", "created_on" : "", "description" : "", "landing_rev": "", @@ -1376,6 +1374,7 @@ class ApiController(JSONRPCController): id : api_key : "" + method : "fork_repo" args: { "repoid" : "", "fork_name": "",