Mercurial > kallithea
changeset 2231:2cfaf199a5a7 beta
Fixed empty git commit message issue
Fixed empty branches html issues for git
author | Marcin Kuzminski <marcin@python-works.com> |
---|---|
date | Thu, 03 May 2012 21:17:30 +0200 |
parents | 6053badd85ee |
children | 49dc09e9f076 |
files | rhodecode/templates/changeset/changeset.html rhodecode/templates/shortlog/shortlog_data.html |
diffstat | 2 files changed, 8 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/rhodecode/templates/changeset/changeset.html Thu May 03 20:58:08 2012 +0200 +++ b/rhodecode/templates/changeset/changeset.html Thu May 03 21:17:30 2012 +0200 @@ -81,8 +81,11 @@ %if len(c.changeset.parents)>1: <span class="merge">${_('merge')}</span> %endif - <span class="branchtag" title="${'%s %s' % (_('branch'),c.changeset.branch)}"> - ${h.link_to(c.changeset.branch,h.url('files_home',repo_name=c.repo_name,revision=c.changeset.raw_id))}</span> + %if c.changeset.branch: + <span class="branchtag" title="${'%s %s' % (_('branch'),c.changeset.branch)}"> + ${h.link_to(c.changeset.branch,h.url('files_home',repo_name=c.repo_name,revision=c.changeset.raw_id))} + </span> + %endif %for tag in c.changeset.tags: <span class="tagtag" title="${'%s %s' % (_('tag'),tag)}"> ${h.link_to(tag,h.url('files_home',repo_name=c.repo_name,revision=c.changeset.raw_id))}</span>
--- a/rhodecode/templates/shortlog/shortlog_data.html Thu May 03 20:58:08 2012 +0200 +++ b/rhodecode/templates/shortlog/shortlog_data.html Thu May 03 21:17:30 2012 +0200 @@ -15,7 +15,7 @@ <div><pre><a href="${h.url('files_home',repo_name=c.repo_name,revision=cs.raw_id)}">r${cs.revision}:${h.short_id(cs.raw_id)}</a></pre></div> </td> <td> - ${h.link_to(h.truncate(cs.message,50), + ${h.link_to(h.truncate(cs.message,50) or _('No commit message'), h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id), title=cs.message)} </td> @@ -25,9 +25,11 @@ <td title="${cs.author}">${h.person(cs.author)}</td> <td> <span class="logtags"> + %if cs.branch: <span class="branchtag"> ${cs.branch} </span> + %endif </span> </td> <td>