Use inheritance to properly wrap inheriting body

diff --git a/src/pgwui_upload_core/templates/upload.mak b/src/pgwui_upload_core/templates/upload.mak
index a53c2478dbee691831bddd3a97bdf820c155f400..0daf3f7226ae7f3b0eccb6d5303dd56ad5f5b159 100644 (file)
--- a/src/pgwui_upload_core/templates/upload.mak
+++ b/src/pgwui_upload_core/templates/upload.mak
@@ -26,10 +26,6 @@
 
     ask_about_literal_cols
 
-  It makes available:
-
-    append_elements(elementlist)  Adds form elements to the end of the list
-
 </%doc>
 
 
@@ -83,7 +79,11 @@
   % endif
 </%def>
 
-<%def name="append_elements(form_elements)">
-    <% form_elements.append(trim_row) %>
-    <% form_elements.append(literal_row) %>
-</%def>
+<%self:upload_form upload_nulls="${show_choice(pgwui, 'null')}"
+                   args="tab_index">
+  <%parent:upload_form upload_nulls="${upload_nulls}" args="tab_index">
+    ${caller.body(tab_index)}
+    ${trim_row(tab_index)}
+    ${literal_row(tab_index)}
+  </%parent:upload_form>
+</%self:upload_form>