add pinned news, delete db vlaue 'is_event'

This commit is contained in:
2020-09-05 15:19:04 +00:00
parent 9361788d1a
commit 3dc6085396
6 changed files with 101 additions and 93 deletions

View File

@@ -1,14 +1,16 @@
from django.contrib.auth.models import User
from django.core.validators import ValidationError
from django.db import models
from django.db.models import Q
from django.urls import reverse
from django.utils import timezone
from django.utils.text import slugify
from django.utils.translation import gettext_lazy as _
from members.models import Member
from taggit.managers import TaggableManager
# import documents
from .managers import (
PostManager, ArticleManager, NewsManager, AllEventManager, EventManager, FetMeetingManager
)
# from ckeditor_uploader import RichTextUploadingField
@@ -22,83 +24,6 @@ import logging
logger = logging.getLogger('posts')
############
# MANAGERS #
############
class PostManager(models.Manager):
def get_queryset(self):
return super().get_queryset()
class ArticleManager(models.Manager):
"""
Provide a query set only for "Article"
regular fet meetings should not be contained in the news stream
"""
def get_queryset(self):
return super().get_queryset().filter(
Q(post_type='E')
| Q(post_type='N')
).order_by('-public_date')
class NewsManager(models.Manager):
def get_queryset(self):
return super().get_queryset().filter(~Q(is_event=True))
class EventManager(models.Manager):
"""
Provide a query set only for "Events"
regular fet meetings should not be contained in the news stream
"""
def get_queryset(self):
return super().get_queryset().filter(
Q(is_event=True)
& ~Q(post_type='F')
).order_by('-public_date')
def get_all_events(self):
date_today = timezone.now().date()
return super().get_queryset().filter(
Q(is_event=True)
& Q(event_start__gt=date_today)
).order_by('-event_start')
def get_five_events(self):
return super().get_queryset().filter(
Q(is_event=True)
).order_by('-event_start')[:5]
class FetMeetingManager(models.Manager):
def get_queryset(self):
return super().get_queryset().filter(Q(post_type='F'))
def _get_last_meeting(self):
date_today = timezone.now()
return self.get_queryset().filter(
Q(event_start__lt=date_today)
).order_by('-event_start').first()
def _get_next_meeting(self):
date_today = timezone.now()
return self.get_queryset().filter(
Q(event_start__gt=date_today)
).order_by('event_start').first()
def get_meetings(self):
meetings = []
meetings.append(self._get_next_meeting())
meetings.append(self._get_last_meeting())
return meetings
##########
# MODELS #
##########
class Category(models.Model):
# Titel des Posts
title = models.CharField(max_length=200)
@@ -146,7 +71,8 @@ class Post(models.Model):
]
post_type = models.CharField(max_length=1, choices=__choices, editable=False)
is_event = models.BooleanField(default=False)
# post is pinned at main page
is_pinned = models.BooleanField(default=False)
# Zusatz Info wenn ein Event gepostet wird
event_start = models.DateTimeField('Event Start', null=True, blank=True)
@@ -165,7 +91,7 @@ class Post(models.Model):
# Managers
objects = PostManager()
article_objects = ArticleManager()
articles = ArticleManager()
def get_tags(self):
"""Returns assigned tags as a comma seperated list."""
@@ -269,7 +195,8 @@ class News(Post):
class Event(Post):
objects = EventManager()
only_events = EventManager()
all_events = AllEventManager()
class Meta:
proxy = True
@@ -292,8 +219,6 @@ class Event(Post):
raise ValidationError(_('Das Ende des Events liegt vor dem Beginn.'))
def save(self, *args, **kwargs):
self.is_event = True
if not self.post_type:
self.post_type = 'E'