From 99292f4028cce25db387efc4802a785d4a0762dc Mon Sep 17 00:00:00 2001
From: Martin Burchell <martinb@aptivate.org>
Date: Thu, 6 Aug 2015 11:40:32 +0100
Subject: [PATCH] Fixed bug where wrong property was being read
use view_name instead of name when getting tab out of the registry
---
django/website/tabbed_page/templatetags/render_tab.py | 2 +-
django/website/tabbed_page/tests/render_tests.py | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/django/website/tabbed_page/templatetags/render_tab.py b/django/website/tabbed_page/templatetags/render_tab.py
index 180d8650..6aff1fe8 100644
--- a/django/website/tabbed_page/templatetags/render_tab.py
+++ b/django/website/tabbed_page/templatetags/render_tab.py
@@ -9,7 +9,7 @@ register = template.Library()
@register.simple_tag(takes_context=True)
def render_tab(context, tab_instance):
- tab = get_tab(tab_instance.name)
+ tab = get_tab(tab_instance.view_name)
template_name = tab.template_name
diff --git a/django/website/tabbed_page/tests/render_tests.py b/django/website/tabbed_page/tests/render_tests.py
index dc22ff9f..98d67ded 100644
--- a/django/website/tabbed_page/tests/render_tests.py
+++ b/django/website/tabbed_page/tests/render_tests.py
@@ -25,7 +25,7 @@ def test_uses_template_name(mock_render):
register_tab('test-tab', tab)
page = TabbedPageFactory()
- tab_instance = TabInstanceFactory(page=page, name='test-tab')
+ tab_instance = TabInstanceFactory(page=page, view_name='test-tab')
render_tab(None, tab_instance)
@@ -43,7 +43,7 @@ def test_uses_context(mock_render):
page = TabbedPageFactory()
- tab_instance = TabInstanceFactory(page=page, name='test-tab')
+ tab_instance = TabInstanceFactory(page=page, view_name='test-tab')
render_tab(None, tab_instance)
@@ -58,7 +58,7 @@ def test_uses_request(mock_render):
register_tab('test-tab', tab)
page = TabbedPageFactory()
- tab_instance = TabInstanceFactory(page=page, name='test-tab')
+ tab_instance = TabInstanceFactory(page=page, view_name='test-tab')
request = 'a request'
context = {'request': request}
@@ -79,7 +79,7 @@ def test_settings_passed_to_widget_get_context_data(render_to_string_method):
columns = ['body', 'timestamp', 'network_provider']
settings = {'columns': columns}
tab_instance = TabInstanceFactory(page=page,
- name='test-tab',
+ view_name='test-tab',
settings=settings)
render_tab(None, tab_instance)
--
GitLab