From cb8db266cd1b9d27ea5db017574f1e5b96937a64 Mon Sep 17 00:00:00 2001
From: Lance Edgar <lance@edbob.org>
Date: Sun, 11 Feb 2018 23:19:30 -0600
Subject: [PATCH] Remove last references to any "fieldset" type things

---
 tailbone/templates/crud.mako                  | 21 -------------------
 .../templates/purchases/batches/create.mako   |  2 +-
 tailbone/templates/settings/crud.mako         | 13 ------------
 tailbone/views/master.py                      |  8 +++----
 4 files changed, 5 insertions(+), 39 deletions(-)
 delete mode 100644 tailbone/templates/crud.mako
 delete mode 100644 tailbone/templates/settings/crud.mako

diff --git a/tailbone/templates/crud.mako b/tailbone/templates/crud.mako
deleted file mode 100644
index b1afa0e5..00000000
--- a/tailbone/templates/crud.mako
+++ /dev/null
@@ -1,21 +0,0 @@
-## -*- coding: utf-8 -*-
-<%inherit file="/form.mako" />
-
-<%def name="title()">${"New "+form.pretty_name if form.creating else form.pretty_name+' : '+capture(self.model_title)}</%def>
-
-<%def name="model_title()">${h.literal(unicode(form.fieldset.model))}</%def>
-
-<%def name="head_tags()">
-  ${parent.head_tags()}
-  <script type="text/javascript">
-    $(function() {
-        $('a.delete').click(function() {
-            if (! confirm("Do you really wish to delete this object?")) {
-                return false;
-            }
-        });
-    });
-  </script>
-</%def>
-
-${parent.body()}
diff --git a/tailbone/templates/purchases/batches/create.mako b/tailbone/templates/purchases/batches/create.mako
index 3a165f01..3b94f7d0 100644
--- a/tailbone/templates/purchases/batches/create.mako
+++ b/tailbone/templates/purchases/batches/create.mako
@@ -51,7 +51,7 @@
             }
         });
 
-        show_mode(${form.fieldset.model.mode or enum.PURCHASE_BATCH_MODE_ORDERING});
+        show_mode(${batch.mode or enum.PURCHASE_BATCH_MODE_ORDERING});
 
     });
 
diff --git a/tailbone/templates/settings/crud.mako b/tailbone/templates/settings/crud.mako
deleted file mode 100644
index 84ce606e..00000000
--- a/tailbone/templates/settings/crud.mako
+++ /dev/null
@@ -1,13 +0,0 @@
-## -*- coding: utf-8 -*-
-<%inherit file="/crud.mako" />
-
-<%def name="context_menu_items()">
-  <li>${h.link_to("Back to Settings", url('settings'))}</li>
-  % if form.readonly:
-      <li>${h.link_to("Edit this Setting", url('settings.edit', name=form.fieldset.model.name))}</li>
-  % elif form.updating:
-      <li>${h.link_to("View this Setting", url('settings.view', name=form.fieldset.model.name))}</li>
-  % endif
-</%def>
-
-${parent.body()}
diff --git a/tailbone/views/master.py b/tailbone/views/master.py
index 9cc2ade0..3ceb0faf 100644
--- a/tailbone/views/master.py
+++ b/tailbone/views/master.py
@@ -604,7 +604,7 @@ class MasterView(View):
         if self.request.method == 'POST':
             if self.validate_form(form):
                 # let save_create_form() return alternate object if necessary
-                obj = self.save_create_form(form) or form.fieldset.model
+                obj = self.save_create_form(form)
                 self.after_create(obj)
                 self.flash_after_create(obj)
                 return self.redirect_after_create(obj)
@@ -622,7 +622,7 @@ class MasterView(View):
         if self.request.method == 'POST':
             if self.validate_mobile_form(form):
                 # let save_create_form() return alternate object if necessary
-                obj = self.save_mobile_create_form(form) or form.fieldset.model
+                obj = self.save_mobile_create_form(form)
                 self.after_create(obj)
                 self.flash_after_create(obj)
                 return self.redirect_after_create(obj, mobile=True)
@@ -2284,7 +2284,7 @@ class MasterView(View):
         if self.request.method == 'POST':
             if self.validate_row_form(form):
                 self.before_create_row(form)
-                obj = self.save_create_row_form(form) or form.fieldset.model
+                obj = self.save_create_row_form(form)
                 self.after_create_row(obj)
                 return self.redirect_after_create_row(obj)
         return self.render_to_response('create_row', {
@@ -2329,7 +2329,7 @@ class MasterView(View):
             if self.validate_mobile_row_form(form):
                 self.before_create_row(form)
                 # let save() return alternate object if necessary
-                obj = self.save_create_row_form(form) or form.fieldset.model
+                obj = self.save_create_row_form(form)
                 self.after_create_row(obj)
                 return self.redirect_after_create_row(obj, mobile=True)
         return self.render_to_response('create_row', {