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

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

@@ -7,6 +7,16 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.37.2] - 2026-03-26
+
+### Fixed
+- **Pending approvals now appear in Approval History** — `completed_approvals` and `completed_approvals_ajax` previously only matched `ApprovalTask` rows with status `approved` or `rejected`, so a submission still awaiting action (task status `pending`) was visible on the Pending tab but invisible on the History tab when filtered to "pending approval". The task-status filter now includes `"pending"`, making the two tabs consistent for approvers.
+
+## [0.37.1] - 2026-03-26
+
+### Fixed
+- **`reviewer_groups` now visible in Approval History** — `completed_approvals` and `completed_approvals_ajax` previously built their base queryset exclusively from `ApprovalTask` records, so reviewer-group members were never shown any submissions (a form with zero approval steps produces no `ApprovalTask` rows). Both views now union the task-based results with all non-draft submissions for forms the user can review, matching the behaviour of My Submissions.
+
 ## [0.37.0] - 2026-03-26
 
 ### Added

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: django-forms-workflows
-Version: 0.37.0
+Version: 0.37.2
 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.0 → django_forms_workflows-0.37.2}/django_forms_workflows/views.py

@@ -1483,27 +1483,37 @@ def completed_approvals(request):
     Accepts an optional ``?category=<slug>`` query parameter and an optional
     ``?form=<slug>`` query parameter for narrowing the list.
     """
+    _history_statuses = ["approved", "pending_approval", "rejected", "withdrawn"]
     if request.user.is_superuser:
-        base_submissions = FormSubmission.objects.filter(
-            status__in=["approved", "pending_approval", "rejected", "withdrawn"]
-        )
+        base_submissions = FormSubmission.objects.filter(status__in=_history_statuses)
     else:
         user_groups = request.user.groups.all()
-        # Filter on the ApprovalTask status rather than the FormSubmission status
-        # so that a user who approved/rejected their step on a multi-stage workflow
-        # can see that submission here even while later steps are still pending.
-        # Both conditions (assigned + action taken) must apply to the SAME task
-        # row, so we use a single filter() call with compound Q expressions.
+        # Include any submission the user has an ApprovalTask for — pending,
+        # approved, or rejected — so that submissions they can see on the
+        # Pending tab also appear here when filtered to "pending_approval".
         completed_task_sub_ids = (
             ApprovalTask.objects.filter(
                 models.Q(assigned_to=request.user)
                 | models.Q(assigned_group__in=user_groups),
-                status__in=["approved", "rejected"],
+                status__in=["pending", "approved", "rejected"],
             )
             .values_list("submission_id", flat=True)
             .distinct()
         )
-        base_submissions = FormSubmission.objects.filter(id__in=completed_task_sub_ids)
+        # Reviewer-group members see all non-draft submissions for forms they
+        # review, including those with zero approval steps (no ApprovalTasks).
+        reviewer_form_ids = (
+            FormDefinition.objects.filter(reviewer_groups__in=user_groups)
+            .values_list("id", flat=True)
+            .distinct()
+        )
+        base_submissions = FormSubmission.objects.filter(
+            models.Q(id__in=completed_task_sub_ids)
+            | models.Q(
+                form_definition__in=reviewer_form_ids,
+                status__in=_history_statuses,
+            )
+        ).distinct()
 
     # --- Category counts (for the filter bar) ---
     raw_counts = (
@@ -2908,22 +2918,32 @@ def completed_approvals_ajax(request):
     status_filter = params.get("status", "").strip()
 
     # --- Base queryset (mirrors permission logic of completed_approvals view) ---
+    _history_statuses = ["approved", "pending_approval", "rejected", "withdrawn"]
     if request.user.is_superuser:
-        qs = FormSubmission.objects.filter(
-            status__in=["approved", "pending_approval", "rejected", "withdrawn"]
-        )
+        qs = FormSubmission.objects.filter(status__in=_history_statuses)
     else:
         user_groups = request.user.groups.all()
         sub_ids = (
             ApprovalTask.objects.filter(
                 models.Q(assigned_to=request.user)
                 | models.Q(assigned_group__in=user_groups),
-                status__in=["approved", "rejected"],
+                status__in=["pending", "approved", "rejected"],
             )
             .values_list("submission_id", flat=True)
             .distinct()
         )
-        qs = FormSubmission.objects.filter(id__in=sub_ids)
+        reviewer_form_ids = (
+            FormDefinition.objects.filter(reviewer_groups__in=user_groups)
+            .values_list("id", flat=True)
+            .distinct()
+        )
+        qs = FormSubmission.objects.filter(
+            models.Q(id__in=sub_ids)
+            | models.Q(
+                form_definition__in=reviewer_form_ids,
+                status__in=_history_statuses,
+            )
+        ).distinct()
 
     records_total = qs.count()
 

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

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