api: fixed tests and update docstrings.

rhodecode/api/tests/test_get_repo.py

@@ -68,7 +68,6 b' class TestGetRepo(object):'
             followers.append(user.user.get_api_data(
                 include_secrets=expect_secrets))
 
-        ret['members'] = permissions
         ret['permissions'] = permissions
         ret['followers'] = followers
 
@@ -106,7 +105,6 b' class TestGetRepo(object):'
         for user in repo.followers:
             followers.append(user.user.get_api_data())
 
-        ret['members'] = permissions
         ret['permissions'] = permissions
         ret['followers'] = followers
 

rhodecode/api/tests/test_get_repo_group.py

@@ -41,7 +41,7 b' class TestApiGetRepoGroup(object):'
 
         permissions = expected_permissions(repo_group)
 
-        ret['members'] = permissions
+        ret['permissions'] = permissions
         expected = ret
         assert_ok(id_, expected, given=response.body)
 

rhodecode/api/tests/test_get_user.py

@@ -36,7 +36,9 b' class TestGetUser(object):'
 
         usr = UserModel().get_by_username(TEST_USER_ADMIN_LOGIN)
         ret = usr.get_api_data(include_secrets=True)
-        ret['permissions'] = AuthUser(usr.user_id).permissions
+        permissions = AuthUser(usr.user_id).permissions
+        ret['permissions'] = permissions
+        ret['permissions_summary'] = permissions
 
         expected = ret
         assert_ok(id_, expected, given=response.body)
@@ -54,7 +56,9 b' class TestGetUser(object):'
 
         usr = UserModel().get_by_username(TEST_USER_ADMIN_LOGIN)
         ret = usr.get_api_data(include_secrets=True)
-        ret['permissions'] = AuthUser(usr.user_id).permissions
+        permissions = AuthUser(usr.user_id).permissions
+        ret['permissions'] = permissions
+        ret['permissions_summary'] = permissions
 
         expected = ret
         assert_ok(id_, expected, given=response.body)
@@ -65,7 +69,9 b' class TestGetUser(object):'
 
         usr = UserModel().get_by_username(self.TEST_USER_LOGIN)
         ret = usr.get_api_data(include_secrets=True)
-        ret['permissions'] = AuthUser(usr.user_id).permissions
+        permissions = AuthUser(usr.user_id).permissions
+        ret['permissions'] = permissions
+        ret['permissions_summary'] = permissions
 
         expected = ret
         assert_ok(id_, expected, given=response.body)

rhodecode/api/tests/test_get_user_group.py

@@ -38,7 +38,8 b' class TestGetUserGroups(object):'
 
         permissions = expected_permissions(group)
 
-        ret['members'] = permissions
+        ret['permissions'] = permissions
+        ret['permissions_summary'] = response.json['result']['permissions_summary']
         expected = ret
         assert_ok(id_, expected, given=response.body)
 
@@ -54,7 +55,8 b' class TestGetUserGroups(object):'
 
         permissions = expected_permissions(group)
 
-        ret['members'] = permissions
+        ret['permissions'] = permissions
+        ret['permissions_summary'] = response.json['result']['permissions_summary']
         expected = ret
         assert_ok(id_, expected, given=response.body)
 

rhodecode/api/views/repo_api.py

@@ -127,26 +127,6 b' def get_repo(request, apiuser, repoid, c'
             "lock_reason": null,
             "locked_by": null,
             "locked_date": null,
-            "members": [
-              {
-                "name": "super-admin-name",
-                "origin": "super-admin",
-                "permission": "repository.admin",
-                "type": "user"
-              },
-              {
-                "name": "owner-name",
-                "origin": "owner",
-                "permission": "repository.admin",
-                "type": "user"
-              },
-              {
-                "name": "user-group-name",
-                "origin": "permission",
-                "permission": "repository.write",
-                "type": "user_group"
-              }
-            ],
             "owner": "owner-name",
             "permissions": [
               {

rhodecode/api/views/repo_group_api.py

@@ -63,7 +63,7 b' def get_repo_group(request, apiuser, rep'
             "group_description": "repo group description",
             "group_id": 14,
             "group_name": "group name",
-            "members": [
+            "permissions": [
               {
                 "name": "super-admin-username",
                 "origin": "super-admin",

rhodecode/api/views/user_api.py

@@ -79,7 +79,8 b' def get_user(request, apiuser, userid=Op'
             "last_login": "Timestamp",
             "last_activity": "Timestamp",
             "lastname": "surnae",
-            "permissions": {
+            "permissions": <deprecated>,
+            "permissions_summary": {
               "global": [
                 "hg.inherit_default_perms.true",
                 "usergroup.read",
@@ -97,7 +98,7 b' def get_user(request, apiuser, userid=Op'
               "repositories": { "username/example": "repository.write"},
               "repositories_groups": { "user-group/repo": "group.none" },
               "user_groups": { "user_group_name": "usergroup.read" }
-            },
+            }
             "user_id": 32,
             "username": "username"
           }

rhodecode/api/views/user_group_api.py

@@ -61,7 +61,7 b' def get_user_group(request, apiuser, use'
             "active": true,
             "group_description": "group description",
             "group_name": "group name",
-            "members": [
+            "permissions": [
               {
                 "name": "owner-name",
                 "origin": "owner",
@@ -82,6 +82,12 b' def get_user_group(request, apiuser, use'
                 "type": "user_group"
               }
             ],
+            "permissions_summary": {
+              "repositories": {
+                "aa-root-level-repo-1": "repository.admin"
+              },
+              "repositories_groups": {}
+            },
             "owner": "owner name",
             "users": [],
             "users_group_id": 2
@@ -120,7 +126,7 b' def get_user_group(request, apiuser, use'
 
     data = user_group.get_api_data()
     data["permissions"] = permissions
-    data["Permissions_summary"] = UserGroupModel().get_perms_summary(
+    data["permissions_summary"] = UserGroupModel().get_perms_summary(
         user_group.users_group_id)
     return data