WP-494: handle null entity_names when using exception and extensions …

…in admin view (#275) * WP-494: handle null entity_names when using exception and extensions in admin view * Handle empty string in drop down
TACC · Feb 15, 2024 · 9a15e2a · 9a15e2a
1 parent 7634f3c
commit 9a15e2a
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/apcd-cms/src/apps/admin_exception/views.py b/apcd-cms/src/apps/admin_exception/views.py
@@ -116,6 +116,8 @@ def getDate(row):
                 context['org_options'].append(entity_name)
                 # to make sure All is first in the dropdown filter options after sorting alphabetically
                 context['org_options'] = sorted(context['org_options'], key=lambda x: (x != 'All', x))
+                # Remove empty strings
+                context['org_options'] = [option for option in context['org_options'] if option != '']
             if status not in context['status_options']:
                 if status != None:
                     context['status_options'].append(status)

diff --git a/apcd-cms/src/apps/admin_extension/views.py b/apcd-cms/src/apps/admin_extension/views.py
@@ -109,6 +109,8 @@ def getDate(row):
             if entity_name not in context['org_options']:
                 context['org_options'].append(entity_name)
                 context['org_options'] = sorted(context['org_options'], key=lambda x: (x != 'All', x))
+                # Remove empty strings
+                context['org_options'] = [option for option in context['org_options'] if option != '']
             if status not in context['status_options']:
                 context['status_options'].append(status)
                 context['status_options'] = sorted(context['status_options'], key=lambda x: (x != 'All', x))

diff --git a/apcd-cms/src/apps/utils/apcd_database.py b/apcd-cms/src/apps/utils/apcd_database.py
@@ -1349,7 +1349,7 @@ def get_all_extensions():
                 extensions.requestor_email,
                 extensions.explanation_justification,
                 extensions.notes,
-                submitters.entity_name
+                COALESCE(NULLIF(submitters.entity_name, ''), '') as entity_name
             FROM extensions
             JOIN submitters
                 ON extensions.submitter_id = submitters.submitter_id
@@ -1400,7 +1400,7 @@ def get_all_exceptions():
                 exceptions.approved_expiration_date,
                 exceptions.status,
                 exceptions.notes,
-                submitters.entity_name,
+                COALESCE(NULLIF(submitters.entity_name, ''), '') as entity_name,
                 standard_codes.item_value
             FROM exceptions
             JOIN submitters