Mercurial > kallithea

comparison rhodecode/controllers/api/api.py @ 3799:a732bbc40c7e beta

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
hide listing of default user - there's no option to edit this user, so listing doesn't make sense - listing and showing builtin default user is confusing
author Marcin Kuzminski <marcin@python-works.com>
date Tue, 30 Apr 2013 15:32:04 +0200
parents 12ca667b69b6
children 2feb58495f34
comparison
equal deleted inserted replaced
3798:574825da0d4e 3799:a732bbc40c7e
39 from rhodecode.model.scm import ScmModel 39 from rhodecode.model.scm import ScmModel
40 from rhodecode.model.repo import RepoModel 40 from rhodecode.model.repo import RepoModel
41 from rhodecode.model.user import UserModel 41 from rhodecode.model.user import UserModel
42 from rhodecode.model.users_group import UserGroupModel 42 from rhodecode.model.users_group import UserGroupModel
43 from rhodecode.model.db import Repository, RhodeCodeSetting, UserIpMap,\ 43 from rhodecode.model.db import Repository, RhodeCodeSetting, UserIpMap,\
44 Permission 44 Permission, User
45 from rhodecode.lib.compat import json 45 from rhodecode.lib.compat import json
46 from rhodecode.lib.exceptions import DefaultUserException
46 47
47 log = logging.getLogger(__name__) 48 log = logging.getLogger(__name__)
48 49
49 50
50 class OptionalAttr(object): 51 class OptionalAttr(object):
375 376
376 :param apiuser: 377 :param apiuser:
377 """ 378 """
378 379
379 result = [] 380 result = []
380 for user in UserModel().get_all(): 381 users_list = User.query().order_by(User.username)\
382 .filter(User.username != User.DEFAULT_USER)\
383 .all()
384 for user in users_list:
381 result.append(user.get_api_data()) 385 result.append(user.get_api_data())
382 return result 386 return result
383 387
384 @HasPermissionAllDecorator('hg.admin') 388 @HasPermissionAllDecorator('hg.admin')
385 def create_user(self, apiuser, username, email, password, 389 def create_user(self, apiuser, username, email, password,
475 Session().commit() 479 Session().commit()
476 return dict( 480 return dict(
477 msg='updated user ID:%s %s' % (user.user_id, user.username), 481 msg='updated user ID:%s %s' % (user.user_id, user.username),
478 user=user.get_api_data() 482 user=user.get_api_data()
479 ) 483 )
484 except DefaultUserException:
485 log.error(traceback.format_exc())
486 raise JSONRPCError('editing default user is forbidden')
480 except Exception: 487 except Exception:
481 log.error(traceback.format_exc()) 488 log.error(traceback.format_exc())
482 raise JSONRPCError('failed to update user `%s`' % userid) 489 raise JSONRPCError('failed to update user `%s`' % userid)
483 490
484 @HasPermissionAllDecorator('hg.admin') 491 @HasPermissionAllDecorator('hg.admin')