django-forms-workflows 0.64.2__tar.gz → 0.65.1__tar.gz

{django_forms_workflows-0.64.2 → django_forms_workflows-0.65.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: django-forms-workflows
-Version: 0.64.2
+Version: 0.65.1
 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.64.2 → django_forms_workflows-0.65.1}/django_forms_workflows/admin.py

@@ -477,8 +477,9 @@ class StageApprovalGroupInline(nested_admin.NestedTabularInline):
 
     model = StageApprovalGroup
     extra = 1
-    ordering = ("position",)
+    ordering = ("role", "position")
     autocomplete_fields = ("group",)
+    fields = ("group", "role", "position")
 
 
 class WorkflowStageInline(nested_admin.NestedStackedInline):
@@ -963,11 +964,12 @@ class FormDefinitionAdmin(nested_admin.NestedModelAdmin):
                             )
                             for sag in StageApprovalGroup.objects.filter(
                                 stage=stage
-                            ).order_by("position"):
+                            ).order_by("role", "position"):
                                 StageApprovalGroup.objects.create(
                                     stage=cloned_stage,
                                     group=sag.group,
                                     position=sag.position,
+                                    role=sag.role,
                                 )
                         # Clone SubWorkflowDefinition if present
                         try:

{django_forms_workflows-0.64.2 → django_forms_workflows-0.65.1}/django_forms_workflows/form_builder_views.py

@@ -187,12 +187,13 @@ def form_builder_clone(request, form_id):
                         trigger_conditions=stage.trigger_conditions,
                     )
                     for sag in StageApprovalGroup.objects.filter(stage=stage).order_by(
-                        "position"
+                        "role", "position"
                     ):
                         StageApprovalGroup.objects.create(
                             stage=cloned_stage,
                             group=sag.group,
                             position=sag.position,
+                            role=sag.role,
                         )
                 # Clone SubWorkflowDefinition if present
                 try:

{django_forms_workflows-0.64.2 → django_forms_workflows-0.65.1}/django_forms_workflows/management/commands/seed_farm_demo.py

@@ -1784,6 +1784,7 @@ class Command(BaseCommand):
                 StageApprovalGroup.objects.update_or_create(
                     stage=stage,
                     group=group,
+                    role="approval",
                     defaults={"position": position},
                 )
 

django_forms_workflows-0.65.1/django_forms_workflows/migrations/0090_alter_stageapprovalgroup_options_and_more.py

@@ -0,0 +1,44 @@
+# Generated by Django 5.2.7 on 2026-04-13 17:37
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("auth", "0012_alter_user_first_name_max_length"),
+        ("django_forms_workflows", "0089_workflowstage_hide_comment_field"),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name="stageapprovalgroup",
+            options={
+                "ordering": ["role", "position"],
+                "verbose_name": "Stage Approval Group",
+                "verbose_name_plural": "Stage Approval Groups",
+            },
+        ),
+        migrations.AlterUniqueTogether(
+            name="stageapprovalgroup",
+            unique_together=set(),
+        ),
+        migrations.AddField(
+            model_name="stageapprovalgroup",
+            name="role",
+            field=models.CharField(
+                choices=[
+                    ("approval", "Approval (default)"),
+                    ("validation", "Assignee validation"),
+                    ("reassignment", "Reassignment pool"),
+                ],
+                default="approval",
+                help_text="Purpose of this group in the stage. 'Approval' groups receive fallback tasks and define the default pool. 'Validation' groups are checked when verifying a dynamic assignee's group membership (falls back to approval groups when none defined). 'Reassignment' groups define who may be reassigned to (falls back to approval groups when none defined).",
+                max_length=20,
+            ),
+        ),
+        migrations.AlterUniqueTogether(
+            name="stageapprovalgroup",
+            unique_together={("stage", "group", "role")},
+        ),
+    ]

{django_forms_workflows-0.64.2 → django_forms_workflows-0.65.1}/django_forms_workflows/models.py

@@ -1249,6 +1249,39 @@ class WorkflowStage(models.Model):
     def __str__(self) -> str:
         return f"Stage {self.order}: {self.name}"
 
+    # ------------------------------------------------------------------
+    # Helpers to retrieve groups by role (with fallback to approval)
+    # ------------------------------------------------------------------
+
+    def _groups_by_role(self, role: str):
+        """Return groups for *role*, falling back to approval groups if none."""
+        qs = Group.objects.filter(
+            stageapprovalgroup__stage=self,
+            stageapprovalgroup__role=role,
+        ).order_by("stageapprovalgroup__position")
+        if qs.exists():
+            return qs
+        # Fallback: approval groups
+        return Group.objects.filter(
+            stageapprovalgroup__stage=self,
+            stageapprovalgroup__role="approval",
+        ).order_by("stageapprovalgroup__position")
+
+    def get_validation_groups(self):
+        """Groups used to validate a dynamic assignee's membership."""
+        return self._groups_by_role("validation")
+
+    def get_reassignment_groups(self):
+        """Groups that define the eligible reassignment pool."""
+        return self._groups_by_role("reassignment")
+
+    def get_approval_groups(self):
+        """Groups used for fallback task assignment / approval logic."""
+        return Group.objects.filter(
+            stageapprovalgroup__stage=self,
+            stageapprovalgroup__role="approval",
+        ).order_by("stageapprovalgroup__position")
+
 
 class StageApprovalGroup(models.Model):
     """
@@ -1256,8 +1289,28 @@ class StageApprovalGroup(models.Model):
 
     Stores a ``position`` so admins can control the order groups are
     processed when approval_logic is ``"sequence"``.
+
+    The ``role`` field distinguishes the purpose of a group within the stage:
+
+    * **approval** – the default pool used for fallback task assignment and
+      approval logic (AND/OR/sequence).
+    * **validation** – used to check that a dynamically resolved assignee
+      belongs to an allowed group.  When no validation groups are configured,
+      approval groups are used instead.
+    * **reassignment** – defines the eligible pool of users for task
+      reassignment.  When no reassignment groups are configured, approval
+      groups are used instead.
+
+    The same Django ``Group`` may appear under multiple roles for a single
+    stage (e.g. both approval and reassignment).
     """
 
+    ROLE_CHOICES = [
+        ("approval", "Approval (default)"),
+        ("validation", "Assignee validation"),
+        ("reassignment", "Reassignment pool"),
+    ]
+
     stage = models.ForeignKey(
         WorkflowStage,
         on_delete=models.CASCADE,
@@ -1270,15 +1323,30 @@ class StageApprovalGroup(models.Model):
         default=0,
         help_text="Order in which this group is processed (lower = first)",
     )
+    role = models.CharField(
+        max_length=20,
+        choices=ROLE_CHOICES,
+        default="approval",
+        help_text=(
+            "Purpose of this group in the stage. "
+            "'Approval' groups receive fallback tasks and define the default pool. "
+            "'Validation' groups are checked when verifying a dynamic assignee's "
+            "group membership (falls back to approval groups when none defined). "
+            "'Reassignment' groups define who may be reassigned to "
+            "(falls back to approval groups when none defined)."
+        ),
+    )
 
     class Meta:
-        ordering = ["position"]
-        unique_together = [("stage", "group")]
+        ordering = ["role", "position"]
+        unique_together = [("stage", "group", "role")]
         verbose_name = "Stage Approval Group"
         verbose_name_plural = "Stage Approval Groups"
 
     def __str__(self) -> str:
-        return f"{self.group.name} (pos {self.position})"
+        label = self.get_role_display() if self.role != "approval" else ""
+        suffix = f" [{label}]" if label else ""
+        return f"{self.group.name} (pos {self.position}){suffix}"
 
 
 class NotificationRule(models.Model):

{django_forms_workflows-0.64.2 → django_forms_workflows-0.65.1}/django_forms_workflows/sync_api.py

@@ -196,7 +196,10 @@ def _serialize_category(cat):
     }
 
 
-def _serialize_field(field):
+def _serialize_field(field, wf_pk_to_index=None):
+    wf_index = None
+    if field.workflow_stage_id and wf_pk_to_index:
+        wf_index = wf_pk_to_index.get(field.workflow_stage.workflow_id)
     return {
         "field_name": field.field_name,
         "field_label": field.field_label,
@@ -230,6 +233,7 @@ def _serialize_field(field):
         "workflow_stage_order": field.workflow_stage.order
         if field.workflow_stage_id
         else None,
+        "workflow_index": wf_index,
     }
 
 
@@ -237,9 +241,9 @@ def _serialize_workflow_stage(stage):
     # Serialize approval groups with their sequence position so that
     # "sequence" stages are restored in the correct order on import.
     approval_groups = [
-        {"name": sag.group.name, "position": sag.position}
+        {"name": sag.group.name, "position": sag.position, "role": sag.role}
         for sag in stage.stageapprovalgroup_set.select_related("group").order_by(
-            "position"
+            "role", "position"
         )
     ]
     return {
@@ -415,6 +419,10 @@ def serialize_form(form_definition):
     # Additional workflows (new: stored in "additional_workflows")
     extra_workflows = all_workflows[1:] if len(all_workflows) > 1 else []
 
+    # Build a map from workflow PK → index so fields can record which
+    # workflow their stage belongs to (needed for multi-workflow forms).
+    wf_pk_to_index = {wf.pk: idx for idx, wf in enumerate(all_workflows)}
+
     result = {
         "schema_version": SYNC_SCHEMA_VERSION,
         "category": _serialize_category(form_definition.category),
@@ -452,7 +460,8 @@ def serialize_form(form_definition):
             "payment_description_template": form_definition.payment_description_template,
         },
         "fields": [
-            _serialize_field(f) for f in form_definition.fields.all().order_by("order")
+            _serialize_field(f, wf_pk_to_index)
+            for f in form_definition.fields.all().order_by("order")
         ],
         "workflow": _serialize_workflow(primary_workflow),
         "post_actions": [
@@ -792,11 +801,13 @@ def _import_single_workflow(
             if isinstance(entry, dict):
                 group = _get_or_create_group(entry["name"])
                 position = entry.get("position", pos)
+                role = entry.get("role", "approval")
             else:
                 group = _get_or_create_group(entry)
                 position = pos
+                role = "approval"
             StageApprovalGroup.objects.create(
-                stage=stage, group=group, position=position
+                stage=stage, group=group, position=position, role=role
             )
 
         stage.notification_rules.all().delete()
@@ -903,6 +914,8 @@ def import_form(form_data, conflict="update", category_cache=None):
 
     # ── Workflows (created BEFORE fields so stage FKs can be resolved) ─────────
     stage_order_map = {}  # order → WorkflowStage, used when creating fields
+    # Per-workflow stage maps: wf_index → {order → WorkflowStage}
+    stage_order_maps_by_wf = {}
     wf_data = form_data.get("workflow")
     additional_wf_data = form_data.get("additional_workflows", [])
 
@@ -928,7 +941,9 @@ def import_form(form_data, conflict="update", category_cache=None):
                 imported_wf_ids,
             )
             imported_wf_ids.add(wf_obj.pk)
-            # Use the primary workflow's stage map for field FK resolution
+            stage_order_maps_by_wf[wf_idx] = s_map
+            # Primary workflow's stage map is the default for backward compat
+            # (fields without workflow_index fall back to this).
             if wf_idx == 0:
                 stage_order_map = s_map
 
@@ -994,9 +1009,18 @@ def import_form(form_data, conflict="update", category_cache=None):
         min_val = field_data.pop("min_value", None)
         max_val = field_data.pop("max_value", None)
         stage_order = field_data.pop("workflow_stage_order", None)
-        workflow_stage = (
-            stage_order_map.get(stage_order) if stage_order is not None else None
-        )
+        wf_index = field_data.pop("workflow_index", None)
+        if stage_order is not None:
+            # Use the per-workflow stage map when workflow_index is present,
+            # falling back to the primary workflow's map for backward compat.
+            resolved_map = (
+                stage_order_maps_by_wf.get(wf_index, stage_order_map)
+                if wf_index is not None
+                else stage_order_map
+            )
+            workflow_stage = resolved_map.get(stage_order)
+        else:
+            workflow_stage = None
         # Resolve shared option list by slug (if present)
         sol_slug = field_data.pop("shared_option_list_slug", None)
         shared_option_list = None

{django_forms_workflows-0.64.2 → django_forms_workflows-0.65.1}/django_forms_workflows/views.py

@@ -1925,13 +1925,13 @@ def reassign_task(request, task_id):
         messages.error(request, "Reassignment is not enabled for this approval step.")
         return redirect("forms_workflows:approval_inbox")
 
-    # Permission: current assignee, any member of the stage's approval groups,
-    # or superuser can reassign.
-    stage_groups = list(stage.approval_groups.all())
-    stage_group_ids = {g.pk for g in stage_groups}
+    # Permission: current assignee, any member of the stage's reassignment
+    # groups (falls back to approval groups), or superuser can reassign.
+    reassign_groups = list(stage.get_reassignment_groups())
+    reassign_group_ids = {g.pk for g in reassign_groups}
     can_reassign = (
         task.assigned_to == request.user
-        or request.user.groups.filter(pk__in=stage_group_ids).exists()
+        or request.user.groups.filter(pk__in=reassign_group_ids).exists()
         or request.user.is_superuser
     )
     if not can_reassign:
@@ -1950,11 +1950,11 @@ def reassign_task(request, task_id):
             messages.error(request, "Selected user not found.")
             return redirect("forms_workflows:reassign_task", task_id=task_id)
 
-        # Validate the new assignee is in one of the stage's approval groups
-        if not new_assignee.groups.filter(pk__in=stage_group_ids).exists():
+        # Validate the new assignee is in one of the stage's reassignment groups
+        if not new_assignee.groups.filter(pk__in=reassign_group_ids).exists():
             messages.error(
                 request,
-                "The selected user is not a member of any approval group for this stage.",
+                "The selected user is not a member of any reassignment group for this stage.",
             )
             return redirect("forms_workflows:reassign_task", task_id=task_id)
 
@@ -1988,7 +1988,7 @@ def reassign_task(request, task_id):
 
     # GET — show reassignment form with eligible users
     eligible_users = (
-        user_model.objects.filter(groups__pk__in=stage_group_ids, is_active=True)
+        user_model.objects.filter(groups__pk__in=reassign_group_ids, is_active=True)
         .distinct()
         .order_by("last_name", "first_name", "username")
     )

{django_forms_workflows-0.64.2 → django_forms_workflows-0.65.1}/django_forms_workflows/workflow_builder_views.py

@@ -129,9 +129,14 @@ def _normalize_trigger_conditions(raw_conditions):
 
 def _serialize_stage_approval_groups(stage):
     return [
-        {"id": sag.group_id, "name": sag.group.name, "position": sag.position}
+        {
+            "id": sag.group_id,
+            "name": sag.group.name,
+            "position": sag.position,
+            "role": sag.role,
+        }
         for sag in stage.stageapprovalgroup_set.select_related("group").order_by(
-            "position", "group__name"
+            "role", "position", "group__name"
         )
     ]
 
@@ -1245,6 +1250,7 @@ def convert_visual_to_workflow(workflow_data, form_definition, workflow=None):
                 stage=stage,
                 group_id=group_entry["id"],
                 position=group_entry.get("position", pos),
+                role=group_entry.get("role", "approval"),
             )
 
         stage_node_map[snode.get("id")] = stage

{django_forms_workflows-0.64.2 → django_forms_workflows-0.65.1}/django_forms_workflows/workflow_engine.py

@@ -586,12 +586,14 @@ def _create_stage_tasks(
     # --- Dynamic assignment (form field → User lookup) ------------------------
     dynamic_assignee = _resolve_dynamic_assignee(submission, stage)
     if dynamic_assignee is not None:
-        # Optionally validate the resolved user belongs to a stage approval group
+        # Optionally validate the resolved user belongs to the stage's
+        # validation groups (falls back to approval groups when none defined).
         if stage.validate_assignee_group and groups:
-            group_ids = {g.pk for g in groups}
-            if not dynamic_assignee.groups.filter(pk__in=group_ids).exists():
+            validation_groups = list(stage.get_validation_groups())
+            validation_group_ids = {g.pk for g in validation_groups}
+            if not dynamic_assignee.groups.filter(pk__in=validation_group_ids).exists():
                 logger.warning(
-                    "Dynamic assignee '%s' is not a member of any approval group "
+                    "Dynamic assignee '%s' is not a member of any validation group "
                     "for stage '%s' (submission %s); falling back to group assignment.",
                     dynamic_assignee.username,
                     stage.name,

{django_forms_workflows-0.64.2 → django_forms_workflows-0.65.1}/pyproject.toml

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