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

Merge pull request #79

Browse Source 
* resetting a users password forgot to save.

* resetting a users password forgot to save.
This commit is contained in:
Ajurna
2022-10-04 21:24:10 +01:00
committed by GitHub
parent 2647a0e31e
commit 466791ce6b
7 changed files with 693 additions and 672 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
comic/processing.py
View File

@@ -7,7 +7,8 @@ from typing import NamedTuple, List, Optional, Union
import rarfile
from django.conf import settings
from django.contrib.auth.models import User
from django.db.models import Count, Q, F, Case, When, PositiveSmallIntegerField, QuerySet
from django.db.models import Count, Q, F, Case, When, PositiveSmallIntegerField, QuerySet, ExpressionWrapper, \
IntegerField
from comic import models
from comic.errors import NotCompatibleArchive
@@ -27,8 +28,8 @@ def generate_directory(user: User, directory: Optional[models.Directory] = None)
total=Count('comicbook', distinct=True),
progress=Count('comicbook__comicstatus', Q(comicbook__comicstatus__finished=True,
comicbook__comicstatus__user=user), distinct=True),
finished=Q(total=F('progress')),
unread=Q(total__gt=F('progress'))
finished=ExpressionWrapper(Q(total=F('progress')), output_field=IntegerField()),
unread=ExpressionWrapper(Q(total__gt=F('progress')), output_field=IntegerField()),
)
files.extend(dir_db_query)