Merge lp:~cjwatson/launchpad/git-ref-listing-names into lp:launchpad

Proposed by Colin Watson
Status: Merged
Merged at revision: 17467
Proposed branch: lp:~cjwatson/launchpad/git-ref-listing-names
Merge into: lp:launchpad
Diff against target: 25 lines (+2/-2)
2 files modified
lib/lp/code/templates/gitref-index.pt (+1/-1)
lib/lp/code/templates/gitref-listing.pt (+1/-1)
To merge this branch: bzr merge lp:~cjwatson/launchpad/git-ref-listing-names
Reviewer Review Type Date Requested Status
William Grant code Approve
Review via email: mp+257776@code.launchpad.net

Commit message

Use name rather than display_name on IGitRef:+index and IGitRefBatchNavigator:+ref-listing.

Description of the change

A couple of pages look weird now that GitRef.display_name includes the repository name. That makes sense in places such as merge proposals where we want to render a ref on its own without an obvious repository context, but it looks a little odd on GitRef:+index where the repository is linked alongside it, and downright peculiar in branch listings. GitRef.name will do for these cases.

To post a comment you must log in.
Revision history for this message
William Grant (wgrant) :
review: Approve (code)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'lib/lp/code/templates/gitref-index.pt'
2--- lib/lp/code/templates/gitref-index.pt 2015-04-28 16:39:15 +0000
3+++ lib/lp/code/templates/gitref-index.pt 2015-04-29 15:14:22 +0000
4@@ -29,7 +29,7 @@
5 <div class="two-column-list">
6 <dl id="name">
7 <dt>Name:</dt>
8- <dd tal:content="context/display_name" />
9+ <dd tal:content="context/name" />
10 </dl>
11
12 <dl id="repository">
13
14=== modified file 'lib/lp/code/templates/gitref-listing.pt'
15--- lib/lp/code/templates/gitref-listing.pt 2015-03-24 14:56:57 +0000
16+++ lib/lp/code/templates/gitref-listing.pt 2015-04-29 15:14:22 +0000
17@@ -36,7 +36,7 @@
18 <tr tal:repeat="ref context/currentBatch">
19 <td>
20 <a tal:attributes="href ref/fmt:url"
21- tal:content="structure ref/display_name/fmt:break-long-words" />
22+ tal:content="structure ref/name/fmt:break-long-words" />
23 </td>
24 <tal:no_commit condition="not: ref/committer_date">
25 <td colspan="2">