django-forms-workflows 0.35.4__tar.gz → 0.35.7__tar.gz

{django_forms_workflows-0.35.4 → django_forms_workflows-0.35.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: django-forms-workflows
-Version: 0.35.4
+Version: 0.35.7
 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.35.4 → django_forms_workflows-0.35.7}/django_forms_workflows/ldap_backend.py

@@ -394,10 +394,20 @@ def search_ldap_users(search_term, max_results=10):
             settings, "FORMS_WORKFLOWS_LDAP_USERNAME_ATTR", "sAMAccountName"
         )
 
-        # Build search filter (search by username, first name, or last name)
+        # Build search filter.
+        # Searches displayName in addition to sAMAccountName, givenName, and sn
+        # so that full-name values (e.g. "Jarred Simmonds") from form fields are
+        # matched correctly.  displayName is the authoritative full-name field in
+        # Active Directory and is what the _lookup_by_ldap engine passes here.
         if search_term:
             escaped_term = escape_filter_chars(search_term)
-            search_filter = f"(&(objectClass=user)(|({username_attr}=*{escaped_term}*)(givenName=*{escaped_term}*)(sn=*{escaped_term}*)))"
+            search_filter = (
+                f"(&(objectClass=user)"
+                f"(|({username_attr}=*{escaped_term}*)"
+                f"(displayName=*{escaped_term}*)"
+                f"(givenName=*{escaped_term}*)"
+                f"(sn=*{escaped_term}*)))"
+            )
         else:
             search_filter = "(objectClass=user)"
 
@@ -407,7 +417,15 @@ def search_ldap_users(search_term, max_results=10):
             settings.AUTH_LDAP_USER_SEARCH.base_dn,
             ldap.SCOPE_SUBTREE,
             search_filter,
-            [username_attr, "givenName", "sn", "mail", "department", "title"],
+            [
+                username_attr,
+                "displayName",
+                "givenName",
+                "sn",
+                "mail",
+                "department",
+                "title",
+            ],
         )
 
         users = []

{django_forms_workflows-0.35.4 → django_forms_workflows-0.35.7}/django_forms_workflows/templates/django_forms_workflows/approve.html

@@ -255,7 +255,10 @@
                 </div>
                 {% endif %}
                 {% if section.comments %}
-                <p class="mb-2 small fst-italic text-secondary">&#8220;{{ section.comments }}&#8221;</p>
+                <p class="mb-2 small fst-italic text-secondary">
+                    <span class="badge bg-warning text-dark me-1" title="This comment is visible to the submitter."><i class="bi bi-eye-fill"></i> Public</span>
+                    &#8220;{{ section.comments }}&#8221;
+                </p>
                 {% endif %}
                 {% if section.fields %}
                 <table class="table table-bordered table-sm mb-0">
@@ -333,8 +336,18 @@
                     <!-- Decision Section inline -->
                     <h6 class="mb-3"><i class="bi bi-clipboard-check"></i> Your Decision</h6>
                     <div class="mb-3">
-                        <label for="comments" class="form-label">Comments (Optional)</label>
-                        <textarea class="form-control" id="comments" name="comments" rows="2" placeholder="Add any comments about your decision..."></textarea>
+                        <label for="comments" class="form-label">
+                            Decision Comment
+                            <span class="badge bg-warning text-dark ms-1" title="This comment is visible to the submitter and all parties on the submission record.">
+                                <i class="bi bi-eye-fill"></i> Public
+                            </span>
+                        </label>
+                        <textarea class="form-control" id="comments" name="comments" rows="2" placeholder="Optional — visible to the submitter and all parties..."></textarea>
+                        <div class="form-text text-muted">
+                            <i class="bi bi-info-circle"></i>
+                            This comment is <strong>visible to the submitter</strong> and appears on the public submission record.
+                            For internal notes, add a private field to this approval step's configuration instead.
+                        </div>
                     </div>
                     <div class="d-grid gap-2 d-md-block">
                         <button type="submit" name="decision" value="approve" class="btn btn-success btn-lg">
@@ -494,7 +507,10 @@
                             </div>
                             {% endif %}
                             {% if section.comments %}
-                            <p class="mb-0 mt-1 small fst-italic text-secondary">&#8220;{{ section.comments }}&#8221;</p>
+                            <p class="mb-0 mt-1 small fst-italic text-secondary">
+                                <span class="badge bg-warning text-dark me-1" title="This comment is visible to the submitter."><i class="bi bi-eye-fill"></i> Public</span>
+                                &#8220;{{ section.comments }}&#8221;
+                            </p>
                             {% endif %}
                         </div>
                     </div>
@@ -564,8 +580,18 @@
                 <form method="post" data-loading-message="Processing your decision...">
                     {% csrf_token %}
                     <div class="mb-3">
-                        <label for="comments" class="form-label">Comments (Optional)</label>
-                        <textarea class="form-control" id="comments" name="comments" rows="3" placeholder="Add any comments about your decision..."></textarea>
+                        <label for="comments" class="form-label">
+                            Decision Comment
+                            <span class="badge bg-warning text-dark ms-1" title="This comment is visible to the submitter and all parties on the submission record.">
+                                <i class="bi bi-eye-fill"></i> Public
+                            </span>
+                        </label>
+                        <textarea class="form-control" id="comments" name="comments" rows="3" placeholder="Optional — visible to the submitter and all parties..."></textarea>
+                        <div class="form-text text-muted">
+                            <i class="bi bi-info-circle"></i>
+                            This comment is <strong>visible to the submitter</strong> and appears on the public submission record.
+                            For internal notes, add a private field to this approval step's configuration instead.
+                        </div>
                     </div>
                     <div class="d-grid gap-2 d-md-block">
                         <button type="submit" name="decision" value="approve" class="btn btn-success btn-lg">

{django_forms_workflows-0.35.4 → django_forms_workflows-0.35.7}/django_forms_workflows/templates/django_forms_workflows/submission_detail.html

@@ -186,7 +186,10 @@
                             </div>
                             {% endif %}
                             {% if section.comments %}
-                            <p class="mb-0 mt-1 small fst-italic text-secondary">&#8220;{{ section.comments }}&#8221;</p>
+                            <p class="mb-0 mt-1 small fst-italic text-secondary">
+                                <span class="badge bg-warning text-dark me-1" title="This comment is visible to the submitter."><i class="bi bi-eye-fill"></i> Public</span>
+                                &#8220;{{ section.comments }}&#8221;
+                            </p>
                             {% endif %}
                         </div>
                     </div>
@@ -320,7 +323,7 @@
                                 <th>Status</th>
                                 <th>Completed By</th>
                                 <th>Completed At</th>
-                                <th>Comments</th>
+                                <th>Decision Comment <span class="badge bg-warning text-dark" title="Comments are visible to the submitter."><i class="bi bi-eye-fill"></i> Public</span></th>
                             </tr>
                         </thead>
                         <tbody>
@@ -388,7 +391,7 @@
                                 <th>Status</th>
                                 <th>Completed By</th>
                                 <th>Completed At</th>
-                                <th>Comments</th>
+                                <th>Decision Comment <span class="badge bg-warning text-dark" title="Comments are visible to the submitter."><i class="bi bi-eye-fill"></i> Public</span></th>
                             </tr>
                         </thead>
                         <tbody>
@@ -441,7 +444,7 @@
                                 <th>Status</th>
                                 <th>Completed By</th>
                                 <th>Completed At</th>
-                                <th>Comments</th>
+                                <th>Decision Comment <span class="badge bg-warning text-dark" title="Comments are visible to the submitter."><i class="bi bi-eye-fill"></i> Public</span></th>
                             </tr>
                         </thead>
                         <tbody>

{django_forms_workflows-0.35.4 → django_forms_workflows-0.35.7}/django_forms_workflows/workflow_engine.py

@@ -471,8 +471,9 @@ def _lookup_by_ldap(user_model, value, stage, submission):
         return None
 
     # Get or JIT-create the Django User
+    jit_created = False
     try:
-        return user_model.objects.get(username__iexact=username)
+        user = user_model.objects.get(username__iexact=username)
     except user_model.DoesNotExist:
         # Auto-provision the user so the approval task can be assigned.
         # When they later SSO in, the social-auth pipeline's
@@ -484,6 +485,7 @@ def _lookup_by_ldap(user_model, value, stage, submission):
             last_name=match.get("last_name", ""),
             is_active=True,
         )
+        jit_created = True
         # Create a profile if the model exists
         try:
             from .models import UserProfile
@@ -509,7 +511,35 @@ def _lookup_by_ldap(user_model, value, stage, submission):
             stage.name,
             submission.id,
         )
-        return user
+
+    # Sync LDAP group memberships so the user has the correct Django permissions.
+    # Always do this for JIT-provisioned users (they have no groups yet), and
+    # also for existing pre-provisioned users in case their groups have changed
+    # since they were last synced.
+    try:
+        from .sso_backends import sync_user_ldap_groups
+
+        n = sync_user_ldap_groups(user)
+        logger.info(
+            "Dynamic assignee lookup (ldap): synced %d LDAP groups for user '%s' "
+            "(jit_created=%s, stage '%s', submission %s).",
+            n,
+            username,
+            jit_created,
+            stage.name,
+            submission.id,
+        )
+    except Exception:
+        logger.warning(
+            "Dynamic assignee lookup (ldap): could not sync LDAP groups for "
+            "user '%s' (stage '%s', submission %s).",
+            username,
+            stage.name,
+            submission.id,
+            exc_info=True,
+        )
+
+    return user
 
 
 def _notify_stage_form_field_recipients(

{django_forms_workflows-0.35.4 → django_forms_workflows-0.35.7}/pyproject.toml

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