rattail/tailbone
2
0
Fork 0
Code Issues 2 Pull requests Projects Releases Packages Wiki Activity Actions

Remove all deprecated use_buefy logic

Browse source 
also remove some static files no longer used, etc.
This commit is contained in:
Lance Edgar 2023-02-03 12:05:17 -06:00
parent 01e5eee981
commit 9faaea881d
112 changed files with 2079 additions and 7039 deletions
Download patch file Download diff file Expand all files Collapse all files

38
tailbone/forms/core.py
View file

@ -24,12 +24,9 @@
Forms Core
"""
from __future__ import unicode_literals, absolute_import
import json
import logging
import six
import sqlalchemy as sa
from sqlalchemy import orm
from sqlalchemy.ext.associationproxy import AssociationProxy, ASSOCIATION_PROXY
@ -338,7 +335,7 @@ class Form(object):
model_instance=None, model_class=None, appstruct=UNSPECIFIED, nodes={}, enums={}, labels={},
assume_local_times=False, renderers=None, renderer_kwargs={},
hidden={}, widgets={}, defaults={}, validators={}, required={}, helptext={}, focus_spec=None,
action_url=None, cancel_url=None, use_buefy=True, component='tailbone-form',
action_url=None, cancel_url=None, component='tailbone-form',
vuejs_field_converters={},
# TODO: ugh this is getting out hand!
can_edit_help=False, edit_help_url=None, route_prefix=None,
@ -377,7 +374,6 @@ class Form(object):
self.focus_spec = focus_spec
self.action_url = action_url
self.cancel_url = cancel_url
self.use_buefy = use_buefy
self.component = component
self.vuejs_field_converters = vuejs_field_converters or {}
self.can_edit_help = can_edit_help
@ -758,10 +754,7 @@ class Form(object):
def render(self, template=None, **kwargs):
if not template:
if self.readonly and not self.use_buefy:
template = '/forms/form_readonly.mako'
else:
template = '/forms/form.mako'
template = '/forms/form.mako'
context = kwargs
context['form'] = self
return render(template, context)
@ -806,10 +799,7 @@ class Form(object):
def render_deform(self, dform=None, template=None, **kwargs):
if not template:
if self.use_buefy:
template = '/forms/deform_buefy.mako'
else:
template = '/forms/deform.mako'
template = '/forms/deform_buefy.mako'
if dform is None:
dform = self.make_deform_form()
@ -829,11 +819,8 @@ class Form(object):
context.setdefault('form_kwargs', {})
# TODO: deprecate / remove the latter option here
if self.auto_disable_save or self.auto_disable:
if self.use_buefy:
context['form_kwargs'].setdefault('ref', self.component_studly)
context['form_kwargs']['@submit'] = 'submit{}'.format(self.component_studly)
else:
context['form_kwargs']['class_'] = 'autodisable'
context['form_kwargs'].setdefault('ref', self.component_studly)
context['form_kwargs']['@submit'] = 'submit{}'.format(self.component_studly)
if self.focus_spec:
context['form_kwargs']['data-focus'] = self.focus_spec
context['request'] = self.request
@ -975,8 +962,7 @@ class Form(object):
if self.readonly or fieldname in self.readonly_fields:
html = self.render_field_value(fieldname) or HTML.tag('span')
elif field:
html = field.serialize(use_buefy=True,
**self.get_renderer_kwargs(fieldname))
html = field.serialize(**self.get_renderer_kwargs(fieldname))
html = HTML.literal(html)
# may need a complex label
@ -1064,7 +1050,7 @@ class Form(object):
value = self.obtain_value(record, field_name)
if value is None:
return ""
return six.text_type(value)
return str(value)
def render_datetime(self, record, field_name):
value = self.obtain_value(record, field_name)
@ -1099,7 +1085,7 @@ class Form(object):
return "(${:0,.2f})".format(0 - value)
return "${:0,.2f}".format(value)
except ValueError:
return six.text_type(value)
return str(value)
def render_quantity(self, obj, field):
value = self.obtain_value(obj, field)
@ -1124,8 +1110,8 @@ class Form(object):
return ""
enum = self.enums.get(field_name)
if enum and value in enum:
return six.text_type(enum[value])
return six.text_type(value)
return str(enum[value])
return str(value)
def render_codeblock(self, record, field_name):
value = self.obtain_value(record, field_name)
@ -1193,8 +1179,8 @@ class Form(object):
controls[i][1] = 'true'
elif value is False:
controls[i][1] = 'false'
elif not isinstance(value, six.string_types):
controls[i][1] = six.text_type(value)
elif not isinstance(value, str):
controls[i][1] = str(value)
dform = self.make_deform_form()
try: