Show More
@@ -87,7 +87,7 b' OUTPUT::' | |||||
87 | get_user |
|
87 | get_user | |
88 | -------- |
|
88 | -------- | |
89 |
|
89 | |||
90 | Get's an user by username, Returns empty result if user is not found. |
|
90 | Get's an user by username or user_id, Returns empty result if user is not found. | |
91 | This command can be executed only using api_key belonging to user with admin |
|
91 | This command can be executed only using api_key belonging to user with admin | |
92 | rights. |
|
92 | rights. | |
93 |
|
93 | |||
@@ -97,7 +97,7 b' INPUT::' | |||||
97 | api_key : "<api_key>" |
|
97 | api_key : "<api_key>" | |
98 | method : "get_user" |
|
98 | method : "get_user" | |
99 | args : { |
|
99 | args : { | |
100 |
"user |
|
100 | "userid" : "<username or user_id>" | |
101 | } |
|
101 | } | |
102 |
|
102 | |||
103 | OUTPUT:: |
|
103 | OUTPUT:: | |
@@ -370,8 +370,8 b' OUTPUT::' | |||||
370 | get_repo |
|
370 | get_repo | |
371 | -------- |
|
371 | -------- | |
372 |
|
372 | |||
373 |
Gets an existing repository. This command can |
|
373 | Gets an existing repository by it's name or repository_id. This command can | |
374 | belonging to user with admin rights |
|
374 | be executed only using api_key belonging to user with admin rights. | |
375 |
|
375 | |||
376 |
|
376 | |||
377 | INPUT:: |
|
377 | INPUT:: | |
@@ -379,7 +379,7 b' INPUT::' | |||||
379 | api_key : "<api_key>" |
|
379 | api_key : "<api_key>" | |
380 | method : "get_repo" |
|
380 | method : "get_repo" | |
381 | args: { |
|
381 | args: { | |
382 |
"repo |
|
382 | "repoid" : "<reponame or repo_id>" | |
383 | } |
|
383 | } | |
384 |
|
384 | |||
385 | OUTPUT:: |
|
385 | OUTPUT:: |
@@ -80,7 +80,7 b' class ApiController(JSONRPCController):' | |||||
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, user |
|
83 | def get_user(self, apiuser, userid): | |
84 | """" |
|
84 | """" | |
85 | Get a user by username |
|
85 | Get a user by username | |
86 |
|
86 | |||
@@ -88,7 +88,7 b' class ApiController(JSONRPCController):' | |||||
88 | :param username: |
|
88 | :param username: | |
89 | """ |
|
89 | """ | |
90 |
|
90 | |||
91 |
user = User.get_ |
|
91 | user = UserModel().get_user(userid) | |
92 | if user is None: |
|
92 | if user is None: | |
93 | return user |
|
93 | return user | |
94 |
|
94 | |||
@@ -342,7 +342,7 b' class ApiController(JSONRPCController):' | |||||
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 |
|
345 | def get_repo(self, apiuser, repoid): | |
346 | """" |
|
346 | """" | |
347 | Get repository by name |
|
347 | Get repository by name | |
348 |
|
348 | |||
@@ -350,7 +350,7 b' class ApiController(JSONRPCController):' | |||||
350 | :param repo_name: |
|
350 | :param repo_name: | |
351 | """ |
|
351 | """ | |
352 |
|
352 | |||
353 |
repo = Repo |
|
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 |
@@ -82,6 +82,9 b' class RepoModel(BaseModel):' | |||||
82 | "get_repo_%s" % repo_id)) |
|
82 | "get_repo_%s" % repo_id)) | |
83 | return repo.scalar() |
|
83 | return repo.scalar() | |
84 |
|
84 | |||
|
85 | def get_repo(self, repository): | |||
|
86 | return self.__get_repo(repository) | |||
|
87 | ||||
85 | def get_by_repo_name(self, repo_name, cache=False): |
|
88 | def get_by_repo_name(self, repo_name, cache=False): | |
86 | repo = self.sa.query(Repository)\ |
|
89 | repo = self.sa.query(Repository)\ | |
87 | .filter(Repository.repo_name == repo_name) |
|
90 | .filter(Repository.repo_name == repo_name) |
General Comments 0
You need to be logged in to leave comments.
Login now