Mercurial > kallithea
changeset 4721:8ec971873d9b
admin: show links to created users and groups
| author | Mads Kiilerich <madski@unity3d.com> |
|---|---|
| date | Tue, 06 Jan 2015 00:54:35 +0100 |
| parents | 2d7f6fddb9cf |
| children | 725c345e16fe |
| files | 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 |
| diffstat | 4 files changed, 16 insertions(+), 12 deletions(-) [+] |
line wrap: on
line diff
--- a/kallithea/controllers/admin/user_groups.py Tue Jan 06 00:54:35 2015 +0100 +++ b/kallithea/controllers/admin/user_groups.py Tue Jan 06 00:54:35 2015 +0100 @@ -138,16 +138,17 @@ 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(
--- a/kallithea/controllers/admin/users.py Tue Jan 06 00:54:35 2015 +0100 +++ b/kallithea/controllers/admin/users.py Tue Jan 06 00:54:35 2015 +0100 @@ -128,11 +128,11 @@ 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:
--- a/kallithea/tests/functional/test_admin_user_groups.py Tue Jan 06 00:54:35 2015 +0100 +++ b/kallithea/tests/functional/test_admin_user_groups.py Tue Jan 06 00:54:35 2015 +0100 @@ -23,7 +23,9 @@ 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')) @@ -45,7 +47,7 @@ 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() @@ -68,7 +70,7 @@ 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), @@ -138,7 +140,7 @@ 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),
--- a/kallithea/tests/functional/test_admin_users.py Tue Jan 06 00:54:35 2015 +0100 +++ b/kallithea/tests/functional/test_admin_users.py Tue Jan 06 00:54:35 2015 +0100 @@ -60,7 +60,8 @@ '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()