kallithea Changeset - 14dffcfebb02

Changeset - 14dffcfebb02

Parent rev.

Child rev.

[Not reviewed]

beta

0 3 0

Marcin Kuzminski - 14 years ago 2012-02-21 01:51:28
marcin@python-works.com

API get_user and get_repo methods can fetch by id or names

3 files changed with 12 insertions and 9 deletions:

docs/api/api.rst

rhodecode/controllers/api/api.py

rhodecode/model/repo.py

0 comments (0 inline, 0 general)

docs/api/api.rst

➞

Show inline comments

@@ @@ -84,23 +84,23 @@ OUTPUT:: @@
     error :  null
 get_user
 --------
 Get's an user by username, Returns empty result if user is not found.
+Get's an user by username or user_id, Returns empty result if user is not found.
 This command can be executed only using api_key belonging to user with admin
 rights.
 INPUT::
     api_key : "<api_key>"
     method :  "get_user"
     args :    {
-                "username" : "<username>"
+                "userid" : "<username or user_id>"
+              }
 OUTPUT::
     result: None if user does not exist or
+            {
@@ @@ -367,22 +367,22 @@ OUTPUT:: @@
     error:  null
 get_repo
 --------
 Gets an existing repository. This command can be executed only using api_key
 belonging to user with admin rights
 Gets an existing repository by it's name or repository_id. This command can
 be executed only using api_key belonging to user with admin rights.
 INPUT::
     api_key : "<api_key>"
     method :  "get_repo"
     args:     {
-                "repo_name" : "<reponame>"
+                "repoid" : "<reponame or repo_id>"
+              }
 OUTPUT::
     result: None if repository does not exist or
+            {

rhodecode/controllers/api/api.py

➞

Show inline comments

@@ @@ -77,21 +77,21 @@ class ApiController(JSONRPCController): @@
             ScmModel().pull_changes(repo_name, self.rhodecode_user.username)
             return 'Pulled from %s' % repo_name
         except Exception:
             raise JSONRPCError('Unable to pull changes from "%s"' % repo_name)
     @HasPermissionAllDecorator('hg.admin')
-    def get_user(self, apiuser, username):
+    def get_user(self, apiuser, userid):
         """"
         Get a user by username
         :param apiuser:
         :param username:
         """
-        user = User.get_by_username(username)
+        user = UserModel().get_user(userid)
         if user is None:
             return user
         return dict(
             id=user.user_id,
             username=user.username,
@@ @@ -339,21 +339,21 @@ class ApiController(JSONRPCController): @@
             return dict(success=success, msg=msg)
         except Exception:
             log.error(traceback.format_exc())
             raise JSONRPCError('failed to remove user from group')
     @HasPermissionAnyDecorator('hg.admin')
-    def get_repo(self, apiuser, repo_name):
+    def get_repo(self, apiuser, repoid):
         """"
         Get repository by name
         :param apiuser:
         :param repo_name:
         """
-        repo = Repository.get_by_repo_name(repo_name)
+        repo = RepoModel().get_repo(repoid)
         if repo is None:
             raise JSONRPCError('unknown repository %s' % repo)
         members = []
         for user in repo.repo_to_perm:
             perm = user.permission.permission_name

rhodecode/model/repo.py

➞

Show inline comments

@@ @@ -79,12 +79,15 @@ class RepoModel(BaseModel): @@
         if cache:
             repo = repo.options(FromCache("sql_cache_short",
                                           "get_repo_%s" % repo_id))
         return repo.scalar()
     def get_repo(self, repository):
         return self.__get_repo(repository)
     def get_by_repo_name(self, repo_name, cache=False):
         repo = self.sa.query(Repository)\
             .filter(Repository.repo_name == repo_name)
         if cache:
             repo = repo.options(FromCache("sql_cache_short",

0 comments (0 inline, 0 general)