From 0c8bc0465939235737a71902e78ec8c9a222f040 Mon Sep 17 00:00:00 2001 From: Mamatha1718 Date: Tue, 3 Dec 2024 14:03:05 +0530 Subject: [PATCH 1/5] Clarify 000/year in help text --- fundraising/forms.py | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/fundraising/forms.py b/fundraising/forms.py index 3127866ee..dc1768952 100644 --- a/fundraising/forms.py +++ b/fundraising/forms.py @@ -46,25 +46,11 @@ class DjangoHeroForm(forms.ModelForm): logo = forms.FileField( required=False, help_text=_( - "If you've donated at least US $%d, you can submit your logo and " + "If you've donated at least US $%d in a calendar year, you can submit your logo and " "we will display it, too." ) % LEADERSHIP_LEVEL_AMOUNT, ) - is_visible = forms.BooleanField( - required=False, - label=_( - "Yes, display my name, URL, and logo on this site. " - "It'll be displayed shortly after we verify it." - ), - ) - is_subscribed = forms.BooleanField( - required=False, - label=_( - "Yes, the Django Software Foundation can inform me about " - "future fundraising campaigns by email." - ), - ) class Meta: model = DjangoHero From 5029aa3d07153d43fc613a62f902e2dc167e3e5e Mon Sep 17 00:00:00 2001 From: Mamatha1718 Date: Mon, 30 Dec 2024 18:21:00 +0530 Subject: [PATCH 2/5] Investigate and fix N+1 query issue #1806 --- dashboard/views.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dashboard/views.py b/dashboard/views.py index 0c6238793..aada1c1e3 100644 --- a/dashboard/views.py +++ b/dashboard/views.py @@ -19,12 +19,13 @@ def index(request): if data is None: metrics = [] for MC in Metric.__subclasses__(): - metrics.extend(MC.objects.filter(show_on_dashboard=True)) + metrics.extend(MC.objects.filter(show_on_dashboard=True).prefetch_related("data")) metrics = sorted(metrics, key=operator.attrgetter("display_position")) data = [] for metric in metrics: - data.append({"metric": metric, "latest": metric.data.latest()}) + latest_data = metric.data.latest() + data.append({"metric": metric, "latest": latest_data}) cache.set(key, data, 60 * 60, version=generation) return render(request, "dashboard/index.html", {"data": data}) From ba71219ed71820c2ff2c57c86842b51889cf8d6f Mon Sep 17 00:00:00 2001 From: Mamatha1718 Date: Tue, 31 Dec 2024 11:57:35 +0530 Subject: [PATCH 3/5] m --- dashboard/views.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dashboard/views.py b/dashboard/views.py index aada1c1e3..0c6238793 100644 --- a/dashboard/views.py +++ b/dashboard/views.py @@ -19,13 +19,12 @@ def index(request): if data is None: metrics = [] for MC in Metric.__subclasses__(): - metrics.extend(MC.objects.filter(show_on_dashboard=True).prefetch_related("data")) + metrics.extend(MC.objects.filter(show_on_dashboard=True)) metrics = sorted(metrics, key=operator.attrgetter("display_position")) data = [] for metric in metrics: - latest_data = metric.data.latest() - data.append({"metric": metric, "latest": latest_data}) + data.append({"metric": metric, "latest": metric.data.latest()}) cache.set(key, data, 60 * 60, version=generation) return render(request, "dashboard/index.html", {"data": data}) From 5b8516ee911feaad571082ef73b194f2ec166abf Mon Sep 17 00:00:00 2001 From: Mamatha1718 Date: Tue, 31 Dec 2024 12:01:12 +0530 Subject: [PATCH 4/5] Investigate and fix N+1 query issue django#1806 --- dashboard/views.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dashboard/views.py b/dashboard/views.py index 0c6238793..aada1c1e3 100644 --- a/dashboard/views.py +++ b/dashboard/views.py @@ -19,12 +19,13 @@ def index(request): if data is None: metrics = [] for MC in Metric.__subclasses__(): - metrics.extend(MC.objects.filter(show_on_dashboard=True)) + metrics.extend(MC.objects.filter(show_on_dashboard=True).prefetch_related("data")) metrics = sorted(metrics, key=operator.attrgetter("display_position")) data = [] for metric in metrics: - data.append({"metric": metric, "latest": metric.data.latest()}) + latest_data = metric.data.latest() + data.append({"metric": metric, "latest": latest_data}) cache.set(key, data, 60 * 60, version=generation) return render(request, "dashboard/index.html", {"data": data}) From aa4b5fcc4c977d62f36d437704464b077bc12179 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Tue, 31 Dec 2024 06:32:29 +0000 Subject: [PATCH 5/5] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- dashboard/views.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dashboard/views.py b/dashboard/views.py index aada1c1e3..06dc69600 100644 --- a/dashboard/views.py +++ b/dashboard/views.py @@ -19,7 +19,9 @@ def index(request): if data is None: metrics = [] for MC in Metric.__subclasses__(): - metrics.extend(MC.objects.filter(show_on_dashboard=True).prefetch_related("data")) + metrics.extend( + MC.objects.filter(show_on_dashboard=True).prefetch_related("data") + ) metrics = sorted(metrics, key=operator.attrgetter("display_position")) data = []