ajurna/cbwebreader
1
0
Fork 0
mirror of https://github.com/ajurna/cbwebreader.git synced 2025-12-06 06:17:17 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix for bug where i hadn't accounted for multiple users in the optimised queries.

Browse Source
This commit is contained in:
ajurna
2020-05-25 18:08:33 +01:00
parent fdeee527cc
commit 1f32d518bf
3 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
comic/util.py
View File

@@ -1,7 +1,7 @@
from collections import OrderedDict
from os import listdir, path
from django.db.models import Count, Q, F
from django.db.models import Count, Q, F, Max, ExpressionWrapper, Prefetch
from django.utils.http import urlsafe_base64_encode
from .models import ComicBook, Directory, Setting
@@ -142,8 +142,9 @@ def generate_directory(user, directory=False):
total_read=Count('comicbook__comicstatus',
Q(comicbook__comicstatus__finished=True,
comicbook__comicstatus__user=user)))
file_list_obj = file_list_obj.annotate(total_pages=Count('comicpage')).annotate(
last_read_page=F('comicstatus__last_read_page')).annotate(finished=F('comicstatus__finished')).annotate(unread=F('comicstatus__unread'))
file_list_obj = file_list_obj.filter(comicstatus__user=user).annotate(total_pages=Count('comicpage')).annotate(
last_read_page=F('comicstatus__last_read_page')).annotate(
finished=F('comicstatus__finished')).annotate(unread=F('comicstatus__unread'))
for directory_obj in dir_list_obj:
df = DirFile()