show all post with event start in calendar

This commit is contained in:
2020-12-12 11:20:55 +00:00
parent 28610ae1ab
commit 45db82eca5
2 changed files with 5 additions and 3 deletions

View File

@@ -10,7 +10,8 @@ class PostManager(models.Manager):
def get_visible_articles(self): def get_visible_articles(self):
return self.get_queryset().filter(is_hidden=False) return self.get_queryset().filter(is_hidden=False)
def all_post_with_date(self):
return self.get_queryset().filter(Q(event_start__isnull=False) & Q(event_end__isnull=False)).order_by('-event_start')
class ArticleManager(models.Manager): class ArticleManager(models.Manager):
""" """
Provide a query set only for "Article" Provide a query set only for "Article"

View File

@@ -8,7 +8,7 @@ from django_filters.rest_framework import DjangoFilterBackend
from rest_framework import viewsets from rest_framework import viewsets
from taggit.models import Tag from taggit.models import Tag
from .models import Post, FetMeeting from .models import Post, FetMeeting, Event
from .serializers import PostSerializer from .serializers import PostSerializer
from documents.api import get_pad_link from documents.api import get_pad_link
from documents.etherpadlib import add_ep_cookie from documents.etherpadlib import add_ep_cookie
@@ -33,8 +33,9 @@ def index(request):
return render(request, 'posts/index.html', {"posts": posts, "tags_list": t}) return render(request, 'posts/index.html', {"posts": posts, "tags_list": t})
def calendar(request): def calendar(request):
events=deque(Post.objects.get_visible_articles().order_by('-public_date')) events=deque(Post.objects.all_post_with_date().all())
return render(request, 'posts/fet_calendar.ics', {"events": events},content_type='text/calendar') return render(request, 'posts/fet_calendar.ics', {"events": events},content_type='text/calendar')
def tags(request, tag=""): def tags(request, tag=""):
posts = deque(Post.objects.get_visible_articles().filter(tags__name=tag)) posts = deque(Post.objects.get_visible_articles().filter(tags__name=tag))
featured_post = Post.objects.get_visible_articles().filter(slug=tag).first() featured_post = Post.objects.get_visible_articles().filter(slug=tag).first()