0001-public-handle-snapshot-of-redirected-page-57786.patch
combo/public/views.py | ||
---|---|---|
521 | 521 | |
522 | 522 |
if page.redirect_url: |
523 | 523 |
context = {'request': request} |
524 |
context.update(request.extra_context_data or {})
|
|
524 |
context.update(getattr(request, 'extra_context_data', {}))
|
|
525 | 525 |
try: |
526 | 526 |
redirect_url = page.get_redirect_url(context=context) |
527 | 527 |
except utils.TemplateError: |
tests/test_manager.py | ||
---|---|---|
2361 | 2361 |
resp = resp.click('view') |
2362 | 2362 | |
2363 | 2363 | |
2364 |
def test_view_snapshot_redirect_url(app, admin_user): |
|
2365 |
page = Page.objects.create(title='One', slug='one', redirect_url='http://example.com') |
|
2366 |
PageSnapshot.take(page) |
|
2367 | ||
2368 |
app = login(app) |
|
2369 |
resp = app.get('/manage/pages/%s/' % page.pk) |
|
2370 |
resp = resp.click('History') |
|
2371 |
resp = resp.click('view') |
|
2372 |
assert resp.location == 'http://example.com' |
|
2373 | ||
2374 | ||
2364 | 2375 |
def test_django_admin(app, admin_user): |
2365 | 2376 |
resp = app.get('/admin/') |
2366 | 2377 |
resp = resp.follow() # -> /admin/login/ |
2367 |
- |