diff --git a/kallithea/lib/helpers.py b/kallithea/lib/helpers.py --- a/kallithea/lib/helpers.py +++ b/kallithea/lib/helpers.py @@ -497,7 +497,7 @@ def email_or_none(author): return None -def person(author, show_attr="username_and_name"): +def person(author, show_attr="username"): # attr to return from fetched user person_getter = lambda usr: getattr(usr, show_attr) @@ -523,7 +523,7 @@ def person(author, show_attr="username_a return _author or _email -def person_by_id(id_, show_attr="username_and_name"): +def person_by_id(id_, show_attr="username"): # attr to return from fetched user person_getter = lambda usr: getattr(usr, show_attr) diff --git a/kallithea/templates/changeset/changeset.html b/kallithea/templates/changeset/changeset.html --- a/kallithea/templates/changeset/changeset.html +++ b/kallithea/templates/changeset/changeset.html @@ -113,7 +113,7 @@ ${self.repo_context_bar('changelog', c.c
gravatar
- ${h.person(c.changeset.author)} - ${h.age(c.changeset.date,True)} ${h.fmt_date(c.changeset.date)}
+ ${h.person(c.changeset.author,'username_and_name')} - ${h.age(c.changeset.date,True)} ${h.fmt_date(c.changeset.date)}
${h.email_or_none(c.changeset.author)}
${h.urlify_commit(c.changeset.message, c.repo_name)}
diff --git a/kallithea/tests/functional/test_admin_gists.py b/kallithea/tests/functional/test_admin_gists.py --- a/kallithea/tests/functional/test_admin_gists.py +++ b/kallithea/tests/functional/test_admin_gists.py @@ -151,7 +151,7 @@ class TestGistsController(TestController gist = _create_gist('gist-show-me') response = self.app.get(url('gist', gist_id=gist.gist_access_id)) response.mustcontain('added file: gist-show-me<') - response.mustcontain('test_admin (Kallithea Admin) - created') + response.mustcontain('test_admin - created') response.mustcontain('gist-desc') response.mustcontain('
Public Gist
')