v0.7.6

Refactor mixin usage for base views in `django_ledger`.

Replaces multiple redundant mixins with unified base view classes (`EntityUnitModelModelBaseView` and `VendorModelModelBaseView`) to streamline inheritance and improve code maintainability. Updated version to `0.7.6` to reflect these changes.

Author: elarroba

django_ledger/__init__.py

@@ -6,7 +6,7 @@
 default_app_config = 'django_ledger.apps.DjangoLedgerConfig'
 
 """Django Ledger"""
-__version__ = '0.7.5.2'
+__version__ = '0.7.6'
 __license__ = 'GPLv3 License'
 
 __author__ = 'Miguel Sanda'

django_ledger/views/unit.py

@@ -22,7 +22,7 @@
                                         PDFReportMixIn)
 
 
-class EntityUnitModelModelViewQuerySetMixIn:
+class EntityUnitModelModelBaseView(DjangoLedgerSecurityMixIn):
     queryset = None
 
     def get_queryset(self):
@@ -34,7 +34,7 @@ def get_queryset(self):
         return super().get_queryset()
 
 
-class EntityUnitModelListView(DjangoLedgerSecurityMixIn, EntityUnitModelModelViewQuerySetMixIn, ListView):
+class EntityUnitModelListView(EntityUnitModelModelBaseView, ListView):
     template_name = 'django_ledger/unit/unit_list.html'
     PAGE_TITLE = _('Entity Unit List')
     extra_context = {
@@ -45,7 +45,7 @@ class EntityUnitModelListView(DjangoLedgerSecurityMixIn, EntityUnitModelModelVie
     context_object_name = 'unit_list'
 
 
-class EntityUnitModelDetailView(DjangoLedgerSecurityMixIn, EntityUnitModelModelViewQuerySetMixIn, DetailView):
+class EntityUnitModelDetailView(EntityUnitModelModelBaseView, DetailView):
     template_name = 'django_ledger/unit/unit_detail.html'
     PAGE_TITLE = _('Entity Unit Detail')
     slug_url_kwarg = 'unit_slug'
@@ -57,7 +57,7 @@ class EntityUnitModelDetailView(DjangoLedgerSecurityMixIn, EntityUnitModelModelV
     context_object_name = 'unit'
 
 
-class EntityUnitModelCreateView(DjangoLedgerSecurityMixIn, EntityUnitModelModelViewQuerySetMixIn, CreateView):
+class EntityUnitModelCreateView(EntityUnitModelModelBaseView, CreateView):
     template_name = 'django_ledger/unit/unit_create.html'
     PAGE_TITLE = _('Entity Unit Create')
     extra_context = {
@@ -88,7 +88,7 @@ def form_valid(self, form):
         return HttpResponseRedirect(self.get_success_url())
 
 
-class EntityUnitUpdateView(DjangoLedgerSecurityMixIn, EntityUnitModelModelViewQuerySetMixIn, UpdateView):
+class EntityUnitUpdateView(EntityUnitModelModelBaseView, UpdateView):
     template_name = 'django_ledger/unit/unit_update.html'
     PAGE_TITLE = _('Entity Unit Update')
     slug_url_kwarg = 'unit_slug'
@@ -123,7 +123,7 @@ def form_valid(self, form):
 
 
 # BALANCE SHEET.....
-class BaseEntityUnitModelBalanceSheetView(DjangoLedgerSecurityMixIn, RedirectView):
+class BaseEntityUnitModelBalanceSheetView(EntityUnitModelModelBaseView, RedirectView):
 
     def get_redirect_url(self, *args, **kwargs):
         year = get_localdate().year
@@ -135,8 +135,7 @@ def get_redirect_url(self, *args, **kwargs):
                        })
 
 
-class FiscalYearEntityUnitModelBalanceSheetView(DjangoLedgerSecurityMixIn,
-                                                EntityUnitModelModelViewQuerySetMixIn,
+class FiscalYearEntityUnitModelBalanceSheetView(EntityUnitModelModelBaseView,
                                                 BaseDateNavigationUrlMixIn,
                                                 EntityUnitMixIn,
                                                 YearlyReportMixIn,
@@ -176,7 +175,7 @@ class DateEntityUnitModelBalanceSheetView(MonthlyEntityUnitModelBalanceSheetView
 
 
 # INCOME STATEMENT....
-class BaseEntityUnitModelIncomeStatementView(DjangoLedgerSecurityMixIn, RedirectView):
+class BaseEntityUnitModelIncomeStatementView(EntityUnitModelModelBaseView, RedirectView):
 
     def get_redirect_url(self, *args, **kwargs):
         year = get_localdate().year
@@ -188,8 +187,7 @@ def get_redirect_url(self, *args, **kwargs):
                        })
 
 
-class FiscalYearEntityUnitModelIncomeStatementView(DjangoLedgerSecurityMixIn,
-                                                   EntityUnitModelModelViewQuerySetMixIn,
+class FiscalYearEntityUnitModelIncomeStatementView(EntityUnitModelModelBaseView,
                                                    BaseDateNavigationUrlMixIn,
                                                    EntityUnitMixIn,
                                                    YearlyReportMixIn,
@@ -225,7 +223,7 @@ class DateIncomeStatementView(FiscalYearIncomeStatementView, DateReportMixIn):
 
 
 # CASHFLOW STATEMENT
-class BaseEntityUnitModelCashFlowStatementView(DjangoLedgerSecurityMixIn, RedirectView):
+class BaseEntityUnitModelCashFlowStatementView(EntityUnitModelModelBaseView, RedirectView):
 
     def get_redirect_url(self, *args, **kwargs):
         year = get_localdate().year
@@ -237,8 +235,7 @@ def get_redirect_url(self, *args, **kwargs):
                        })
 
 
-class FiscalYearEntityUnitModelCashFlowStatementView(DjangoLedgerSecurityMixIn,
-                                                     EntityUnitModelModelViewQuerySetMixIn,
+class FiscalYearEntityUnitModelCashFlowStatementView(EntityUnitModelModelBaseView,
                                                      BaseDateNavigationUrlMixIn,
                                                      EntityUnitMixIn,
                                                      YearlyReportMixIn,

django_ledger/views/vendor.py

@@ -16,7 +16,7 @@
 from django_ledger.views.mixins import DjangoLedgerSecurityMixIn
 
 
-class VendorModelModelViewQuerySetMixIn:
+class VendorModelModelBaseView(DjangoLedgerSecurityMixIn):
     queryset = None
 
     def get_queryset(self):
@@ -28,7 +28,7 @@ def get_queryset(self):
         return super().get_queryset()
 
 
-class VendorModelListView(DjangoLedgerSecurityMixIn, VendorModelModelViewQuerySetMixIn, ListView):
+class VendorModelListView(VendorModelModelBaseView, ListView):
     template_name = 'django_ledger/vendor/vendor_list.html'
     context_object_name = 'vendors'
     PAGE_TITLE = _('Vendor List')
@@ -38,8 +38,14 @@ class VendorModelListView(DjangoLedgerSecurityMixIn, VendorModelModelViewQuerySe
         'header_subtitle_icon': 'bi:person-lines-fill'
     }
 
+    def get_context_data(self, **kwargs):
+        context = super().get_context_data(**kwargs)
+        entity_model: EntityModel = self.get_authorized_entity_instance()
+        context['header_subtitle'] = entity_model.name
+        return context
+
 
-class VendorModelCreateView(DjangoLedgerSecurityMixIn, VendorModelModelViewQuerySetMixIn, CreateView):
+class VendorModelCreateView(VendorModelModelBaseView, CreateView):
     template_name = 'django_ledger/vendor/vendor_create.html'
     PAGE_TITLE = _('Create New Vendor')
     form_class = VendorModelForm
@@ -66,7 +72,7 @@ def form_valid(self, form):
         return super().form_valid(form)
 
 
-class VendorModelUpdateView(DjangoLedgerSecurityMixIn, VendorModelModelViewQuerySetMixIn, UpdateView):
+class VendorModelUpdateView(VendorModelModelBaseView, UpdateView):
     template_name = 'django_ledger/vendor/vendor_update.html'
     PAGE_TITLE = _('Vendor Update')
     context_object_name = 'vendor'
@@ -89,7 +95,3 @@ def get_success_url(self):
                        kwargs={
                            'entity_slug': self.kwargs['entity_slug']
                        })
-
-    def form_valid(self, form):
-        form.save()
-        return super().form_valid(form)

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "django-ledger"
-version = "0.7.5.2"
+version = "0.7.6"
 readme = "README.md"
 requires-python = ">=3.10"
 description = "Double entry accounting system built on the Django Web Framework."