diff --git a/src/memopol/settings.py b/src/memopol/settings.py index 39fa75ff7a5f0015938988fb1d7d7976b356243c..107999ddef147b2545e0570a0852fb349477e61d 100644 --- a/src/memopol/settings.py +++ b/src/memopol/settings.py @@ -99,6 +99,10 @@ MIDDLEWARE_CLASSES = ( 'django.contrib.sites.middleware.CurrentSiteMiddleware', ) +if 'debug_toolbar' in INSTALLED_APPS: + MIDDLEWARE_CLASSES += ( + 'debug_toolbar.middleware.DebugToolbarMiddleware', + ) # # Sessions # diff --git a/src/memopol/tests/base.py b/src/memopol/tests/base.py index 715db449317f05caaeda2aafac8d4087dca83f1c..c1365c3b82f87eb3e3f7d0a54b31e875987915ba 100644 --- a/src/memopol/tests/base.py +++ b/src/memopol/tests/base.py @@ -8,6 +8,7 @@ class BaseTest(ResponseDiffTestMixin, test.TestCase): """ Common queries + - 1 for settings - 5 for search forms - 1 for chambers - 1 for countries @@ -18,7 +19,7 @@ class BaseTest(ResponseDiffTestMixin, test.TestCase): - 1 for representatives - 1 for themes """ - left_pane_queries = 7 + left_pane_queries = 8 def setUp(self): RepresentativeScore.refresh() diff --git a/src/memopol/tests/test_navigation_pane.py b/src/memopol/tests/test_navigation_pane.py deleted file mode 100644 index b36956d09e09a980f5f22f55da0041792b7551fd..0000000000000000000000000000000000000000 --- a/src/memopol/tests/test_navigation_pane.py +++ /dev/null @@ -1,30 +0,0 @@ -from .base import BaseTest - - -class NavigationPaneTest(BaseTest): - url = '/' - - def test_queries(self): - # First query to set session variables - self.client.get(self.url) - - with self.assertNumQueries(self.left_pane_queries): - self.client.get(self.url) - - def test_rep_search_chambers(self): - self.selector_test('#form-rep #chamber-rep option') - - def test_rep_search_countries(self): - self.selector_test('#form-rep #country option') - - def test_rep_search_parties(self): - self.selector_test('#form-rep #party option') - - def test_rep_search_committee(self): - self.selector_test('#form-rep #committee option') - - def test_rep_search_delegation(self): - self.selector_test('#form-rep #delegation option') - - def test_dossier_search_chambers(self): - self.selector_test('#form-dossier #chamber-dossier option') diff --git a/src/memopol/views/home.py b/src/memopol/views/home.py index 83ea72f5887bbfda7f391856cceb5ea67bb6a8c8..363289c3a6c7854d5d37f1d1faafdd7d2963a25d 100644 --- a/src/memopol/views/home.py +++ b/src/memopol/views/home.py @@ -29,6 +29,7 @@ class HomeView(PositionFormMixin, RepresentativeViewMixin, qs = qs.filter(Q(representative_score__score__lt=0) | Q(representative_score__score__gt=0)) qs = self.prefetch_for_representative_country_and_main_mandate(qs) + qs = qs.select_related('representative_score') random.seed(datetime.date.today().isoformat()) index = random.randint(0, qs.count() - 1) @@ -52,6 +53,9 @@ class HomeView(PositionFormMixin, RepresentativeViewMixin, num = int(Setting.objects.get(pk='HOMEPAGE_LATEST_VOTES').value) c['latest_votes'] = Proposal.objects \ .filter(recommendation__isnull=False) \ + .select_related('dossier', 'recommendation') \ + .prefetch_related('themes', 'dossier__themes', + 'dossier__documents__chamber') \ .order_by('-datetime')[0:num] return c