mirror of
https://github.com/kovidgoyal/calibre.git
synced 2025-07-09 03:04:10 -04:00
Merge branch 'master' of https://github.com/cbhaley/calibre
This commit is contained in:
commit
fdd145245d
@ -1737,8 +1737,10 @@ class TagsModel(QAbstractItemModel): # {{{
|
|||||||
for cat in user_cats.keys():
|
for cat in user_cats.keys():
|
||||||
new_cat = []
|
new_cat = []
|
||||||
for val, key, _ in user_cats[cat]:
|
for val, key, _ in user_cats[cat]:
|
||||||
datatype = cache.field_metadata.get(key, {}).get('datatype', '*****')
|
datatype = cache.field_metadata.get(key, {}).get('datatype')
|
||||||
if datatype != 'composite':
|
# datatype can be None if a column used in user categories has
|
||||||
|
# been deleted. Remove it from the user categories
|
||||||
|
if datatype is not None and datatype != 'composite':
|
||||||
id_ = cache.get_item_id(key, val, case_sensitive=True)
|
id_ = cache.get_item_id(key, val, case_sensitive=True)
|
||||||
if id_ is not None:
|
if id_ is not None:
|
||||||
v = cache.books_for_field(key, id_)
|
v = cache.books_for_field(key, id_)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user