Merge lp:~cruzjbishop/loggerhead/Fix-387227 into lp:loggerhead

Proposed by Cruz Bishop
Status: Merged
Approved by: j.c.sackett
Approved revision: 478
Merged at revision: 479
Proposed branch: lp:~cruzjbishop/loggerhead/Fix-387227
Merge into: lp:loggerhead
Diff against target: 12 lines (+1/-1)
1 file modified
loggerhead/templates/revisionfilechanges.pt (+1/-1)
To merge this branch: bzr merge lp:~cruzjbishop/loggerhead/Fix-387227
Reviewer Review Type Date Requested Status
j.c.sackett (community) Approve
Review via email: mp+125452@code.launchpad.net

Description of the change

This fixes bug #387227 "odd rendering of files list in revision 1"

It was discovered that, when the name of either a file or directory is blank, something like this would occur.

http://i.imgur.com/mSLJF.png

As you can see, a file icon is partially displayed. It looks out of place.

By omitting the associated information with files and directories with no name, this will no longer happen. In fact, it looks like this on my development machine:

http://i.imgur.com/zoAXU.png

Much better, isn't it? :)

To post a comment you must log in.
Revision history for this message
j.c.sackett (jcsackett) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'loggerhead/templates/revisionfilechanges.pt'
2--- loggerhead/templates/revisionfilechanges.pt 2012-01-08 23:01:10 +0000
3+++ loggerhead/templates/revisionfilechanges.pt 2012-09-20 10:38:21 +0000
4@@ -3,7 +3,7 @@
5 <tal:block condition="repeat/added/start">
6 <li class="desc">files added:</li>
7 </tal:block>
8- <li class="files">
9+ <li class="files" tal:omit-tag="python:added.filename == ''">
10 <tal:revision condition="python:added.kind == 'file'"
11 content="structure python:file_link(added.filename)" />
12 <tal:revision condition="python:added.kind != 'file'"

Subscribers

People subscribed via source and target branches