Mercurial > kallithea
changeset 4333:c597adba8459
users: by default show only 'username' for known users - there is often not much space and the full name would be truncated and not unique
| author | Mads Kiilerich <madski@unity3d.com> |
|---|---|
| date | Tue, 10 Dec 2013 19:30:37 +0100 |
| parents | 609e06b6c52f |
| children | 1a659a59be4a |
| files | kallithea/lib/helpers.py kallithea/templates/changeset/changeset.html kallithea/tests/functional/test_admin_gists.py |
| diffstat | 3 files changed, 4 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/kallithea/lib/helpers.py Tue Dec 10 19:30:37 2013 +0100 +++ b/kallithea/lib/helpers.py Tue Dec 10 19:30:37 2013 +0100 @@ -497,7 +497,7 @@ 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 @@ 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)
--- a/kallithea/templates/changeset/changeset.html Tue Dec 10 19:30:37 2013 +0100 +++ b/kallithea/templates/changeset/changeset.html Tue Dec 10 19:30:37 2013 +0100 @@ -113,7 +113,7 @@ <div class="gravatar"> <img alt="gravatar" src="${h.gravatar_url(h.email_or_none(c.changeset.author),20)}"/> </div> - <span><b>${h.person(c.changeset.author)}</b> - ${h.age(c.changeset.date,True)} ${h.fmt_date(c.changeset.date)}</span><br/> + <span><b>${h.person(c.changeset.author,'username_and_name')}</b> - ${h.age(c.changeset.date,True)} ${h.fmt_date(c.changeset.date)}</span><br/> <span>${h.email_or_none(c.changeset.author)}</span><br/> </div> <div class="message">${h.urlify_commit(c.changeset.message, c.repo_name)}</div>
--- a/kallithea/tests/functional/test_admin_gists.py Tue Dec 10 19:30:37 2013 +0100 +++ b/kallithea/tests/functional/test_admin_gists.py Tue Dec 10 19:30:37 2013 +0100 @@ -151,7 +151,7 @@ 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('<div class="btn btn-mini btn-success disabled">Public Gist</div>')