Mercurial > kallithea

comparison rhodecode/controllers/api/api.py @ 3410:5f1850e4712a beta

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
"Users groups" is grammatically incorrect English - rename to "user groups" - and same story with "repositories groups" This will only change the user facing texts. Names of files, modules, functions and variables should be changed too.
author Mads Kiilerich <madski@unity3d.com>
date Wed, 27 Feb 2013 01:28:00 +0100
parents d6029dacbcc4
children fa6ba6727475
comparison
equal deleted inserted replaced
3409:3c8d8725333f 3410:5f1850e4712a
119 return repo 119 return repo
120 120
121 121
122 def get_users_group_or_error(usersgroupid): 122 def get_users_group_or_error(usersgroupid):
123 """ 123 """
124 Get users 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 = UsersGroupModel().get_group(usersgroupid)
129 if users_group is None: 129 if users_group is None:
130 raise JSONRPCError('users 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
134 def get_perm_or_error(permid): 134 def get_perm_or_error(permid):
135 """ 135 """
447 user.username)) 447 user.username))
448 448
449 @HasPermissionAllDecorator('hg.admin') 449 @HasPermissionAllDecorator('hg.admin')
450 def get_users_group(self, apiuser, usersgroupid): 450 def get_users_group(self, apiuser, usersgroupid):
451 """" 451 """"
452 Get users group by name or id 452 Get user group by name or id
453 453
454 :param apiuser: 454 :param apiuser:
455 :param usersgroupid: 455 :param usersgroupid:
456 """ 456 """
457 users_group = get_users_group_or_error(usersgroupid) 457 users_group = get_users_group_or_error(usersgroupid)
466 return data 466 return data
467 467
468 @HasPermissionAllDecorator('hg.admin') 468 @HasPermissionAllDecorator('hg.admin')
469 def get_users_groups(self, apiuser): 469 def get_users_groups(self, apiuser):
470 """" 470 """"
471 Get all users groups 471 Get all user groups
472 472
473 :param apiuser: 473 :param apiuser:
474 """ 474 """
475 475
476 result = [] 476 result = []
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 UsersGroupModel().get_by_name(group_name):
492 raise JSONRPCError("users 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 = UsersGroupModel().create(name=group_name, active=active)
497 Session().commit() 497 Session().commit()
498 return dict( 498 return dict(
499 msg='created new users 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 )
502 except Exception: 502 except Exception:
503 log.error(traceback.format_exc()) 503 log.error(traceback.format_exc())
504 raise JSONRPCError('failed to create group `%s`' % group_name) 504 raise JSONRPCError('failed to create group `%s`' % group_name)
505 505
506 @HasPermissionAllDecorator('hg.admin') 506 @HasPermissionAllDecorator('hg.admin')
507 def add_user_to_users_group(self, apiuser, usersgroupid, userid): 507 def add_user_to_users_group(self, apiuser, usersgroupid, userid):
508 """" 508 """"
509 Add a user to a users group 509 Add a user to a user group
510 510
511 :param apiuser: 511 :param apiuser:
512 :param usersgroupid: 512 :param usersgroupid:
513 :param userid: 513 :param userid:
514 """ 514 """
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 = UsersGroupModel().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 users 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'
525 Session().commit() 525 Session().commit()
526 526
529 msg=msg 529 msg=msg
530 ) 530 )
531 except Exception: 531 except Exception:
532 log.error(traceback.format_exc()) 532 log.error(traceback.format_exc())
533 raise JSONRPCError( 533 raise JSONRPCError(
534 'failed to add member to users group `%s`' % ( 534 'failed to add member to user group `%s`' % (
535 users_group.users_group_name 535 users_group.users_group_name
536 ) 536 )
537 ) 537 )
538 538
539 @HasPermissionAllDecorator('hg.admin') 539 @HasPermissionAllDecorator('hg.admin')
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 = UsersGroupModel().remove_user_from_group(users_group,
553 user) 553 user)
554 msg = 'removed member `%s` from users 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"
558 Session().commit() 558 Session().commit()
559 return dict(success=success, msg=msg) 559 return dict(success=success, msg=msg)
560 except Exception: 560 except Exception:
561 log.error(traceback.format_exc()) 561 log.error(traceback.format_exc())
562 raise JSONRPCError( 562 raise JSONRPCError(
563 'failed to remove member from users group `%s`' % ( 563 'failed to remove member from user group `%s`' % (
564 users_group.users_group_name 564 users_group.users_group_name
565 ) 565 )
566 ) 566 )
567 567
568 def get_repo(self, apiuser, repoid): 568 def get_repo(self, apiuser, repoid):
888 888
889 @HasPermissionAllDecorator('hg.admin') 889 @HasPermissionAllDecorator('hg.admin')
890 def grant_users_group_permission(self, apiuser, repoid, usersgroupid, 890 def grant_users_group_permission(self, apiuser, repoid, usersgroupid,
891 perm): 891 perm):
892 """ 892 """
893 Grant permission for users group on given repository, or update 893 Grant permission for user group on given repository, or update
894 existing one if found 894 existing one if found
895 895
896 :param apiuser: 896 :param apiuser:
897 :param repoid: 897 :param repoid:
898 :param usersgroupid: 898 :param usersgroupid:
907 group_name=users_group, 907 group_name=users_group,
908 perm=perm) 908 perm=perm)
909 909
910 Session().commit() 910 Session().commit()
911 return dict( 911 return dict(
912 msg='Granted perm: `%s` for users group: `%s` in ' 912 msg='Granted perm: `%s` for user group: `%s` in '
913 'repo: `%s`' % ( 913 'repo: `%s`' % (
914 perm.permission_name, users_group.users_group_name, 914 perm.permission_name, users_group.users_group_name,
915 repo.repo_name 915 repo.repo_name
916 ), 916 ),
917 success=True 917 success=True
918 ) 918 )
919 except Exception: 919 except Exception:
920 log.error(traceback.format_exc()) 920 log.error(traceback.format_exc())
921 raise JSONRPCError( 921 raise JSONRPCError(
922 'failed to edit permission for users group: `%s` in ' 922 'failed to edit permission for user group: `%s` in '
923 'repo: `%s`' % ( 923 'repo: `%s`' % (
924 usersgroupid, repo.repo_name 924 usersgroupid, repo.repo_name
925 ) 925 )
926 ) 926 )
927 927
928 @HasPermissionAllDecorator('hg.admin') 928 @HasPermissionAllDecorator('hg.admin')
929 def revoke_users_group_permission(self, apiuser, repoid, usersgroupid): 929 def revoke_users_group_permission(self, apiuser, repoid, usersgroupid):
930 """ 930 """
931 Revoke permission for users group on given repository 931 Revoke permission for user group on given repository
932 932
933 :param apiuser: 933 :param apiuser:
934 :param repoid: 934 :param repoid:
935 :param usersgroupid: 935 :param usersgroupid:
936 """ 936 """
941 RepoModel().revoke_users_group_permission(repo=repo, 941 RepoModel().revoke_users_group_permission(repo=repo,
942 group_name=users_group) 942 group_name=users_group)
943 943
944 Session().commit() 944 Session().commit()
945 return dict( 945 return dict(
946 msg='Revoked perm for users group: `%s` in repo: `%s`' % ( 946 msg='Revoked perm for user group: `%s` in repo: `%s`' % (
947 users_group.users_group_name, repo.repo_name 947 users_group.users_group_name, repo.repo_name
948 ), 948 ),
949 success=True 949 success=True
950 ) 950 )
951 except Exception: 951 except Exception:
952 log.error(traceback.format_exc()) 952 log.error(traceback.format_exc())
953 raise JSONRPCError( 953 raise JSONRPCError(
954 'failed to edit permission for users group: `%s` in ' 954 'failed to edit permission for user group: `%s` in '
955 'repo: `%s`' % ( 955 'repo: `%s`' % (
956 users_group.users_group_name, repo.repo_name 956 users_group.users_group_name, repo.repo_name
957 ) 957 )
958 ) 958 )