Merge branch 'master' into bbmaster
This commit is contained in:
commit
bf88e8f600
1 changed files with 1 additions and 1 deletions
|
@ -114,7 +114,7 @@ class GridFieldInstance(ListFieldInstance):
|
||||||
def unmarshallRow(self, row):
|
def unmarshallRow(self, row):
|
||||||
item = {}
|
item = {}
|
||||||
for fi in self.columnFieldInstances:
|
for fi in self.columnFieldInstances:
|
||||||
value = fi.unmarshall(row[fi.name])
|
value = fi.unmarshall(row.get(fi.name) or u'')
|
||||||
if isinstance(value, basestring):
|
if isinstance(value, basestring):
|
||||||
value = value.strip()
|
value = value.strip()
|
||||||
if fi.default is not None:
|
if fi.default is not None:
|
||||||
|
|
Loading…
Add table
Reference in a new issue