Mercurial > kallithea

comparison rhodecode/controllers/api/api.py @ 2010:14dffcfebb02 beta

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
API get_user and get_repo methods can fetch by id or names
author Marcin Kuzminski <marcin@python-works.com>
date Tue, 21 Feb 2012 02:51:28 +0200
parents b63adad7c4af
children 82a88013a3fd d5527cebf76a
comparison
equal deleted inserted replaced
2009:b63adad7c4af 2010:14dffcfebb02
78 return 'Pulled from %s' % repo_name 78 return 'Pulled from %s' % repo_name
79 except Exception: 79 except Exception:
80 raise JSONRPCError('Unable to pull changes from "%s"' % repo_name) 80 raise JSONRPCError('Unable to pull changes from "%s"' % repo_name)
81 81
82 @HasPermissionAllDecorator('hg.admin') 82 @HasPermissionAllDecorator('hg.admin')
83 def get_user(self, apiuser, username): 83 def get_user(self, apiuser, userid):
84 """" 84 """"
85 Get a user by username 85 Get a user by username
86 86
87 :param apiuser: 87 :param apiuser:
88 :param username: 88 :param username:
89 """ 89 """
90 90
91 user = User.get_by_username(username) 91 user = UserModel().get_user(userid)
92 if user is None: 92 if user is None:
93 return user 93 return user
94 94
95 return dict( 95 return dict(
96 id=user.user_id, 96 id=user.user_id,
340 except Exception: 340 except Exception:
341 log.error(traceback.format_exc()) 341 log.error(traceback.format_exc())
342 raise JSONRPCError('failed to remove user from group') 342 raise JSONRPCError('failed to remove user from group')
343 343
344 @HasPermissionAnyDecorator('hg.admin') 344 @HasPermissionAnyDecorator('hg.admin')
345 def get_repo(self, apiuser, repo_name): 345 def get_repo(self, apiuser, repoid):
346 """" 346 """"
347 Get repository by name 347 Get repository by name
348 348
349 :param apiuser: 349 :param apiuser:
350 :param repo_name: 350 :param repo_name:
351 """ 351 """
352 352
353 repo = Repository.get_by_repo_name(repo_name) 353 repo = RepoModel().get_repo(repoid)
354 if repo is None: 354 if repo is None:
355 raise JSONRPCError('unknown repository %s' % repo) 355 raise JSONRPCError('unknown repository %s' % repo)
356 356
357 members = [] 357 members = []
358 for user in repo.repo_to_perm: 358 for user in repo.repo_to_perm: