check condition before fields selection
This commit is contained in:
parent
4ee379f33c
commit
e20425952c
1 changed files with 3 additions and 3 deletions
|
|
@ -108,7 +108,7 @@ class IFormatter(object):
|
||||||
raise FieldNotFound(selected_field)
|
raise FieldNotFound(selected_field)
|
||||||
|
|
||||||
fields_iterator = obj.iter_fields() if hasattr(obj, 'iter_fields') else iter_fields(obj)
|
fields_iterator = obj.iter_fields() if hasattr(obj, 'iter_fields') else iter_fields(obj)
|
||||||
d = OrderedDict([(k, v) for k, v in iter_select_and_decorate(fields_iterator)])
|
d = dict(fields_iterator)
|
||||||
if condition is not None and not condition.is_valid(d):
|
if condition is not None and not condition.is_valid(d):
|
||||||
d = None
|
return None
|
||||||
return d
|
return OrderedDict([(k, v) for k, v in iter_select_and_decorate(d.iteritems())])
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue