Merge branch 'tabbed_page' into fix_upload_button

django/website/tabbed_page/templatetags/render_tab.py

@@ -36,7 +36,7 @@ def _get_rendering_details(context, tab_instance):
     if tab_instance.settings:
         settings = tab_instance.settings
     else:
-        settings = {}  # TODO: json field doesn't default to this?
+        settings = {}
 
     request = context.get('request')
 

django/website/tabbed_page/tests/render_tests.py

@@ -26,7 +26,6 @@ def setup_function(function):
     clear_tabs()
 
 
-
 @pytest.mark.django_db
 @patch(render_to_string_method)
 def test_uses_template_name(mock_render):

django/website/tabbed_page/views.py

@@ -32,9 +32,9 @@ class TabbedPageView(TemplateView):
             candidates = []
             tab_name = self.kwargs.get('tab_name')
             if tab_name:
-                candidates = self.page.tabs.all().filter(name=tab_name)
+                candidates = self.page.tabs.filter(name=tab_name)
             if len(candidates) == 0:
-                candidates = self.page.tabs.all().filter(default=True)
+                candidates = self.page.tabs.filter(default=True)
             if len(candidates) == 0:
                 candidates = self.page.tabs.all()
             if len(candidates) > 0: