Mercurial > kallithea
comparison rhodecode/controllers/admin/users_groups.py @ 1117:6eb5bb24a948 beta
Major rewrite of auth objects. Moved parts of filling user data into user model.
Rewrote AuthUser adding access by api key.
author | Marcin Kuzminski <marcin@python-works.com> |
---|---|
date | Wed, 09 Mar 2011 16:34:29 +0100 |
parents | f6658c70eeeb |
children | 6832ef664673 |
comparison
equal
deleted
inserted
replaced
1116:716911af91e1 | 1117:6eb5bb24a948 |
---|---|
34 from pylons.controllers.util import abort, redirect | 34 from pylons.controllers.util import abort, redirect |
35 from pylons.i18n.translation import _ | 35 from pylons.i18n.translation import _ |
36 | 36 |
37 from rhodecode.lib.exceptions import DefaultUserException, UserOwnsReposException | 37 from rhodecode.lib.exceptions import DefaultUserException, UserOwnsReposException |
38 from rhodecode.lib import helpers as h | 38 from rhodecode.lib import helpers as h |
39 from rhodecode.lib.auth import LoginRequired, HasPermissionAllDecorator, \ | 39 from rhodecode.lib.auth import LoginRequired, HasPermissionAllDecorator |
40 fill_perms | |
41 from rhodecode.lib.base import BaseController, render | 40 from rhodecode.lib.base import BaseController, render |
42 | 41 |
43 from rhodecode.model.db import User, UsersGroup | 42 from rhodecode.model.db import User, UsersGroup |
44 from rhodecode.model.forms import UserForm, UsersGroupForm | 43 from rhodecode.model.forms import UserForm, UsersGroupForm |
45 from rhodecode.model.user import UserModel | 44 from rhodecode.model.user import UserModel |