Mercurial > kallithea

comparison rhodecode/model/user.py @ 1693:60249224be04 beta

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix for api key lookup, reuse same function in user model
author Marcin Kuzminski <marcin@python-works.com>
date Thu, 17 Nov 2011 18:52:48 +0200
parents 6944b1249f28
children 23bf79f4e8d4
comparison
equal deleted inserted replaced
1692:b76bb93db070 1693:60249224be04
68 user = user.options(FromCache("sql_cache_short", 68 user = user.options(FromCache("sql_cache_short",
69 "get_user_%s" % username)) 69 "get_user_%s" % username))
70 return user.scalar() 70 return user.scalar()
71 71
72 def get_by_api_key(self, api_key, cache=False): 72 def get_by_api_key(self, api_key, cache=False):
73 73 return User.get_by_api_key(api_key, cache)
74 user = self.sa.query(User)\
75 .filter(User.api_key == api_key)
76 if cache:
77 user = user.options(FromCache("sql_cache_short",
78 "get_user_%s" % api_key))
79 return user.scalar()
80 74
81 def create(self, form_data): 75 def create(self, form_data):
82 try: 76 try:
83 new_user = User() 77 new_user = User()
84 for k, v in form_data.items(): 78 for k, v in form_data.items():