Mercurial > kallithea
comparison rhodecode/controllers/api/api.py @ 3450:eda34a21796e beta
use str2bool on lock api calls
author | Marcin Kuzminski <marcin@python-works.com> |
---|---|
date | Mon, 04 Mar 2013 14:49:46 +0100 |
parents | fa6ba6727475 |
children | 08e8115585bd |
comparison
equal
deleted
inserted
replaced
3449:95a226b35b91 | 3450:eda34a21796e |
---|---|
32 from rhodecode.controllers.api import JSONRPCController, JSONRPCError | 32 from rhodecode.controllers.api import JSONRPCController, JSONRPCError |
33 from rhodecode.lib.auth import PasswordGenerator, AuthUser, \ | 33 from rhodecode.lib.auth import PasswordGenerator, AuthUser, \ |
34 HasPermissionAllDecorator, HasPermissionAnyDecorator, \ | 34 HasPermissionAllDecorator, HasPermissionAnyDecorator, \ |
35 HasPermissionAnyApi, HasRepoPermissionAnyApi | 35 HasPermissionAnyApi, HasRepoPermissionAnyApi |
36 from rhodecode.lib.utils import map_groups, repo2db_mapper | 36 from rhodecode.lib.utils import map_groups, repo2db_mapper |
37 from rhodecode.lib.utils2 import str2bool | |
37 from rhodecode.model.meta import Session | 38 from rhodecode.model.meta import Session |
38 from rhodecode.model.scm import ScmModel | 39 from rhodecode.model.scm import ScmModel |
39 from rhodecode.model.repo import RepoModel | 40 from rhodecode.model.repo import RepoModel |
40 from rhodecode.model.user import UserModel | 41 from rhodecode.model.user import UserModel |
41 from rhodecode.model.users_group import UserGroupModel | 42 from rhodecode.model.users_group import UserGroupModel |
255 raise JSONRPCError('repository `%s` does not exist' % (repoid)) | 256 raise JSONRPCError('repository `%s` does not exist' % (repoid)) |
256 | 257 |
257 if isinstance(userid, Optional): | 258 if isinstance(userid, Optional): |
258 userid = apiuser.user_id | 259 userid = apiuser.user_id |
259 user = get_user_or_error(userid) | 260 user = get_user_or_error(userid) |
260 locked = bool(locked) | 261 locked = str2bool(locked) |
261 try: | 262 try: |
262 if locked: | 263 if locked: |
263 Repository.lock(repo, user.user_id) | 264 Repository.lock(repo, user.user_id) |
264 else: | 265 else: |
265 Repository.unlock(repo) | 266 Repository.unlock(repo) |