django-forms-workflows 0.77.0__tar.gz → 0.77.2__tar.gz

{django_forms_workflows-0.77.0 → django_forms_workflows-0.77.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: django-forms-workflows
-Version: 0.77.0
+Version: 0.77.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.77.0 → django_forms_workflows-0.77.2}/django_forms_workflows/diff_views.py

@@ -326,6 +326,25 @@ def _build_summary(forms_data):
                     parts.append(f"-{', '.join(sorted(removed_g))}")
                 diffs.append(f"{g}: {'; '.join(parts)}")
 
+        # Optional host-project LDAP lookup opt-in. Missing keys come from an
+        # older package version and are treated like disabled configuration.
+        if "ldap_lookup_config" in base or "ldap_lookup_config" in other:
+            b_ldap = base.get("ldap_lookup_config") or {}
+            o_ldap = other.get("ldap_lookup_config") or {}
+            b_enabled = bool(b_ldap.get("enabled", False))
+            o_enabled = bool(o_ldap.get("enabled", False))
+            if b_enabled != o_enabled:
+                diffs.append(f"LDAP lookup enabled: {b_enabled} → {o_enabled}")
+            if (
+                b_enabled
+                and o_enabled
+                and b_ldap.get("notes", "") != o_ldap.get("notes", "")
+            ):
+                diffs.append(
+                    "LDAP lookup notes: "
+                    f"{b_ldap.get('notes', '')!r} → {o_ldap.get('notes', '')!r}"
+                )
+
         # Post actions
         b_actions = base.get("post_actions", [])
         o_actions = other.get("post_actions", [])

{django_forms_workflows-0.77.0 → django_forms_workflows-0.77.2}/django_forms_workflows/sync_api.py

@@ -26,6 +26,7 @@ import json
 import logging
 from decimal import Decimal
 
+from django.apps import apps
 from django.conf import settings
 from django.contrib.auth.models import Group
 from django.db import transaction
@@ -423,6 +424,42 @@ def _serialize_post_action(action):
     }
 
 
+def _get_ldap_lookup_enabled_form_model():
+    """Return the optional site-level LDAP lookup opt-in model.
+
+    ``LDAPLookupEnabledForm`` belongs to the host project rather than this
+    reusable package. Looking it up through Django's app registry lets sync
+    include the configuration when the host app is installed without making
+    it a package dependency.
+    """
+    try:
+        return apps.get_model("workflows", "LDAPLookupEnabledForm")
+    except LookupError:
+        return None
+
+
+def _serialize_ldap_lookup_config(form_definition):
+    """Serialize the portable part of the optional LDAP lookup opt-in row.
+
+    Row presence is the actual enabled flag. ``enabled_at`` and ``enabled_by``
+    are deliberately excluded because they are environment-local audit data;
+    in particular, user primary keys are not portable between instances.
+    """
+    model = _get_ldap_lookup_enabled_form_model()
+    if model is None:
+        return None
+
+    try:
+        config = form_definition.ldap_lookup_config
+    except model.DoesNotExist:
+        config = None
+
+    return {
+        "enabled": config is not None,
+        "notes": config.notes if config is not None else "",
+    }
+
+
 def serialize_form(form_definition):
     """Serialize a FormDefinition (with all related objects) to a plain dict."""
     all_workflows = list(form_definition.workflows.all().order_by("id"))
@@ -490,6 +527,10 @@ def serialize_form(form_definition):
             _serialize_workflow(wf) for wf in extra_workflows
         ]
 
+    ldap_lookup_config = _serialize_ldap_lookup_config(form_definition)
+    if ldap_lookup_config is not None:
+        result["ldap_lookup_config"] = ldap_lookup_config
+
     return result
 
 
@@ -530,7 +571,7 @@ def build_export_payload(queryset):
       changes propagate independently of whether any form in that category
       was modified.
     """
-    qs = queryset.prefetch_related(
+    prefetches = [
         "fields",
         "fields__prefill_source_config",
         "fields__shared_option_list",
@@ -553,7 +594,10 @@ def build_export_payload(queryset):
         "reviewer_groups",
         "category",
         "category__allowed_groups",
-    )
+    ]
+    if _get_ldap_lookup_enabled_form_model() is not None:
+        prefetches.append("ldap_lookup_config")
+    qs = queryset.prefetch_related(*prefetches)
 
     # Export all categories (topologically sorted) so category-only changes
     # propagate even when no form in that category was touched.
@@ -636,6 +680,42 @@ def _get_or_create_category(data, category_cache=None):
     return cat
 
 
+def _sync_ldap_lookup_config(form_obj, form_data):
+    """Apply optional LDAP lookup opt-in state from a serialized form.
+
+    Missing data means the payload came from an older package and leaves the
+    target unchanged. An explicit disabled value removes the opt-in row.
+    """
+    if "ldap_lookup_config" not in form_data:
+        return
+
+    model = _get_ldap_lookup_enabled_form_model()
+    if model is None:
+        logger.warning(
+            "Sync import: LDAP lookup configuration supplied for form %s, "
+            "but workflows.LDAPLookupEnabledForm is not installed; skipped.",
+            form_obj.slug,
+        )
+        return
+
+    config_data = form_data["ldap_lookup_config"]
+    if isinstance(config_data, dict):
+        enabled = config_data.get("enabled", True)
+        notes = config_data.get("notes", "")
+    else:
+        # Tolerate a compact boolean representation from custom clients.
+        enabled = bool(config_data)
+        notes = ""
+
+    if enabled:
+        model.objects.update_or_create(
+            form=form_obj,
+            defaults={"notes": notes},
+        )
+    else:
+        model.objects.filter(form=form_obj).delete()
+
+
 def _resolve_sub_workflow(sub_wf_form, sub_wf_data, parent_workflow):
     """Resolve the correct WorkflowDefinition for a sub-workflow reference.
 
@@ -992,6 +1072,9 @@ def import_form(form_data, conflict="update", category_cache=None):
         [_get_or_create_group(n) for n in fd.get("reviewer_groups", [])]
     )
 
+    # Sync host-project form extensions before the package-owned child rows.
+    _sync_ldap_lookup_config(form_obj, form_data)
+
     # ── Workflows (created BEFORE fields so stage FKs can be resolved) ─────────
     wf_data = form_data.get("workflow")
     additional_wf_data = form_data.get("additional_workflows", [])
@@ -1211,6 +1294,9 @@ def _reset_sequences():
         WorkflowDefinition,
         WorkflowStage,
     ]
+    ldap_lookup_model = _get_ldap_lookup_enabled_form_model()
+    if ldap_lookup_model is not None:
+        models_to_reset.append(ldap_lookup_model)
     with connection.cursor() as cursor:
         for model in models_to_reset:
             table = model._meta.db_table

{django_forms_workflows-0.77.0 → django_forms_workflows-0.77.2}/pyproject.toml

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