django-forms-workflows 0.37.2__tar.gz → 0.37.3__tar.gz

{django_forms_workflows-0.37.2 → django_forms_workflows-0.37.3}/CHANGELOG.md

@@ -7,6 +7,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.37.3] - 2026-03-26
+
+### Fixed
+- **Approval History cross-tab badge now matches actual page count** — The "Approval History" badge displayed on the Pending tab was computed with stale logic (only approved/rejected/withdrawn statuses, only ApprovalTask-assigned submissions). After the v0.37.0–v0.37.2 changes the Approval History page itself counts more submissions (pending_approval included, reviewer_groups included), causing the badge to read 2 while the page showed 4. The `completed_count` query in `approval_inbox` now mirrors `base_submissions` in `completed_approvals` exactly, so both sides of the tab bar always agree.
+
 ## [0.37.2] - 2026-03-26
 
 ### Fixed

{django_forms_workflows-0.37.2 → django_forms_workflows-0.37.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: django-forms-workflows
-Version: 0.37.2
+Version: 0.37.3
 Summary: Enterprise-grade, database-driven form builder with approval workflows and external data integration
 License: LGPL-3.0-only
 License-File: LICENSE

{django_forms_workflows-0.37.2 → django_forms_workflows-0.37.3}/django_forms_workflows/views.py

@@ -854,19 +854,34 @@ def approval_inbox(request):
 
     total_tasks_count = base_tasks.count()
 
-    # --- Completed count for cross-tab badge ---
+    # --- Completed count for cross-tab badge (must mirror completed_approvals) ---
+    _history_statuses = ["approved", "pending_approval", "rejected", "withdrawn"]
     if request.user.is_superuser:
         completed_count = FormSubmission.objects.filter(
-            status__in=["approved", "rejected", "withdrawn"]
+            status__in=_history_statuses
         ).count()
     else:
+        _completed_task_sub_ids = (
+            ApprovalTask.objects.filter(
+                models.Q(assigned_to=request.user)
+                | models.Q(assigned_group__in=user_groups),
+                status__in=["pending", "approved", "rejected"],
+            )
+            .values_list("submission_id", flat=True)
+            .distinct()
+        )
+        _reviewer_form_ids = (
+            FormDefinition.objects.filter(reviewer_groups__in=user_groups)
+            .values_list("id", flat=True)
+            .distinct()
+        )
         completed_count = (
             FormSubmission.objects.filter(
-                status__in=["approved", "rejected", "withdrawn"]
-            )
-            .filter(
-                models.Q(approval_tasks__assigned_to=request.user)
-                | models.Q(approval_tasks__assigned_group__in=user_groups)
+                models.Q(id__in=_completed_task_sub_ids)
+                | models.Q(
+                    form_definition__in=_reviewer_form_ids,
+                    status__in=_history_statuses,
+                )
             )
             .distinct()
             .count()

{django_forms_workflows-0.37.2 → django_forms_workflows-0.37.3}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "django-forms-workflows"
-version = "0.37.2"
+version = "0.37.3"
 description = "Enterprise-grade, database-driven form builder with approval workflows and external data integration"
 license = "LGPL-3.0-only"
 readme = "README.md"