kallithea Changeset - ee45677c4edc

Changeset - ee45677c4edc

Parent rev.

Child rev.

[Not reviewed]

beta

0 3 0

Marcin Kuzminski - 14 years ago 2012-03-20 22:26:02
marcin@python-works.com

Api docs fixes
- return proper type instead of type_
- members return now also a type user or users_group

3 files changed with 11 insertions and 7 deletions:

README.rst

docs/api/api.rst

rhodecode/controllers/api/api.py

0 comments (0 inline, 0 general)

README.rst

➞

Show inline comments

@@ @@ -100,7 +100,7 @@ RhodeCode Features @@
 - Intelligent cache with invalidation after push or project change, provides
   high performance and always up to date data.
 - Rss / atom feeds, gravatar support, download sources as zip/tar/gz
-- Async tasks for speed and performance using celery_ (works without them too)
+- Optional async tasks for speed and performance using celery_
 - Backup scripts can do backup of whole app and send it over scp to desired
   location
 - Based on pylons / sqlalchemy / sqlite / whoosh / vcs

docs/api/api.rst

➞

Show inline comments

@@ @@ -380,7 +380,8 @@ OUTPUT:: @@
 get_repo
 --------
 Gets an existing repository by it's name or repository_id. This command can
 Gets an existing repository by it's name or repository_id. Members will return
 either users_group or user associated to that repository. This command can
 be executed only using api_key belonging to user with admin rights.
@@ @@ -402,7 +403,9 @@ OUTPUT:: @@
                 "type" :        "<type>",
                 "description" : "<description>",
                 "members" :     [
                                   { "id" :         "<userid>",
+                                  {
                                     "type": "user",
                                     "id" :         "<userid>",
                                     "username" :   "<username>",
                                     "firstname":   "<firstname>",
                                     "lastname" :   "<lastname>",
@@ @@ -413,7 +416,8 @@ OUTPUT:: @@
                                     "permission" : "repository.(read|write|admin)"
                                   },
                                   …
+                                  {
+                                  {
                                     "type": "users_group",
                                     "id" :       "<usersgroupid>",
                                     "name" :     "<usersgroupname>",
                                     "active":    "<bool>",

rhodecode/controllers/api/api.py

➞

Show inline comments

@@ @@ -283,7 +283,7 @@ class ApiController(JSONRPCController): @@
     @HasPermissionAllDecorator('hg.admin')
     def add_user_to_users_group(self, apiuser, group_name, username):
         """"
         Add a user to a group
+        Add a user to a users group
         :param apiuser:
         :param group_name:
@@ @@ -361,7 +361,7 @@ class ApiController(JSONRPCController): @@
             user = user.user
             members.append(
                 dict(
-                    type_="user",
+                    type="user",
                     id=user.user_id,
                     username=user.username,
                     firstname=user.name,
@@ @@ -378,7 +378,7 @@ class ApiController(JSONRPCController): @@
             users_group = users_group.users_group
             members.append(
                 dict(
-                    type_="users_group",
+                    type="users_group",
                     id=users_group.users_group_id,
                     name=users_group.users_group_name,
                     active=users_group.users_group_active,

0 comments (0 inline, 0 general)