Mercurial > kallithea

comparison rhodecode/controllers/api/api.py @ 3730:e42e1d4e1c47 beta

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
make the permission update function idempotent
author Marcin Kuzminski <marcin@python-works.com>
date Tue, 09 Apr 2013 15:39:45 +0200
parents 7e3d89d9d3a2
children 12ca667b69b6
comparison
equal deleted inserted replaced
3729:49e5d4fa01e9 3730:e42e1d4e1c47
38 from rhodecode.model.meta import Session 38 from rhodecode.model.meta import Session
39 from rhodecode.model.scm import ScmModel 39 from rhodecode.model.scm import ScmModel
40 from rhodecode.model.repo import RepoModel 40 from rhodecode.model.repo import RepoModel
41 from rhodecode.model.user import UserModel 41 from rhodecode.model.user import UserModel
42 from rhodecode.model.users_group import UserGroupModel 42 from rhodecode.model.users_group import UserGroupModel
43 from rhodecode.model.permission import PermissionModel 43 from rhodecode.model.db import Repository, RhodeCodeSetting, UserIpMap,\
44 from rhodecode.model.db import Repository, RhodeCodeSetting, UserIpMap 44 Permission
45 from rhodecode.lib.compat import json 45 from rhodecode.lib.compat import json
46 46
47 log = logging.getLogger(__name__) 47 log = logging.getLogger(__name__)
48 48
49 49
137 """ 137 """
138 Get permission by id or name or return JsonRPCError if not found 138 Get permission by id or name or return JsonRPCError if not found
139 139
140 :param userid: 140 :param userid:
141 """ 141 """
142 perm = PermissionModel().get_permission_by_name(permid) 142 perm = Permission.get_by_key(permid)
143 if perm is None: 143 if perm is None:
144 raise JSONRPCError('permission `%s` does not exist' % (permid)) 144 raise JSONRPCError('permission `%s` does not exist' % (permid))
145 return perm 145 return perm
146 146
147 147