Mercurial > kallithea

diff 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
line wrap: on
line diff
--- a/rhodecode/controllers/api/api.py	Tue Apr 09 01:14:44 2013 +0200
+++ b/rhodecode/controllers/api/api.py	Tue Apr 09 15:39:45 2013 +0200
@@ -40,8 +40,8 @@
 from rhodecode.model.repo import RepoModel
 from rhodecode.model.user import UserModel
 from rhodecode.model.users_group import UserGroupModel
-from rhodecode.model.permission import PermissionModel
-from rhodecode.model.db import Repository, RhodeCodeSetting, UserIpMap
+from rhodecode.model.db import Repository, RhodeCodeSetting, UserIpMap,\
+    Permission
 from rhodecode.lib.compat import json
 
 log = logging.getLogger(__name__)
@@ -139,7 +139,7 @@
 
     :param userid:
     """
-    perm = PermissionModel().get_permission_by_name(permid)
+    perm = Permission.get_by_key(permid)
     if perm is None:
         raise JSONRPCError('permission `%s` does not exist' % (permid))
     return perm