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

Fixed model conversion logic if property is not column

parent bde254c8
...@@ -79,6 +79,11 @@ class AdminModelConverter(ModelConverterBase): ...@@ -79,6 +79,11 @@ class AdminModelConverter(ModelConverterBase):
else: else:
# Ignore pk/fk # Ignore pk/fk
if hasattr(prop, 'columns'): if hasattr(prop, 'columns'):
# Check if more than one column mapped to the property
if len(prop.columns) != 1:
raise TypeError('Can not convert multiple-column properties (%s.%s)' % (model, prop.key))
# Grab column
column = prop.columns[0] column = prop.columns[0]
# Do not display foreign keys - use relations # Do not display foreign keys - use relations
...@@ -113,10 +118,6 @@ class AdminModelConverter(ModelConverterBase): ...@@ -113,10 +118,6 @@ class AdminModelConverter(ModelConverterBase):
# Apply label # Apply label
kwargs['label'] = self._get_label(prop.key, kwargs) kwargs['label'] = self._get_label(prop.key, kwargs)
# Check if more than one column mapped to the property
if len(prop.columns) != 1:
raise TypeError('Can not convert multiple-column properties (%s.%s)' % (model, prop.key))
# Figure out default value # Figure out default value
default = getattr(column, 'default', None) default = getattr(column, 'default', None)
...@@ -147,6 +148,8 @@ class AdminModelConverter(ModelConverterBase): ...@@ -147,6 +148,8 @@ class AdminModelConverter(ModelConverterBase):
return converter(model=model, mapper=mapper, prop=prop, return converter(model=model, mapper=mapper, prop=prop,
column=column, field_args=kwargs) column=column, field_args=kwargs)
return None
@classmethod @classmethod
def _string_common(cls, column, field_args, **extra): def _string_common(cls, column, field_args, **extra):
if column.type.length: if column.type.length:
......
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