tighten format_field_extended

This commit is contained in:
Kovid Goyal 2012-04-23 23:48:14 +05:30
parent 0c92994128
commit 4374e16bc8

View File

@ -650,11 +650,7 @@ class Metadata(object):
res = self.get(key, None) res = self.get(key, None)
cmeta = self.get_user_metadata(key, make_copy=False) cmeta = self.get_user_metadata(key, make_copy=False)
name = unicode(cmeta['name']) name = unicode(cmeta['name'])
if cmeta['datatype'] != 'composite' and (res is None or res == ''): if res in {None, ''}:
return (name, res, None, None)
orig_res = res
cmeta = self.get_user_metadata(key, make_copy=False)
if res is None or res == '':
return (name, res, None, None) return (name, res, None, None)
orig_res = res orig_res = res
datatype = cmeta['datatype'] datatype = cmeta['datatype']