Launchpad itself

Merge ~cjwatson/launchpad:py3-PackageUploadLog-rendering into launchpad:master

  1. Git
  2. lp:~cjwatson/launchpad
  3. py3-PackageUploadLog-rendering
  4. Merge into master
Proposed by Colin Watson
Status: Merged
Approved by: Colin Watson
Approved revision: 544489e818966ec13d1565d5f942f0f84fb1424e
Merge reported by: Otto Co-Pilot
Merged at revision: not available
Proposed branch: ~cjwatson/launchpad:py3-PackageUploadLog-rendering
Merge into: launchpad:master
Diff against target: 13 lines (+1/-1)
1 file modified
lib/lp/soyuz/templates/distroseries-queue.pt (+1/-1)
Reviewer Review Type Date Requested Status
Cristian Gonzalez (community) Approve
Review via email: mp+398259@code.launchpad.net

Commit message

Fix PackageUploadLog rendering for Python 3

Description of the change

`DBItem.__str__` (invoked by `log/new_status` in TALES) isn't supposed to be permitted by the security proxy, although `unicode(item)` somehow seems to evade this on Python 2. Use `log/new_status/title` instead.

To post a comment you must log in.
Revision history for this message
Cristian Gonzalez (cristiangsp) wrote :

Looks good!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/lib/lp/soyuz/templates/distroseries-queue.pt b/lib/lp/soyuz/templates/distroseries-queue.pt
2index 3850174..748e52d 100644
3--- a/lib/lp/soyuz/templates/distroseries-queue.pt
4+++ b/lib/lp/soyuz/templates/distroseries-queue.pt
5@@ -156,7 +156,7 @@
6 style="border: 0"></td>
7
8 <td colspan="8" style="border: 0">
9- <span tal:content="log/new_status"></span>
10+ <span tal:content="log/new_status/title"></span>
11 <span tal:attributes="title log/date_created/fmt:datetime"
12 tal:content="log/date_created/fmt:displaydate" />
13 by <span tal:content="structure log/reviewer/fmt:link" />

Subscribers

People subscribed via source and target branches

to status/vote changes: