kallithea Changeset - a732bbc40c7e

Changeset - a732bbc40c7e

Parent rev.

Child rev.

[Not reviewed]

beta

0 2 0

Marcin Kuzminski - 13 years ago 2013-04-30 15:32:04
marcin@python-works.com

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

2 files changed with 12 insertions and 3 deletions:

rhodecode/controllers/admin/users.py

rhodecode/controllers/api/api.py

0 comments (0 inline, 0 general)

rhodecode/controllers/admin/users.py

➞

Show inline comments

@@ @@ -65,13 +65,15 @@ class UsersController(BaseController): @@
         c.available_permissions = config['available_permissions']
     def index(self, format='html'):
         """GET /users: All items in the collection"""
         # url('users')
         c.users_list = User.query().order_by(User.username).all()
         c.users_list = User.query().order_by(User.username)\
                         .filter(User.username != User.DEFAULT_USER)\
                         .all()
         users_data = []
         total_records = len(c.users_list)
         _tmpl_lookup = rhodecode.CONFIG['pylons.app_globals'].mako_lookup
         template = _tmpl_lookup.get_template('data_table/_dt_elements.html')

rhodecode/controllers/api/api.py

➞

Show inline comments

@@ @@ -38,14 +38,15 @@ from rhodecode.lib import helpers as h @@
 from rhodecode.model.meta import Session
 from rhodecode.model.scm import ScmModel
 from rhodecode.model.repo import RepoModel
 from rhodecode.model.user import UserModel
 from rhodecode.model.users_group import UserGroupModel
 from rhodecode.model.db import Repository, RhodeCodeSetting, UserIpMap,\
     Permission
+    Permission, User
 from rhodecode.lib.compat import json
 from rhodecode.lib.exceptions import DefaultUserException
 log = logging.getLogger(__name__)
 class OptionalAttr(object):
     """
@@ @@ -374,13 +375,16 @@ class ApiController(JSONRPCController): @@
         Get all users
         :param apiuser:
         """
         result = []
         for user in UserModel().get_all():
         users_list = User.query().order_by(User.username)\
                         .filter(User.username != User.DEFAULT_USER)\
                         .all()
         for user in users_list:
             result.append(user.get_api_data())
         return result
     @HasPermissionAllDecorator('hg.admin')
     def create_user(self, apiuser, username, email, password,
                     firstname=Optional(None), lastname=Optional(None),
@@ @@ -474,12 +478,15 @@ class ApiController(JSONRPCController): @@
             user = UserModel().update_user(user, **updates)
             Session().commit()
             return dict(
                 msg='updated user ID:%s %s' % (user.user_id, user.username),
                 user=user.get_api_data()
+            )
         except DefaultUserException:
             log.error(traceback.format_exc())
             raise JSONRPCError('editing default user is forbidden')
         except Exception:
             log.error(traceback.format_exc())
             raise JSONRPCError('failed to update user `%s`' % userid)
     @HasPermissionAllDecorator('hg.admin')
     def delete_user(self, apiuser, userid):

0 comments (0 inline, 0 general)