Merge lp://staging/~cruzjbishop/loggerhead/fix-392668 into lp://staging/loggerhead

Proposed by Cruz Bishop
Status: Merged
Approved by: j.c.sackett
Approved revision: 479
Merged at revision: 476
Proposed branch: lp://staging/~cruzjbishop/loggerhead/fix-392668
Merge into: lp://staging/loggerhead
Diff against target: 56 lines (+19/-1)
3 files modified
loggerhead/__init__.py (+10/-0)
loggerhead/templatefunctions.py (+4/-0)
loggerhead/templates/macros.pt (+5/-1)
To merge this branch: bzr merge lp://staging/~cruzjbishop/loggerhead/fix-392668
Reviewer Review Type Date Requested Status
j.c.sackett (community) Approve
Review via email: mp+104467@code.staging.launchpad.net

Commit message

Adds revision number to footer release info, if available.

Description of the change

Fixes bug #392668, displaying the current Loggerhead revision number as well as the release

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

If the loggerhead instance is not in a branch (not pulled from launchpad, but copied from the folder without the .bzr folders), it only displays the version

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

To post a comment you must log in.
477. By Cruz Bishop

No tabs

478. By Cruz Bishop

Please tell me there's no more tabs!

Revision history for this message
j.c.sackett (jcsackett) wrote :

This looks pretty good, but I think I would rather have the revision not be shown if it's unknown. You could just set __revision__ == None and then put a tal condition around the display.

My reasoning being that if there isn't a branch, it's probably being deployed via package of some sort, and "Revision Unknown" isn't really useful information in that instance (or any instance in which it's unknown, really).

review: Needs Fixing
Revision history for this message
Cruz Bishop (cruzjbishop) wrote :

Alright, I'll do that. Thanks :)

479. By Cruz Bishop

Don't show revision when it can't be found

Revision history for this message
Cruz Bishop (cruzjbishop) wrote :

I've applied your suggestion, thank you again.

Revision history for this message
j.c.sackett (jcsackett) wrote :

Thanks!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches