From 61b32f9aec5f007d7374ced073934d7ae933bb20 Mon Sep 17 00:00:00 2001 From: Pierre-antoine Comby Date: Mon, 6 Apr 2020 12:13:12 +0200 Subject: [PATCH] explicit context is better than implicit ctx --- apps/activity/views.py | 32 ++++++++++++++++---------------- apps/treasury/views.py | 34 +++++++++++++++++----------------- 2 files changed, 33 insertions(+), 33 deletions(-) diff --git a/apps/activity/views.py b/apps/activity/views.py index 51e2ebf5..1fe2d97a 100644 --- a/apps/activity/views.py +++ b/apps/activity/views.py @@ -40,15 +40,15 @@ class ActivityListView(ProtectQuerysetMixin, LoginRequiredMixin, SingleTableView return super().get_queryset().reverse() def get_context_data(self, **kwargs): - ctx = super().get_context_data(**kwargs) + context = super().get_context_data(**kwargs) - ctx['title'] = _("Activities") + context['title'] = _("Activities") upcoming_activities = Activity.objects.filter(date_end__gt=datetime.now()) - ctx['upcoming'] = ActivityTable(data=upcoming_activities + context['upcoming'] = ActivityTable(data=upcoming_activities .filter(PermissionBackend.filter_queryset(self.request.user, Activity, "view"))) - return ctx + return context class ActivityDetailView(ProtectQuerysetMixin, LoginRequiredMixin, DetailView): @@ -56,15 +56,15 @@ class ActivityDetailView(ProtectQuerysetMixin, LoginRequiredMixin, DetailView): context_object_name = "activity" def get_context_data(self, **kwargs): - ctx = super().get_context_data() + context = super().get_context_data() table = GuestTable(data=Guest.objects.filter(activity=self.object) .filter(PermissionBackend.filter_queryset(self.request.user, Guest, "view"))) - ctx["guests"] = table + context["guests"] = table - ctx["activity_started"] = datetime.now(timezone.utc) > self.object.date_start + context["activity_started"] = datetime.now(timezone.utc) > self.object.date_start - return ctx + return context class ActivityUpdateView(ProtectQuerysetMixin, LoginRequiredMixin, UpdateView): @@ -99,11 +99,11 @@ class ActivityEntryView(LoginRequiredMixin, TemplateView): template_name = "activity/activity_entry.html" def get_context_data(self, **kwargs): - ctx = super().get_context_data(**kwargs) + context = super().get_context_data(**kwargs) activity = Activity.objects.filter(PermissionBackend.filter_queryset(self.request.user, Activity, "view"))\ .get(pk=self.kwargs["pk"]) - ctx["activity"] = activity + context["activity"] = activity matched = [] @@ -146,12 +146,12 @@ class ActivityEntryView(LoginRequiredMixin, TemplateView): matched.append(note) table = EntryTable(data=matched) - ctx["table"] = table + context["table"] = table - ctx["entries"] = Entry.objects.filter(activity=activity) + context["entries"] = Entry.objects.filter(activity=activity) - ctx["title"] = _('Entry for activity "{}"').format(activity.name) - ctx["noteuser_ctype"] = ContentType.objects.get_for_model(NoteUser).pk - ctx["notespecial_ctype"] = ContentType.objects.get_for_model(NoteSpecial).pk + context["title"] = _('Entry for activity "{}"').format(activity.name) + context["noteuser_ctype"] = ContentType.objects.get_for_model(NoteUser).pk + context["notespecial_ctype"] = ContentType.objects.get_for_model(NoteSpecial).pk - return ctx + return context diff --git a/apps/treasury/views.py b/apps/treasury/views.py index f564ccb2..7361d1d2 100644 --- a/apps/treasury/views.py +++ b/apps/treasury/views.py @@ -201,14 +201,14 @@ class RemittanceCreateView(ProtectQuerysetMixin, LoginRequiredMixin, CreateView) return reverse_lazy('treasury:remittance_list') def get_context_data(self, **kwargs): - ctx = super().get_context_data(**kwargs) + context = super().get_context_data(**kwargs) - ctx["table"] = RemittanceTable(data=Remittance.objects + context["table"] = RemittanceTable(data=Remittance.objects .filter(PermissionBackend.filter_queryset(self.request.user, Remittance, "view")) .all()) - ctx["special_transactions"] = SpecialTransactionTable(data=SpecialTransaction.objects.none()) + context["special_transactions"] = SpecialTransactionTable(data=SpecialTransaction.objects.none()) - return ctx + return context class RemittanceListView(LoginRequiredMixin, TemplateView): @@ -218,27 +218,27 @@ class RemittanceListView(LoginRequiredMixin, TemplateView): template_name = "treasury/remittance_list.html" def get_context_data(self, **kwargs): - ctx = super().get_context_data(**kwargs) + context = super().get_context_data(**kwargs) - ctx["opened_remittances"] = RemittanceTable( + context["opened_remittances"] = RemittanceTable( data=Remittance.objects.filter(closed=False).filter( PermissionBackend.filter_queryset(self.request.user, Remittance, "view")).all()) - ctx["closed_remittances"] = RemittanceTable( + context["closed_remittances"] = RemittanceTable( data=Remittance.objects.filter(closed=True).filter( PermissionBackend.filter_queryset(self.request.user, Remittance, "view")).reverse().all()) - ctx["special_transactions_no_remittance"] = SpecialTransactionTable( + context["special_transactions_no_remittance"] = SpecialTransactionTable( data=SpecialTransaction.objects.filter(source__in=NoteSpecial.objects.filter(~Q(remittancetype=None)), specialtransactionproxy__remittance=None).filter( PermissionBackend.filter_queryset(self.request.user, Remittance, "view")).all(), exclude=('remittance_remove', )) - ctx["special_transactions_with_remittance"] = SpecialTransactionTable( + context["special_transactions_with_remittance"] = SpecialTransactionTable( data=SpecialTransaction.objects.filter(source__in=NoteSpecial.objects.filter(~Q(remittancetype=None)), specialtransactionproxy__remittance__closed=False).filter( PermissionBackend.filter_queryset(self.request.user, Remittance, "view")).all(), exclude=('remittance_add', )) - return ctx + return context class RemittanceUpdateView(ProtectQuerysetMixin, LoginRequiredMixin, UpdateView): @@ -252,17 +252,17 @@ class RemittanceUpdateView(ProtectQuerysetMixin, LoginRequiredMixin, UpdateView) return reverse_lazy('treasury:remittance_list') def get_context_data(self, **kwargs): - ctx = super().get_context_data(**kwargs) + context = super().get_context_data(**kwargs) - ctx["table"] = RemittanceTable(data=Remittance.objects.filter( + context["table"] = RemittanceTable(data=Remittance.objects.filter( PermissionBackend.filter_queryset(self.request.user, Remittance, "view")).all()) data = SpecialTransaction.objects.filter(specialtransactionproxy__remittance=self.object).filter( PermissionBackend.filter_queryset(self.request.user, Remittance, "view")).all() - ctx["special_transactions"] = SpecialTransactionTable( + context["special_transactions"] = SpecialTransactionTable( data=data, exclude=('remittance_add', 'remittance_remove', ) if self.object.closed else ('remittance_add', )) - return ctx + return context class LinkTransactionToRemittanceView(ProtectQuerysetMixin, LoginRequiredMixin, UpdateView): @@ -277,9 +277,9 @@ class LinkTransactionToRemittanceView(ProtectQuerysetMixin, LoginRequiredMixin, return reverse_lazy('treasury:remittance_list') def get_context_data(self, **kwargs): - ctx = super().get_context_data(**kwargs) + context = super().get_context_data(**kwargs) - form = ctx["form"] + form = context["form"] form.fields["last_name"].initial = self.object.transaction.last_name form.fields["first_name"].initial = self.object.transaction.first_name form.fields["bank"].initial = self.object.transaction.bank @@ -287,7 +287,7 @@ class LinkTransactionToRemittanceView(ProtectQuerysetMixin, LoginRequiredMixin, form.fields["remittance"].queryset = form.fields["remittance"] \ .queryset.filter(remittance_type__note=self.object.transaction.source) - return ctx + return context class UnlinkTransactionToRemittanceView(LoginRequiredMixin, View):