Mercurial > kallithea
comparison rhodecode/controllers/api/api.py @ 3417:fa6ba6727475 beta
further cleanup of UsersGroup
Renaming some names ... but trying not to change API or database scheme.
| author | Mads Kiilerich <madski@unity3d.com> |
|---|---|
| date | Wed, 27 Feb 2013 17:18:43 +0100 |
| parents | 5f1850e4712a |
| children | eda34a21796e |
comparison
equal
deleted
inserted
replaced
| 3416:5706f6ab60cf | 3417:fa6ba6727475 |
|---|---|
| 36 from rhodecode.lib.utils import map_groups, repo2db_mapper | 36 from rhodecode.lib.utils import map_groups, repo2db_mapper |
| 37 from rhodecode.model.meta import Session | 37 from rhodecode.model.meta import Session |
| 38 from rhodecode.model.scm import ScmModel | 38 from rhodecode.model.scm import ScmModel |
| 39 from rhodecode.model.repo import RepoModel | 39 from rhodecode.model.repo import RepoModel |
| 40 from rhodecode.model.user import UserModel | 40 from rhodecode.model.user import UserModel |
| 41 from rhodecode.model.users_group import UsersGroupModel | 41 from rhodecode.model.users_group import UserGroupModel |
| 42 from rhodecode.model.permission import PermissionModel | 42 from rhodecode.model.permission import PermissionModel |
| 43 from rhodecode.model.db import Repository, RhodeCodeSetting, UserIpMap | 43 from rhodecode.model.db import Repository, RhodeCodeSetting, UserIpMap |
| 44 | 44 |
| 45 log = logging.getLogger(__name__) | 45 log = logging.getLogger(__name__) |
| 46 | 46 |
| 123 """ | 123 """ |
| 124 Get user group by id or name or return JsonRPCError if not found | 124 Get user group by id or name or return JsonRPCError if not found |
| 125 | 125 |
| 126 :param userid: | 126 :param userid: |
| 127 """ | 127 """ |
| 128 users_group = UsersGroupModel().get_group(usersgroupid) | 128 users_group = UserGroupModel().get_group(usersgroupid) |
| 129 if users_group is None: | 129 if users_group is None: |
| 130 raise JSONRPCError('user group `%s` does not exist' % usersgroupid) | 130 raise JSONRPCError('user group `%s` does not exist' % usersgroupid) |
| 131 return users_group | 131 return users_group |
| 132 | 132 |
| 133 | 133 |
| 472 | 472 |
| 473 :param apiuser: | 473 :param apiuser: |
| 474 """ | 474 """ |
| 475 | 475 |
| 476 result = [] | 476 result = [] |
| 477 for users_group in UsersGroupModel().get_all(): | 477 for users_group in UserGroupModel().get_all(): |
| 478 result.append(users_group.get_api_data()) | 478 result.append(users_group.get_api_data()) |
| 479 return result | 479 return result |
| 480 | 480 |
| 481 @HasPermissionAllDecorator('hg.admin') | 481 @HasPermissionAllDecorator('hg.admin') |
| 482 def create_users_group(self, apiuser, group_name, active=Optional(True)): | 482 def create_users_group(self, apiuser, group_name, active=Optional(True)): |
| 486 :param apiuser: | 486 :param apiuser: |
| 487 :param group_name: | 487 :param group_name: |
| 488 :param active: | 488 :param active: |
| 489 """ | 489 """ |
| 490 | 490 |
| 491 if UsersGroupModel().get_by_name(group_name): | 491 if UserGroupModel().get_by_name(group_name): |
| 492 raise JSONRPCError("user group `%s` already exist" % group_name) | 492 raise JSONRPCError("user group `%s` already exist" % group_name) |
| 493 | 493 |
| 494 try: | 494 try: |
| 495 active = Optional.extract(active) | 495 active = Optional.extract(active) |
| 496 ug = UsersGroupModel().create(name=group_name, active=active) | 496 ug = UserGroupModel().create(name=group_name, active=active) |
| 497 Session().commit() | 497 Session().commit() |
| 498 return dict( | 498 return dict( |
| 499 msg='created new user group `%s`' % group_name, | 499 msg='created new user group `%s`' % group_name, |
| 500 users_group=ug.get_api_data() | 500 users_group=ug.get_api_data() |
| 501 ) | 501 ) |
| 514 """ | 514 """ |
| 515 user = get_user_or_error(userid) | 515 user = get_user_or_error(userid) |
| 516 users_group = get_users_group_or_error(usersgroupid) | 516 users_group = get_users_group_or_error(usersgroupid) |
| 517 | 517 |
| 518 try: | 518 try: |
| 519 ugm = UsersGroupModel().add_user_to_group(users_group, user) | 519 ugm = UserGroupModel().add_user_to_group(users_group, user) |
| 520 success = True if ugm != True else False | 520 success = True if ugm != True else False |
| 521 msg = 'added member `%s` to user group `%s`' % ( | 521 msg = 'added member `%s` to user group `%s`' % ( |
| 522 user.username, users_group.users_group_name | 522 user.username, users_group.users_group_name |
| 523 ) | 523 ) |
| 524 msg = msg if success else 'User is already in that group' | 524 msg = msg if success else 'User is already in that group' |
| 547 """ | 547 """ |
| 548 user = get_user_or_error(userid) | 548 user = get_user_or_error(userid) |
| 549 users_group = get_users_group_or_error(usersgroupid) | 549 users_group = get_users_group_or_error(usersgroupid) |
| 550 | 550 |
| 551 try: | 551 try: |
| 552 success = UsersGroupModel().remove_user_from_group(users_group, | 552 success = UserGroupModel().remove_user_from_group(users_group, |
| 553 user) | 553 user) |
| 554 msg = 'removed member `%s` from user group `%s`' % ( | 554 msg = 'removed member `%s` from user group `%s`' % ( |
| 555 user.username, users_group.users_group_name | 555 user.username, users_group.users_group_name |
| 556 ) | 556 ) |
| 557 msg = msg if success else "User wasn't in group" | 557 msg = msg if success else "User wasn't in group" |