Commit e3619ad1 authored by Serge S. Koval's avatar Serge S. Koval

Merge pull request #122 from bjourne/master

use prettify_name so that you can easily override the default prettification strategy
parents 22ff9439 479bf47c
from wtforms import fields, validators from wtforms import fields, validators
# Field has better input parsing capabilities.
from wtforms.ext.dateutil.fields import DateTimeField
from sqlalchemy import Boolean, Column from sqlalchemy import Boolean, Column
from flask.ext.admin import form from flask.ext.admin import form
...@@ -21,6 +23,13 @@ class AdminModelConverter(ModelConverterBase): ...@@ -21,6 +23,13 @@ class AdminModelConverter(ModelConverterBase):
self.view = view self.view = view
def _get_label(self, name, field_args): def _get_label(self, name, field_args):
"""
Label for field name. If it is not specified explicitly,
then the views prettify_name method is used to find it.
:param field_args:
Dictionary with additional field arguments
"""
if 'label' in field_args: if 'label' in field_args:
return field_args['label'] return field_args['label']
...@@ -29,7 +38,7 @@ class AdminModelConverter(ModelConverterBase): ...@@ -29,7 +38,7 @@ class AdminModelConverter(ModelConverterBase):
if column_labels: if column_labels:
return column_labels.get(name) return column_labels.get(name)
return None return self.view.prettify_name(name)
def _get_field_override(self, name): def _get_field_override(self, name):
form_overrides = getattr(self.view, 'form_overrides', None) form_overrides = getattr(self.view, 'form_overrides', None)
...@@ -203,7 +212,7 @@ class AdminModelConverter(ModelConverterBase): ...@@ -203,7 +212,7 @@ class AdminModelConverter(ModelConverterBase):
@converts('DateTime') @converts('DateTime')
def convert_datetime(self, field_args, **extra): def convert_datetime(self, field_args, **extra):
field_args['widget'] = form.DateTimePickerWidget() field_args['widget'] = form.DateTimePickerWidget()
return fields.DateTimeField(**field_args) return DateTimeField(**field_args)
@converts('Time') @converts('Time')
def convert_time(self, field_args, **extra): def convert_time(self, field_args, **extra):
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment