diff --git a/tailbone/templates/forms2/form_readonly.mako b/tailbone/templates/forms2/form_readonly.mako index ed61a44e..306282e9 100644 --- a/tailbone/templates/forms2/form_readonly.mako +++ b/tailbone/templates/forms2/form_readonly.mako @@ -2,7 +2,7 @@
${form.render_deform(readonly=True)|n} -## % if buttons: -## ${buttons|n} -## % endif + % if buttons: + ${buttons|n} + % endif
diff --git a/tailbone/views/batch/core3.py b/tailbone/views/batch/core3.py index d668a96a..07fb039f 100644 --- a/tailbone/views/batch/core3.py +++ b/tailbone/views/batch/core3.py @@ -120,9 +120,11 @@ class BatchMasterView3(MasterView3, BatchMasterView2): # current user is batch creator batch.created_by = self.request.user or self.late_login_user() + # TODO: is this still necessary with colander? # destroy initial batch and re-make using handler kwargs = self.get_batch_kwargs(batch) - self.Session.expunge(batch) + # if batch in self.Session: + # self.Session.expunge(batch) batch = self.handler.make_batch(self.Session(), **kwargs) self.Session.flush()