rattail/appypod-rattail
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

[gen] Boolean field: bugfix (defaut layouts).

Browse source
This commit is contained in:
Gaetan Delannay 2014-11-30 11:38:29 +01:00
parent c11002b7d5
commit fa9ef1b76c
2 changed files with 13 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
fields/__init__.py
View file

@ -467,6 +467,15 @@ class Field:
self.hasHelp = self.hasLayoutElement('h', layouts) self.hasHelp = self.hasLayoutElement('h', layouts)
return layouts return layouts
@staticmethod
def copyLayouts(layouts):
'''Create a deep copy of p_layouts.'''
res = {}
for k, v in layouts.iteritems():
if isinstance(v, Table): res[k] = Table(other=v)
else: res[k] = v
return res
def hasLayoutElement(self, element, layouts): def hasLayoutElement(self, element, layouts):
'''This method returns True if the given layout p_element can be found '''This method returns True if the given layout p_element can be found
at least once among the various p_layouts defined for this field.''' at least once among the various p_layouts defined for this field.'''

6
fields/boolean.py
View file

@ -27,7 +27,7 @@ class Boolean(Field):
trueFalse = {True: 'true', False: 'false'} trueFalse = {True: 'true', False: 'false'}
# Default layout (render = "checkbox") ("b" stands for "base"). # Default layout (render = "checkbox") ("b" stands for "base").
bLayouts = {'view': 'lf', 'edit': Table('f;lrv;=', width=None), bLayouts = {'view': 'lf', 'edit': Table('f;lrv;-', width=None),
'search': 'l-f'} 'search': 'l-f'}
# Layout including a description. # Layout including a description.
dLayouts = {'view': 'lf', 'edit': Table('flrv;=d', width=None)} dLayouts = {'view': 'lf', 'edit': Table('flrv;=d', width=None)}
@ -97,7 +97,9 @@ class Boolean(Field):
self.pythonType = bool self.pythonType = bool
def getDefaultLayouts(self): def getDefaultLayouts(self):
return (self.render == 'radios') and self.rLayouts or self.bLayouts cp = Field.copyLayouts
if self.render == 'radios': return cp(Boolean.rLayouts)
return cp(Boolean.bLayouts)
def getValue(self, obj): def getValue(self, obj):
'''Never returns "None". Returns always "True" or "False", even if '''Never returns "None". Returns always "True" or "False", even if