From 16ea2588745eec6a8c4af0f72183360ce2236cb0 Mon Sep 17 00:00:00 2001 From: AtmegaBuzz Date: Sat, 27 Aug 2022 20:31:21 +0530 Subject: [PATCH] fixed global leaderboard --- website/views.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/website/views.py b/website/views.py index 589f019209..e5f90adf8c 100644 --- a/website/views.py +++ b/website/views.py @@ -1139,12 +1139,13 @@ def get_leaderboard(self,month=None,year=None,api=False): all user scores for specified month and year ''' + data = User.objects if year and not month: - data = User.objects.filter(points__created__year=year) + data = data.filter(points__created__year=year) if year and month: - data = User.objects.filter( + data = data.filter( Q(points__created__year=year) & Q(points__created__month=month) ) @@ -1201,7 +1202,7 @@ def get_context_data(self, *args, **kwargs): if self.request.user.is_authenticated: context["wallet"] = Wallet.objects.get(user=self.request.user) - context["leaderboard"] = self.get_leaderboard(year=int(datetime.now().year)) + context["leaderboard"] = self.get_leaderboard() return context