Simplify template rendering

diff --git a/src/pgwui_sql/templates/sql_edit.mak b/src/pgwui_sql/templates/sql_edit.mak
index 66d5f1b8183b359fd129e5907a568cc9e5477a2e..7dda16bcf4b7b1c5b45b4b9624ddeca39dd020b9 100644 (file)
--- a/src/pgwui_sql/templates/sql_edit.mak
+++ b/src/pgwui_sql/templates/sql_edit.mak
@@ -29,9 +29,6 @@
     tab_value  Value to supply in upload_fmt when tab is checked
     csv_checked   HTML with the state of the csv checkbox
     tab_checked   HTML with the sate of the tab checkbox
-    one_file_value  Value to supply in download_as when "one file" is checked
-    many_files_value  Value to supply in download_as when "many files"
-                      is checked
     one_file_checked  HTML with the state of the "one file" checkbox
     many_files_checked  HTML with the state of the "many files" checkbox
     include_sql  Include SQL in the downloaded results
@@ -40,6 +37,14 @@
 
 <%!
     from pgwui_common.path import asset_abspath
+    from pgwui_core.constants import (
+        CSV_VALUE,
+        TAB_VALUE,
+    )
+    from pgwui_sql.constants import (
+        ONE_FILE_VALUE,
+        MANY_FILES_VALUE,
+    )
 
     sql_base_mak = asset_abspath('pgwui_sql:templates/sql_base.mak')
 %>
@@ -164,7 +169,7 @@
                  id="download_fmt_csv_id"
                  tabindex="${tab_index.val}"
                  type="radio"
-                 value="${csv_value}"
+                 value="${CSV_VALUE}"
                  ${csv_checked | n}
                  />
           <label class="label" for="download_fmt_csv_id">CSV</label>
@@ -173,7 +178,7 @@
                  id="download_fmt_tab_id"
                  tabindex="${tab_index.val + 1}"
                  type="radio"
-                 value="${tab_value}"
+                 value="${TAB_VALUE}"
                  ${tab_checked | n}
                  />
           <label class="label" for="download_fmt_tab_id">Tab delimited</label>
@@ -190,7 +195,7 @@
                  id="download_as_one_file_id"
                  tabindex="${tab_index.val}"
                  type="radio"
-                 value="${one_file_value}"
+                 value="${ONE_FILE_VALUE}"
                  ${one_file_checked | n}
                  />
           <label class="label" for="download_as_one_file_id">A single file
@@ -200,7 +205,7 @@
                  id="download_as_many_files_id"
                  tabindex="${tab_index.val + 1}"
                  type="radio"
-                 value="${many_files_value}"
+                 value="${MANY_FILES_VALUE}"
                  ${many_files_checked | n}
                  />
           <label class="label" for="download_fmt_tab_id">A zip file with one

diff --git a/src/pgwui_sql/views/base.py b/src/pgwui_sql/views/base.py
index bb02a2c27224a3f5d112f9160525bc7fc9b3f7fd..9ad366bbd4d504a7f401f0ae4f188aba25d33b5d 100644 (file)
--- a/src/pgwui_sql/views/base.py
+++ b/src/pgwui_sql/views/base.py
@@ -27,14 +27,10 @@ from pgwui_core.constants import (
     UNCHECKED,
     CSV,
     TAB,
-    CSV_VALUE,
-    TAB_VALUE,
 )
 from pgwui_sql.constants import (
     ONE_FILE,
     MANY_FILES,
-    ONE_FILE_VALUE,
-    MANY_FILES_VALUE,
 )
 
 
@@ -139,31 +135,25 @@ class SQLForm(pgwui_core.forms.UploadFormBaseMixin,
         response['download'] = download_checked
 
         if self['download_fmt'] == CSV:
-            csv_checked = CHECKED
-            tab_checked = UNCHECKED
+            response['csv_checked'] = CHECKED
+            response['tab_checked'] = UNCHECKED
         else:
-            tab_checked = CHECKED
-            csv_checked = UNCHECKED
-        response['csv_checked'] = csv_checked
-        response['tab_checked'] = tab_checked
-        response['csv_value'] = CSV_VALUE
-        response['tab_value'] = TAB_VALUE
+            response['csv_checked'] = UNCHECKED
+            response['tab_checked'] = CHECKED
 
         response['download_as'] = self['download_as']
+
         if self['download_as'] == ONE_FILE:
-            one_file_checked = CHECKED
-            many_files_checked = UNCHECKED
+            response['one_file_checked'] = CHECKED
+            response['many_files_checked'] = UNCHECKED
         else:
-            many_files_checked = CHECKED
-            one_file_checked = UNCHECKED
-        response['one_file_checked'] = one_file_checked
-        response['many_files_checked'] = many_files_checked
-        response['one_file_value'] = ONE_FILE_VALUE
-        response['many_files_value'] = MANY_FILES_VALUE
+            response['one_file_checked'] = UNCHECKED
+            response['many_files_checked'] = CHECKED
 
         if self['include_sql']:
             include_sql_checked = CHECKED
         else:
             include_sql_checked = UNCHECKED
         response['include_sql'] = include_sql_checked
+
         return response