This commit is contained in:
Kovid Goyal 2013-07-20 10:41:36 +05:30
parent 4ffb8e2202
commit f6d8c8f1cd

View File

@ -674,7 +674,7 @@ class BooksModel(QAbstractTableModel): # {{{
def func(idx): def func(idx):
return by if fffunc(field_obj, idfunc(idx)) else bb return by if fffunc(field_obj, idfunc(idx)) else bb
elif dt in {'text', 'comments', 'composite', 'enumeration'}: elif dt in {'text', 'comments', 'composite', 'enumeration'}:
if m['is_multiple']: if m['is_multiple'] and not field_obj.is_composite:
jv = m['is_multiple']['list_to_ui'] jv = m['is_multiple']['list_to_ui']
do_sort = field == 'tags' do_sort = field == 'tags'
if do_sort: if do_sort:
@ -717,7 +717,7 @@ class BooksModel(QAbstractTableModel): # {{{
if fmt: if fmt:
try: try:
return QVariant(fmt.format(val)) return QVariant(fmt.format(val))
except (TypeError, ValueError, AttributeError, IndexError): except (TypeError, ValueError, AttributeError, IndexError, KeyError):
pass pass
return QVariant(val) return QVariant(val)
else: else: