django-forms-workflows 0.30.2__tar.gz → 0.30.4__tar.gz

{django_forms_workflows-0.30.2 → django_forms_workflows-0.30.4}/PKG-INFO

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

@@ -44,7 +44,7 @@ from .models import (
 
 
 # Inline for form fields when editing a form definition
-class FormFieldInline(admin.StackedInline):
+class FormFieldInline(nested_admin.NestedStackedInline):
     model = FormField
     extra = 0
     ordering = ("order",)
@@ -281,11 +281,17 @@ class StageApprovalGroupInline(nested_admin.NestedTabularInline):
 
 
 class StageFormFieldNotificationInline(nested_admin.NestedTabularInline):
-    """Inline for configuring form-field conditional notifications on a stage."""
+    """Inline for configuring stage-level notifications (static and/or form-field driven)."""
 
     model = StageFormFieldNotification
     extra = 0
-    fields = ("notification_type", "email_field", "subject_template", "conditions")
+    fields = (
+        "notification_type",
+        "email_field",
+        "static_emails",
+        "subject_template",
+        "conditions",
+    )
 
 
 class WorkflowStageInline(nested_admin.NestedStackedInline):

django_forms_workflows-0.30.4/django_forms_workflows/migrations/0053_stageformfieldnotification_static_emails.py

@@ -0,0 +1,42 @@
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("django_forms_workflows", "0052_dynamic_assignee_and_form_field_notifications"),
+    ]
+
+    operations = [
+        # Allow email_field to be blank — rules may now use only static_emails
+        migrations.AlterField(
+            model_name="stageformfieldnotification",
+            name="email_field",
+            field=models.CharField(
+                blank=True,
+                default="",
+                help_text=(
+                    "Slug of the form field whose value is the recipient email address. "
+                    "The value is read from the submission's form_data at send time. "
+                    "Leave blank if you only need static recipients."
+                ),
+                max_length=200,
+            ),
+        ),
+        # Add static_emails for fixed addresses notified on every matching submission
+        migrations.AddField(
+            model_name="stageformfieldnotification",
+            name="static_emails",
+            field=models.CharField(
+                blank=True,
+                default="",
+                help_text=(
+                    "Comma-separated list of fixed email addresses to notify. "
+                    "These recipients are always included regardless of form data. "
+                    "Can be combined with Email Field to notify both static and dynamic addresses."
+                ),
+                max_length=1000,
+            ),
+        ),
+    ]
+

{django_forms_workflows-0.30.2 → django_forms_workflows-0.30.4}/django_forms_workflows/models.py

@@ -838,18 +838,28 @@ class StageApprovalGroup(models.Model):
 
 class StageFormFieldNotification(models.Model):
     """
-    A notification rule that sends an email to an address captured in the
-    form submission data when a stage activates (or when the submission
-    reaches a final state).
-
-    This enables "conditional notifications" where — for example — the
-    Instructor whose email was entered in the form receives a notification
-    when the workflow reaches the Instructor Approval stage, even if that
-    person is not a registered system user.
-
-    Conditions (same format as WorkflowStage.trigger_conditions) are
-    evaluated against the submission's form_data before sending; leave
-    blank to always send.
+    A notification rule attached to a workflow stage that can send emails to:
+
+    * A **dynamic** recipient — an email address captured in a form field
+      (``email_field``).  The value is resolved from the submission's
+      ``form_data`` at send time, so the recipient can vary per submission.
+    * One or more **static** recipients — a comma-separated list of fixed
+      email addresses (``static_emails``) that always receive the notification
+      regardless of what was submitted.
+
+    Both fields may be set simultaneously; the union of recipients is notified.
+    At least one of ``email_field`` or ``static_emails`` must be provided.
+
+    ``notification_type`` controls which email template is used and when the
+    notification fires:
+
+    * ``approval_request``      — fires when the stage activates.
+    * ``submission_received``   — fires when the form is first submitted.
+    * ``approval_notification`` — fires when the whole workflow is approved.
+    * ``rejection_notification``— fires when the submission is rejected.
+
+    Optional ``conditions`` (same JSON format as ``WorkflowStage.trigger_conditions``)
+    are evaluated against ``form_data`` before sending; leave blank to always send.
     """
 
     NOTIFICATION_TYPES = [
@@ -872,9 +882,22 @@ class StageFormFieldNotification(models.Model):
     )
     email_field = models.CharField(
         max_length=200,
+        blank=True,
+        default="",
         help_text=(
             "Slug of the form field whose value is the recipient email address. "
-            "The value is read from the submission's form_data at send time."
+            "The value is read from the submission's form_data at send time. "
+            "Leave blank if you only need static recipients."
+        ),
+    )
+    static_emails = models.CharField(
+        max_length=1000,
+        blank=True,
+        default="",
+        help_text=(
+            "Comma-separated list of fixed email addresses to notify. "
+            "These recipients are always included regardless of form data. "
+            "Can be combined with Email Field to notify both static and dynamic addresses."
         ),
     )
     subject_template = models.CharField(

{django_forms_workflows-0.30.2 → django_forms_workflows-0.30.4}/django_forms_workflows/tasks.py

@@ -781,6 +781,25 @@ def _get_form_field_email(form_data: dict, email_field: str) -> str | None:
     return value if value and "@" in value else None
 
 
+def _collect_notification_recipients(notif, form_data: dict) -> list[str]:
+    """Return the deduplicated list of recipient emails for a StageFormFieldNotification.
+
+    Combines:
+    - The dynamic email read from form_data via notif.email_field (if set and valid).
+    - All static emails from notif.static_emails (comma-separated, if set).
+    """
+    recipients: list[str] = []
+    if notif.email_field:
+        dynamic = _get_form_field_email(form_data, notif.email_field)
+        if dynamic:
+            recipients.append(dynamic)
+    for addr in (notif.static_emails or "").split(","):
+        addr = addr.strip()
+        if addr and "@" in addr and addr not in recipients:
+            recipients.append(addr)
+    return recipients
+
+
 def _build_form_field_notification_context(
     submission: FormSubmission,
     task: ApprovalTask | None = None,
@@ -834,24 +853,25 @@ def send_stage_form_field_notifications(task_id: int) -> None:
 
                 if not evaluate_conditions(notif.conditions, form_data):
                     logger.info(
-                        "Form-field notification %s skipped: conditions not met (submission %s)",
+                        "Stage notification %s skipped: conditions not met (submission %s)",
                         notif.id,
                         submission.id,
                     )
                     continue
             except Exception:
                 logger.warning(
-                    "Form-field notification %s: error evaluating conditions; skipping.",
+                    "Stage notification %s: error evaluating conditions; skipping.",
                     notif.id,
                 )
                 continue
 
-        email = _get_form_field_email(form_data, notif.email_field)
-        if not email:
+        recipients = _collect_notification_recipients(notif, form_data)
+        if not recipients:
             logger.info(
-                "Form-field notification %s: field '%s' is empty or invalid; skipping.",
+                "Stage notification %s: no recipients resolved (email_field='%s', static_emails='%s'); skipping.",
                 notif.id,
                 notif.email_field,
+                notif.static_emails,
             )
             continue
 
@@ -870,7 +890,7 @@ def send_stage_form_field_notifications(task_id: int) -> None:
         }
         _send_html_email(
             subject,
-            [email],
+            recipients,
             "emails/approval_request.html",
             context,
             notification_type="approval_request",
@@ -910,6 +930,12 @@ def send_submission_form_field_notifications(
         notification_type=notification_type,
     ).select_related("stage")
 
+    default_subjects = {
+        "submission_received": f"Submission Received: {form_name} (ID {submission.id})",
+        "approval_notification": f"Submission Approved: {form_name} (ID {submission.id})",
+        "rejection_notification": f"Submission Rejected: {form_name} (ID {submission.id})",
+    }
+
     for notif in notifications:
         if notif.conditions:
             try:
@@ -919,13 +945,13 @@ def send_submission_form_field_notifications(
                     continue
             except Exception:
                 logger.warning(
-                    "Form-field notification %s: error evaluating conditions; skipping.",
+                    "Stage notification %s: error evaluating conditions; skipping.",
                     notif.id,
                 )
                 continue
 
-        email = _get_form_field_email(form_data, notif.email_field)
-        if not email:
+        recipients = _collect_notification_recipients(notif, form_data)
+        if not recipients:
             continue
 
         subject = (
@@ -933,16 +959,14 @@ def send_submission_form_field_notifications(
                 form_name=form_name, submission_id=submission.id
             )
             if notif.subject_template
-            else {
-                "submission_received": f"Submission Received: {form_name} (ID {submission.id})",
-                "approval_notification": f"Submission Approved: {form_name} (ID {submission.id})",
-                "rejection_notification": f"Submission Rejected: {form_name} (ID {submission.id})",
-            }.get(notification_type, f"{form_name} (ID {submission.id})")
+            else default_subjects.get(
+                notification_type, f"{form_name} (ID {submission.id})"
+            )
         )
         context = {"submission": submission, "submission_url": submission_url}
         _send_html_email(
             subject,
-            [email],
+            recipients,
             template,
             context,
             notification_type=notification_type,

{django_forms_workflows-0.30.2 → django_forms_workflows-0.30.4}/pyproject.toml

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