diff --git a/kallithea/controllers/admin/user_groups.py b/kallithea/controllers/admin/user_groups.py
--- a/kallithea/controllers/admin/user_groups.py
+++ b/kallithea/controllers/admin/user_groups.py
@@ -138,16 +138,17 @@ class UserGroupsController(BaseControlle
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(
diff --git a/kallithea/controllers/admin/users.py b/kallithea/controllers/admin/users.py
--- a/kallithea/controllers/admin/users.py
+++ b/kallithea/controllers/admin/users.py
@@ -128,11 +128,11 @@ class UsersController(BaseController):
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:
diff --git a/kallithea/tests/functional/test_admin_user_groups.py b/kallithea/tests/functional/test_admin_user_groups.py
--- a/kallithea/tests/functional/test_admin_user_groups.py
+++ b/kallithea/tests/functional/test_admin_user_groups.py
@@ -23,7 +23,9 @@ class TestAdminUsersGroupsController(Tes
response.follow()
self.checkSessionFlash(response,
- 'Created user group %s' % TEST_USER_GROUP)
+ 'Created user group %s' % TEST_USER_GROUP)
def test_new(self):
response = self.app.get(url('new_users_group'))
@@ -45,7 +47,7 @@ class TestAdminUsersGroupsController(Tes
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 @@ class TestAdminUsersGroupsController(Tes
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 @@ class TestAdminUsersGroupsController(Tes
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),
diff --git a/kallithea/tests/functional/test_admin_users.py b/kallithea/tests/functional/test_admin_users.py
--- a/kallithea/tests/functional/test_admin_users.py
+++ b/kallithea/tests/functional/test_admin_users.py
@@ -60,7 +60,8 @@ class TestAdminUsersController(TestContr
'extern_type': 'internal',
'email': email})
- self.checkSessionFlash(response, '''Created user %s''' % (username))
+ self.checkSessionFlash(response, '''Created user %s''' % (username))
new_user = Session().query(User).\
filter(User.username == username).one()