some minor cosmetic changes on schema/field generation
git-svn-id: svn://svn.cy55.de/Zope3/src/cybertools/trunk@3222 fd906abe-77d9-0310-91a1-e0d9ade77398
This commit is contained in:
parent
7eddce81ac
commit
b13f705cc4
2 changed files with 3 additions and 20 deletions
|
@ -1,5 +1,5 @@
|
||||||
#
|
#
|
||||||
# Copyright (c) 2008 Helmut Merz helmutm@cy55.de
|
# Copyright (c) 2009 Helmut Merz helmutm@cy55.de
|
||||||
#
|
#
|
||||||
# This program is free software; you can redistribute it and/or modify
|
# This program is free software; you can redistribute it and/or modify
|
||||||
# it under the terms of the GNU General Public License as published by
|
# it under the terms of the GNU General Public License as published by
|
||||||
|
@ -81,24 +81,7 @@ class SchemaFactory(object):
|
||||||
continue
|
continue
|
||||||
field = interface[fname]
|
field = interface[fname]
|
||||||
info = fieldMapping.get(field.__class__)
|
info = fieldMapping.get(field.__class__)
|
||||||
if info is None:
|
f = createField(field, info)
|
||||||
info = getattr(field, '__typeInfo__', ('textline',))
|
|
||||||
voc = (getattr(field, 'vocabulary', ()) or
|
|
||||||
getattr(field, 'vocabularyName', None))
|
|
||||||
f = Field(field.getName(),
|
|
||||||
fieldType=info[0],
|
|
||||||
fieldTypeInfo=len(info) > 1 and info[1] or None,
|
|
||||||
required=field.required,
|
|
||||||
default=field.default,
|
|
||||||
default_method=getattr(field, 'default_method', None),
|
|
||||||
vocabulary=voc,
|
|
||||||
title=field.title,
|
|
||||||
description=field.description,
|
|
||||||
readonly=field.readonly,
|
|
||||||
#value_type=getattr(field, 'value_type', None),
|
|
||||||
nostore=getattr(field, 'nostore', False),
|
|
||||||
multiple=getattr(field, 'multiple', False),
|
|
||||||
baseField=field,)
|
|
||||||
fields.append(f)
|
fields.append(f)
|
||||||
return Schema(name=interface.__name__, *fields, **kw)
|
return Schema(name=interface.__name__, *fields, **kw)
|
||||||
|
|
||||||
|
|
|
@ -44,7 +44,7 @@ class GridFieldInstance(ListFieldInstance):
|
||||||
|
|
||||||
@Lazy
|
@Lazy
|
||||||
def columnTypes(self):
|
def columnTypes(self):
|
||||||
return [createField(t) for t in self.context.baseField.column_types]
|
return [createField(t) for t in self.context.column_types]
|
||||||
|
|
||||||
@Lazy
|
@Lazy
|
||||||
def columnFieldInstances(self):
|
def columnFieldInstances(self):
|
||||||
|
|
Loading…
Add table
Reference in a new issue