##// END OF EJS Templates
Removed deprecated usage of UserModel() in simplehg and simplegit
marcink -
r1497:71738535 beta
parent child Browse files
Show More
@@ -72,7 +72,7 from paste.httpheaders import REMOTE_USE
72 from rhodecode.lib import safe_str
72 from rhodecode.lib import safe_str
73 from rhodecode.lib.auth import authfunc, HasPermissionAnyMiddleware
73 from rhodecode.lib.auth import authfunc, HasPermissionAnyMiddleware
74 from rhodecode.lib.utils import invalidate_cache, check_repo_fast
74 from rhodecode.lib.utils import invalidate_cache, check_repo_fast
75 from rhodecode.model.user import UserModel
75 from rhodecode.model.db import User
76
76
77 from webob.exc import HTTPNotFound, HTTPForbidden, HTTPInternalServerError
77 from webob.exc import HTTPNotFound, HTTPForbidden, HTTPInternalServerError
78
78
@@ -262,7 +262,7 class SimpleGit(object):
262 return repo_name
262 return repo_name
263
263
264 def __get_user(self, username):
264 def __get_user(self, username):
265 return UserModel().get_by_username(username, cache=True)
265 return User.by_username(username)
266
266
267 def __get_action(self, environ):
267 def __get_action(self, environ):
268 """Maps git request commands into a pull or push command.
268 """Maps git request commands into a pull or push command.
@@ -38,7 +38,7 from rhodecode.lib import safe_str
38 from rhodecode.lib.auth import authfunc, HasPermissionAnyMiddleware
38 from rhodecode.lib.auth import authfunc, HasPermissionAnyMiddleware
39 from rhodecode.lib.utils import make_ui, invalidate_cache, \
39 from rhodecode.lib.utils import make_ui, invalidate_cache, \
40 check_repo_fast, ui_sections
40 check_repo_fast, ui_sections
41 from rhodecode.model.user import UserModel
41 from rhodecode.model.db import User
42
42
43 from webob.exc import HTTPNotFound, HTTPForbidden, HTTPInternalServerError
43 from webob.exc import HTTPNotFound, HTTPForbidden, HTTPInternalServerError
44
44
@@ -228,7 +228,7 class SimpleHg(object):
228 return repo_name
228 return repo_name
229
229
230 def __get_user(self, username):
230 def __get_user(self, username):
231 return UserModel().get_by_username(username, cache=True)
231 return User.by_username(username)
232
232
233 def __get_action(self, environ):
233 def __get_action(self, environ):
234 """
234 """
General Comments 0
You need to be logged in to leave comments. Login now