django-forms-workflows 0.28.2__tar.gz → 0.28.4__tar.gz

{django_forms_workflows-0.28.2 → django_forms_workflows-0.28.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: django-forms-workflows
-Version: 0.28.2
+Version: 0.28.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.28.2 → django_forms_workflows-0.28.4}/django_forms_workflows/data_sources/database_source.py

@@ -133,11 +133,17 @@ class DatabaseDataSource(DataSource):
                 if value:
                     return value
 
-            # Then check the user's profile
-            if hasattr(user, "forms_profile"):
-                profile = user.forms_profile
-                if hasattr(profile, user_id_field):
-                    return getattr(profile, user_id_field)
+            # Then check the user's profile — try both known related names
+            for profile_attr in ("profile", "forms_profile", "userprofile"):
+                if hasattr(user, profile_attr):
+                    try:
+                        profile = getattr(user, profile_attr)
+                        if hasattr(profile, user_id_field):
+                            value = getattr(profile, user_id_field)
+                            if value:
+                                return value
+                    except Exception:
+                        continue
             return None
         except Exception as e:
             logger.error(f"Error getting user ID field {user_id_field}: {e}")

{django_forms_workflows-0.28.2 → django_forms_workflows-0.28.4}/django_forms_workflows/templates/django_forms_workflows/approval_inbox.html

@@ -253,7 +253,9 @@
             <th>Actions</th>
             <th>Form</th>
             <th>Submitter</th>
+            <th>Stage</th>
             <th>Step</th>
+            <th>Assigned</th>
             <th>Submitted</th>
             {% for field in form_fields %}<th class="extra-form-col" data-field="{{ field.field_name }}">{{ field.field_label }}</th>{% endfor %}
           </tr>
@@ -344,7 +346,9 @@ $(document).ready(function() {
                 { data: 'actions', name: '', orderable: false },
                 { data: 'form', name: 'submission__form_definition__name' },
                 { data: 'submitter', name: 'submission__submitter__last_name' },
-                { data: 'step', name: 'step_name' },
+                { data: 'stage', name: 'stage_number' },
+                { data: 'step_num', name: 'workflow_stage__name' },
+                { data: 'assigned', name: 'assigned_group__name' },
                 { data: 'submitted_at', name: 'submission__submitted_at' },
                 {% for field in form_fields %}{ data: '{{ field.field_name }}', name: '', orderable: false },{% endfor %}
             ],

{django_forms_workflows-0.28.2 → django_forms_workflows-0.28.4}/django_forms_workflows/templates/django_forms_workflows/approve.html

@@ -180,7 +180,7 @@
                                     </a>
                                 {% elif entry.value.path %}
                                     <span class="text-muted">{{ entry.value.filename }}</span>
-                                {% elif entry.value|length and entry.value.0 %}
+                                {% elif entry.value.0.filename %}
                                     {# Multi-file upload: list of file dicts #}
                                     <ul class="list-unstyled mb-0">
                                     {% for f in entry.value %}

{django_forms_workflows-0.28.2 → django_forms_workflows-0.28.4}/django_forms_workflows/templates/django_forms_workflows/submission_detail.html

@@ -104,7 +104,7 @@
                                     {# Single file with path but no URL #}
                                     <span class="text-muted">{{ entry.value.filename }}</span>
                                     <small class="text-muted ms-2">(File stored but URL unavailable)</small>
-                                {% elif entry.value|length and entry.value.0 %}
+                                {% elif entry.value.0.filename %}
                                     {# Multi-file upload: list of file dicts #}
                                     <ul class="list-unstyled mb-0">
                                     {% for f in entry.value %}

{django_forms_workflows-0.28.2 → django_forms_workflows-0.28.4}/django_forms_workflows/views.py

@@ -884,8 +884,8 @@ def approval_inbox(request):
     # Compute default sort column index for DataTables (submitted_at)
     _exp_off = 1 if (any_exportable or any_pdf_exportable) else 0
     _cat_off = 0 if category_slug else 1
-    # columns: [checkbox?] [category?] actions form submitter step submitted_at
-    default_sort_col = _exp_off + _cat_off + 1 + 3  # index of submitted_at
+    # columns: [checkbox?] [category?] actions form submitter stage step_num assigned submitted_at
+    default_sort_col = _exp_off + _cat_off + 1 + 5  # index of submitted_at
 
     return render(
         request,
@@ -2366,7 +2366,9 @@ _INBOX_SORTABLE = {
     "submission__form_definition__category__name",
     "submission__form_definition__name",
     "submission__submitter__last_name",
-    "step_name",
+    "stage_number",
+    "workflow_stage__name",
+    "assigned_group__name",
     "submission__submitted_at",
 }
 _MY_SUB_SORTABLE = {
@@ -2627,6 +2629,9 @@ def approval_inbox_ajax(request):
     page_qs = qs.select_related(
         "submission__form_definition__category",
         "submission__submitter",
+        "workflow_stage",
+        "assigned_group",
+        "assigned_to",
     ).prefetch_related("submission__form_definition__workflows")[start : start + length]
 
     # --- Serialise ---
@@ -2655,7 +2660,17 @@ def approval_inbox_ajax(request):
             "submitter": escape(
                 sub.submitter.get_full_name() or sub.submitter.username
             ),
-            "step": escape(task.step_name or ""),
+            "stage": f"Stage {task.stage_number}" if task.stage_number else "—",
+            "step_num": escape(task.workflow_stage.name if task.workflow_stage else ""),
+            "assigned": escape(
+                task.assigned_group.name
+                if task.assigned_group
+                else (
+                    task.assigned_to.get_full_name() or task.assigned_to.username
+                    if task.assigned_to
+                    else "—"
+                )
+            ),
             "submitted_at": sub.submitted_at.strftime("%Y-%m-%d %H:%M")
             if sub.submitted_at
             else "—",

{django_forms_workflows-0.28.2 → django_forms_workflows-0.28.4}/pyproject.toml

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