evilchili/tabletop-frog
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Switching from broken QuerySelectFields

Browse Source
This commit is contained in:
evilchili 2024-02-04 15:38:54 -08:00
parent 99ef4d61f9
commit 2dcaa3fac6
2 changed files with 8 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
ttfrog/webserver/controllers/base.py
View File

@ -5,8 +5,7 @@ from collections import defaultdict
from pyramid.httpexceptions import HTTPFound from pyramid.httpexceptions import HTTPFound
from pyramid.interfaces import IRoutesMapper from pyramid.interfaces import IRoutesMapper
from wtforms.fields import SelectField
from sqlalchemy.inspection import inspect
from ttfrog.attribute_map import AttributeMap from ttfrog.attribute_map import AttributeMap
from ttfrog.db.manager import db from ttfrog.db.manager import db
@ -27,8 +26,10 @@ def get_all_routes(request):
return routes return routes
def query_factory(model): class DeferredSelectField(SelectField):
return lambda: db.query(model).all() def __init__(self, *args, model=None, **kwargs):
super().__init__(*args, **kwargs)
self.choices = db.query(model).all()
class BaseController: class BaseController:
@ -80,17 +81,6 @@ class BaseController:
if 'all_records' not in self.attrs: if 'all_records' not in self.attrs:
self.attrs['all_records'] = db.query(self.model).all() self.attrs['all_records'] = db.query(self.model).all()
def coerce_foreign_keys(self):
inspector = inspect(db.engine)
foreign_keys = inspector.get_foreign_keys(table_name=self.record.__class__.__tablename__)
for foreign_key in foreign_keys:
for col in inspector.get_columns(foreign_key['referred_table']):
if col['name'] == foreign_key['referred_columns'][0]:
col_name = foreign_key['constrained_columns'][0]
col_type = col['type'].python_type
col_value = col_type(getattr(self.record, col_name))
setattr(self.record, col_name, col_value)
def template_context(self, **kwargs) -> dict: def template_context(self, **kwargs) -> dict:
return AttributeMap.from_dict({ return AttributeMap.from_dict({
'c': dict( 'c': dict(
@ -110,7 +100,6 @@ class BaseController:
if not self.form.validate(): if not self.form.validate():
return return
self.form.populate_obj(self.record) self.form.populate_obj(self.record)
self.coerce_foreign_keys()
if self.record.id: if self.record.id:
return return
with db.transaction(): with db.transaction():

13
ttfrog/webserver/controllers/character_sheet.py
View File

@ -1,8 +1,6 @@
from ttfrog.webserver.controllers.base import BaseController, query_factory from ttfrog.webserver.controllers.base import BaseController, DeferredSelectField
from ttfrog.db.schema import Character, Ancestry from ttfrog.db.schema import Character, Ancestry
from ttfrog.db.manager import db from wtforms_alchemy import ModelForm
from wtforms_alchemy import ModelForm, QuerySelectField
from wtforms.validators import InputRequired
from wtforms.fields import SubmitField from wtforms.fields import SubmitField
@ -11,14 +9,9 @@ class CharacterForm(ModelForm):
model = Character model = Character
exclude = ['slug'] exclude = ['slug']
def get_session():
return db.session
save = SubmitField() save = SubmitField()
delete = SubmitField() delete = SubmitField()
ancestry = DeferredSelectField('Ancestry', model=Ancestry, coerce=str, validate_choice=True)
ancestry = QuerySelectField('Ancestry', validators=[InputRequired()],
query_factory=query_factory(Ancestry), get_label='name')
class CharacterSheet(BaseController): class CharacterSheet(BaseController):