Merge lp://staging/~michael.nelson/ubuntu-webcatalog/fix-admin-template into lp://staging/ubuntu-webcatalog
Proposed by
Michael Nelson
| Status: | Merged |
|---|---|
| Approved by: | Łukasz Czyżykowski |
| Approved revision: | 184 |
| Merged at revision: | 183 |
| Proposed branch: | lp://staging/~michael.nelson/ubuntu-webcatalog/fix-admin-template |
| Merge into: | lp://staging/ubuntu-webcatalog |
| Diff against target: |
53 lines (+16/-2) 3 files modified
django_project/config/main.cfg (+4/-0) src/webcatalog/templates/admin/login.html (+2/-2) src/webcatalog/tests/test_views.py (+10/-0) |
| To merge this branch: | bzr merge lp://staging/~michael.nelson/ubuntu-webcatalog/fix-admin-template |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Łukasz Czyżykowski (community) | Approve | ||
|
Review via email:
|
|||
Commit message
Update custom admin/login.html so that we're not using a templatetag library no longer available in django 1.5.
Description of the change
The /admin/ url was 500ing on staging after deploy. Turns out it's because we've got an admin/login.html template that uses an admin templatetag library that is no longer available in django 1.5. It wasn't obvious in our dev environment, because this admin template wasn't found (staging/prod has the template_dirs setting, which we didn't have locally, which enables the admin template to be found in the non-admin template dir).
fab test:pg=true
To post a comment you must log in.
Revision history for this message
| Łukasz Czyżykowski (lukasz-czyzykowski) | # |
review:
Approve
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
