kallithea Changeset - 8ec971873d9b

Changeset - 8ec971873d9b

Parent rev.

Child rev.

[Not reviewed]

default

0 4 0

Mads Kiilerich - 11 years ago 2015-01-06 00:54:35
madski@unity3d.com

admin: show links to created users and groups

4 files changed with 16 insertions and 12 deletions:

kallithea/controllers/admin/user_groups.py

kallithea/controllers/admin/users.py

kallithea/tests/functional/test_admin_user_groups.py

kallithea/tests/functional/test_admin_users.py

0 comments (0 inline, 0 general)

kallithea/controllers/admin/user_groups.py

➞

Show inline comments

@@ @@ -135,22 +135,23 @@ class UserGroupsController(BaseControlle @@
         """POST /users_groups: Create a new item"""
         # url('users_groups')
         users_group_form = UserGroupForm()()
         try:
             form_result = users_group_form.to_python(dict(request.POST))
             UserGroupModel().create(name=form_result['users_group_name'],
                                     description=form_result['user_group_description'],
                                     owner=self.authuser.user_id,
                                     active=form_result['users_group_active'])
             ug = UserGroupModel().create(name=form_result['users_group_name'],
                                          description=form_result['user_group_description'],
                                          owner=self.authuser.user_id,
                                          active=form_result['users_group_active'])
             gr = form_result['users_group_name']
             action_logger(self.authuser,
                           'admin_created_users_group:%s' % gr,
                           None, self.ip_addr, self.sa)
             h.flash(_('Created user group %s') % gr, category='success')
             h.flash(h.literal(_('Created user group %s') % h.link_to(h.escape(gr), url('edit_users_group', id=ug.users_group_id))),
                 category='success')
             Session().commit()
         except formencode.Invalid, errors:
             return htmlfill.render(
                 render('admin/user_groups/user_group_add.html'),
                 defaults=errors.value,
                 errors=errors.error_dict or {},

kallithea/controllers/admin/users.py

➞

Show inline comments

@@ @@ -125,17 +125,17 @@ class UsersController(BaseController): @@
         # url('users')
         c.default_extern_type = auth_modules.auth_internal.KallitheaAuthPlugin.name
         user_model = UserModel()
         user_form = UserForm()()
         try:
             form_result = user_form.to_python(dict(request.POST))
             user_model.create(form_result)
+            user = user_model.create(form_result)
             usr = form_result['username']
             action_logger(self.authuser, 'admin_created_user:%s' % usr,
                           None, self.ip_addr, self.sa)
             h.flash(_('Created user %s') % usr,
+            h.flash(h.literal(_('Created user %s') % h.link_to(h.escape(usr), url('edit_user', id=user.user_id))),
                     category='success')
             Session().commit()
         except formencode.Invalid, errors:
             return htmlfill.render(
                 render('admin/users/user_add.html'),
                 defaults=errors.value,

kallithea/tests/functional/test_admin_user_groups.py

➞

Show inline comments

@@ @@ -20,13 +20,15 @@ class TestAdminUsersGroupsController(Tes @@
                                  {'users_group_name': users_group_name,
                                   'user_group_description': 'DESC',
                                   'active': True})
         response.follow()
         self.checkSessionFlash(response,
                                'Created user group %s' % TEST_USER_GROUP)
                                'Created user group <a href="/_admin/user_groups/')
         self.checkSessionFlash(response,
                                '/edit">%s</a>' % TEST_USER_GROUP)
     def test_new(self):
         response = self.app.get(url('new_users_group'))
     def test_update(self):
         response = self.app.put(url('users_group', id=1))
@@ @@ -42,13 +44,13 @@ class TestAdminUsersGroupsController(Tes @@
                                  {'users_group_name':users_group_name,
                                   'user_group_description': 'DESC',
                                   'active': True})
         response.follow()
         self.checkSessionFlash(response,
-                               'Created user group %s' % users_group_name)
                                'Created user group ')
         gr = Session().query(UserGroup)\
             .filter(UserGroup.users_group_name == users_group_name).one()
         response = self.app.delete(url('users_group', id=gr.users_group_id))
@@ @@ -65,13 +67,13 @@ class TestAdminUsersGroupsController(Tes @@
                                   'user_group_description': 'DESC',
                                   'active': True})
         response.follow()
         ug = UserGroup.get_by_group_name(users_group_name)
         self.checkSessionFlash(response,
-                               'Created user group %s' % users_group_name)
                                'Created user group ')
         ## ENABLE REPO CREATE ON A GROUP
         response = self.app.put(url('edit_user_group_default_perms',
                                     id=ug.users_group_id),
                                  {'create_repo_perm': True})
         response.follow()
@@ @@ -135,13 +137,13 @@ class TestAdminUsersGroupsController(Tes @@
                                   'user_group_description': 'DESC',
                                   'active': True})
         response.follow()
         ug = UserGroup.get_by_group_name(users_group_name)
         self.checkSessionFlash(response,
-                               'Created user group %s' % users_group_name)
                                'Created user group ')
         ## ENABLE REPO CREATE ON A GROUP
         response = self.app.put(url('edit_user_group_default_perms',
                                     id=ug.users_group_id),
                                 {'fork_repo_perm': True})
         response.follow()

kallithea/tests/functional/test_admin_users.py

➞

Show inline comments

@@ @@ -57,13 +57,14 @@ class TestAdminUsersController(TestContr @@
              'active': True,
              'lastname': lastname,
              'extern_name': 'internal',
              'extern_type': 'internal',
              'email': email})
         self.checkSessionFlash(response, '''Created user %s''' % (username))
         self.checkSessionFlash(response, '''Created user <a href="/_admin/users/''')
         self.checkSessionFlash(response, '''/edit">%s</a>''' % (username))
         new_user = Session().query(User).\
             filter(User.username == username).one()
         self.assertEqual(new_user.username, username)
         self.assertEqual(check_password(password, new_user.password), True)

0 comments (0 inline, 0 general)