From: Karl O. Pinc <kop@karlpinc.com>
Date: Sat, 23 Jan 2021 21:33:33 +0000 (-0600)
Subject: Add a "null" setting to control upload of NULL values
X-Git-Url: https://papio.biology.duke.edu/gitweb/?a=commitdiff_plain;h=058c9d992ec1da169429f860609b3af86e401441;p=pgwui_bulk_upload

Add a "null" setting to control upload of NULL values
---

diff --git a/src/pgwui_bulk_upload/pgwui_bulk_upload.py b/src/pgwui_bulk_upload/pgwui_bulk_upload.py
index f3f356c..be743e5 100644
--- a/src/pgwui_bulk_upload/pgwui_bulk_upload.py
+++ b/src/pgwui_bulk_upload/pgwui_bulk_upload.py
@@ -28,6 +28,7 @@ DEFAULT_BULK_UPLOAD_MENU_LABEL = (
 DEFAULT_MAP_FILE = 'contents.yml'
 DEFAULT_LITERAL_COLUMN_HEADINGS = 'no-never'
 DEFAULT_TRIM = 'choice-yes'
+DEFAULT_NULL = 'choice-yes'
 
 
 def establish_default_settings(config):
@@ -46,6 +47,8 @@ def establish_default_settings(config):
         'literal_column_headings', DEFAULT_LITERAL_COLUMN_HEADINGS)
     bulk_upload_settings.setdefault(
         'trim', DEFAULT_TRIM)
+    bulk_upload_settings.setdefault(
+        'null', DEFAULT_NULL)
 
 
 def includeme(config):
diff --git a/src/pgwui_bulk_upload/templates/bulk_upload.mak b/src/pgwui_bulk_upload/templates/bulk_upload.mak
index b2ca5de..7eaed5b 100644
--- a/src/pgwui_bulk_upload/templates/bulk_upload.mak
+++ b/src/pgwui_bulk_upload/templates/bulk_upload.mak
@@ -29,6 +29,7 @@
 
 
 <%!
+    from pgwui_upload_core.template_utils import show_choice
     from pgwui_common.path import asset_abspath
     import pgwui_core.exceptions as core_ex
 
@@ -109,6 +110,8 @@
 
 <%
     form_elements = []
-    self.append_elements(form_elements) %>
+    self.append_elements(form_elements)
 
-${self.upload_form(form_elements)}
+    self.upload_form(form_elements,
+                     upload_nulls=show_choice(pgwui, 'null'))
+%>
\ No newline at end of file