Issue-3187: addressing review comments
This commit is contained in:
parent
1a682753c0
commit
5ef104b802
2 changed files with 9 additions and 5 deletions
|
@ -1,4 +1,5 @@
|
|||
""" non-interactive pages """
|
||||
from datetime import date
|
||||
from django.contrib.auth.decorators import login_required
|
||||
from django.core.paginator import Paginator
|
||||
from django.db.models import Q
|
||||
|
@ -51,8 +52,11 @@ class Feed(View):
|
|||
paginated = Paginator(filtered_activities, PAGE_LENGTH)
|
||||
|
||||
suggestions = suggested_users.get_suggestions(request.user)
|
||||
|
||||
readthroughs = models.ReadThrough.objects.filter(user=request.user)
|
||||
cutoff = date(get_annual_summary_year(), 12, 31)
|
||||
readthroughs = models.ReadThrough.objects.filter(
|
||||
user=request.user,
|
||||
finish_date__lte=cutoff
|
||||
)
|
||||
|
||||
data = {
|
||||
**feed_page_data(request.user),
|
||||
|
@ -68,7 +72,7 @@ class Feed(View):
|
|||
"path": f"/{tab['key']}",
|
||||
"annual_summary_year": get_annual_summary_year(),
|
||||
"has_tour": True,
|
||||
"has_read_throughs": True if len(readthroughs) else False,
|
||||
"has_read_throughs": len(readthroughs) > 0,
|
||||
},
|
||||
}
|
||||
return TemplateResponse(request, "feed/feed.html", data)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue