adding deletes

ttfrog/assets/templates/character_sheet.html

@@ -10,16 +10,14 @@
 
 <form name="character_sheet" method="post" novalidate class="form">
     {{ c.form.csrf_token }}
-
-    {% if 'process' in c.form.errors %}
-    Error: {{ c.form.errors.process |join(',') }}
-    {% endif %}
     <ul>
         {% for field in c.form %}
+            {% if field.name not in ['save', 'delete'] %}
             <li>{{ field.label }}: {{ field }} {{ field.errors|join(',') }}</li>
+            {% endif %}
         {% endfor %}
     </ul>
-    <button type="submit">Submit</button>
+    {{ c.form.save }} &nbsp; {{ c.form.delete }}
 </form>
 </div>
 {% endblock %}

ttfrog/db/manager.py

@@ -52,6 +52,10 @@ class SQLDatabaseManager:
                 tm.abort()
                 raise
 
+    def add(self, *args, **kwargs):
+        self.session.add(*args, **kwargs)
+        self.session.flush()
+
     def query(self, *args, **kwargs):
         return self.session.query(*args, **kwargs)
 

ttfrog/webserver/controllers/base.py

@@ -104,16 +104,34 @@ class BaseController:
             )
         })
 
-    def response(self):
+    def save(self):
-        if not (self.request.POST and self.form):
+        if not self.form.save.data:
             return
-        if self.form.validate():
+        if not self.form.validate():
-            self.form.populate_obj(self.record)
+            return
-            self.coerce_foreign_keys()
+        self.form.populate_obj(self.record)
-            if not self.record.id:
+        self.coerce_foreign_keys()
-                with db.transaction():
+        if self.record.id:
-                    db.session.add(self.record)
+            return
-                    db.session.flush()
+        with db.transaction():
-                    logging.debug(f"Added {self.record = }")
+            db.add(self.record)
-                    location = f"{self.request.current_route_path()}/{self.record.uri}"
+            logging.debug(f"Added {self.record = }")
-                return HTTPFound(location=location)
+            location = f"{self.request.current_route_path()}/{self.record.uri}"
+            return HTTPFound(location=location)
+
+    def delete(self):
+        if not self.record.id:
+            return
+        with db.transaction():
+            db.query(self.model).filter_by(id=self.record.id).delete()
+            logging.debug(f"Deleted {self.record = }")
+            location = self.request.current_route_path()
+            return HTTPFound(location=location)
+
+    def response(self):
+        if not self.form:
+            return
+        elif self.form.save.data:
+            return self.save()
+        elif self.form.delete.data:
+            return self.delete()

ttfrog/webserver/controllers/character_sheet.py

@@ -3,6 +3,7 @@ from ttfrog.db.schema import Character, Ancestry
 from ttfrog.db.manager import db
 from wtforms_alchemy import ModelForm, QuerySelectField
 from wtforms.validators import InputRequired
+from wtforms.fields import SubmitField
 
 
 class CharacterForm(ModelForm):
@@ -13,6 +14,9 @@ class CharacterForm(ModelForm):
     def get_session():
         return db.session
 
+    save = SubmitField()
+    delete = SubmitField()
+
     ancestry = QuerySelectField('Ancestry', validators=[InputRequired()],
                                 query_factory=query_factory(Ancestry), get_label='name')