Merge lp://staging/~a1s/loggerhead/non-branch-directories into lp://staging/loggerhead
Proposed by
Aleksandr Smyshliaev
| Status: | Merged | ||||
|---|---|---|---|---|---|
| Approved by: | Colin Watson | ||||
| Approved revision: | 543 | ||||
| Merge reported by: | Otto Co-Pilot | ||||
| Merged at revision: | not available | ||||
| Proposed branch: | lp://staging/~a1s/loggerhead/non-branch-directories | ||||
| Merge into: | lp://staging/loggerhead | ||||
| Diff against target: |
46 lines (+11/-4) 2 files modified
loggerhead/controllers/directory_ui.py (+10/-3) loggerhead/templates/directory.pt (+1/-1) |
||||
| To merge this branch: | bzr merge lp://staging/~a1s/loggerhead/non-branch-directories | ||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Colin Watson (community) | Approve | ||
|
Review via email:
|
|||
Commit message
Fix displaying non-branch directories
Description of the change
I've changed the directory template to handle the timestamp for non-branch directories in the same way as it is done for the branch directories, and initialized all DirEntry attributes for non-branches. The last change time is taken from the DirectoryUI transport.
To post a comment you must log in.
Revision history for this message
| Aleksandr Smyshliaev (a1s) wrote | # |
Revision history for this message
| Colin Watson (cjwatson) | # |
Revision history for this message
| Aleksandr Smyshliaev (a1s) | # |
Revision history for this message
| Colin Watson (cjwatson) | # |
review:
Approve
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Thanks for this!
I confess I didn't completely follow the bug report, though I think I see what you mean by looking at the template. Do you have an example of a page that crashes at the moment, or some other way to reproduce the crash? (This would be helpful because we could use it to QA your fix.)
This needs a small fix, but otherwise looks good to me.