Use inheritance to properly wrap inheriting body

diff --git a/src/pgwui_upload/templates/upload.mak b/src/pgwui_upload/templates/upload.mak
index fbd5b0c0ea980b55cf296d96202f39176ec8c74c..5b25c34e8fc9c92793c41807ef6541e6be437709 100644 (file)
--- a/src/pgwui_upload/templates/upload.mak
+++ b/src/pgwui_upload/templates/upload.mak
@@ -75,10 +75,7 @@
       <% tab_index.inc() %>
 </%def>
 
-<%
-    form_elements = [table_row]
-    self.append_elements(form_elements)
-
-    self.upload_form(form_elements,
-                     upload_nulls=show_choice(pgwui, 'null'))
-%>
+<%self:upload_form upload_nulls="${show_choice(pgwui, 'null')}"
+                   args="tab_index">
+  ${table_row(tab_index)}
+</%self:upload_form>