[brubru] fallback to field 's identifier (var) when there is no Human-readable name (label). Fixes #4894
This commit is contained in:
parent
5bc09c2a6a
commit
93fd47256d
1 changed files with 8 additions and 2 deletions
|
@ -159,7 +159,10 @@ class DataField(ExtendedNode):
|
||||||
def label():
|
def label():
|
||||||
'''Human-readable field name.'''
|
'''Human-readable field name.'''
|
||||||
def fget(self):
|
def fget(self):
|
||||||
return self.getAttr('label')
|
l = self.getAttr('label')
|
||||||
|
if not l:
|
||||||
|
l = self.var
|
||||||
|
return l
|
||||||
|
|
||||||
def fset(self, value):
|
def fset(self, value):
|
||||||
assert isinstance(value, basestring)
|
assert isinstance(value, basestring)
|
||||||
|
@ -263,7 +266,10 @@ class ListField(DataField):
|
||||||
v = element.getTagData('value')
|
v = element.getTagData('value')
|
||||||
if v is None:
|
if v is None:
|
||||||
raise WrongFieldValue
|
raise WrongFieldValue
|
||||||
options.append((element.getAttr('label'), v))
|
l = element.getAttr('label')
|
||||||
|
if not l:
|
||||||
|
l = v
|
||||||
|
options.append((l, v))
|
||||||
return options
|
return options
|
||||||
|
|
||||||
def fset(self, values):
|
def fset(self, values):
|
||||||
|
|
Loading…
Add table
Reference in a new issue