Merge pull request #7 from James-Stokes/bugfix/support-totalling-func…

…tions Fix TypeError when calculating totals from functions in models
20tab · Apr 16, 2021 · 6a41cf7 · 6a41cf7
2 parents 273f4c2 + 61f2a0c
commit 6a41cf7
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/totalsum/admin.py b/totalsum/admin.py
@@ -34,7 +34,14 @@ def changelist_view(self, request, extra_context=None):
                 if hasattr(self.model, elem):
                     total = 0
                     for f in filtered_query_set:
-                        total += getattr(f, elem, 0)
+                        try:
+                            total += getattr(f, elem, 0)
+                        except TypeError:
+                            # This allows calculating totals of columns
+                            # that are generated from functions in the model
+                            # by simply calling the function reference that 
+                            # getattr returns 
+                            total += getattr(f, elem, 0)()
                     extra_context["totals"][
                         label_for_field(elem, self.model, self)
                     ] = round(total, self.totalsum_decimal_places)