Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-08 10:44:09 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/cbhaley/calibre

Browse Source 
Template language: Fix annotations_count() not ignoring removed annotations. Fixes #1904305 [annotation_count() displaying value for deleted annotations](https://bugs.launchpad.net/calibre/+bug/1904305)
This commit is contained in:
Kovid Goyal 2020-11-15 18:13:06 +05:30
commit 1e4e3d809a
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/calibre/db/backend.py
View File

@ -1949,7 +1949,10 @@ class DB(object):
return changed return changed
def annotation_count_for_book(self, book_id): def annotation_count_for_book(self, book_id):
for (count,) in self.execute('SELECT count(id) FROM annotations WHERE book=?', (book_id,)): for (count,) in self.execute('''
SELECT count(id) FROM annotations
WHERE book=? AND json_extract(annot_data, "$.removed") IS NULL
''', (book_id,)):
return count return count
return 0 return 0