From 62aeaecaf291c188d8bd9ee58c1a867129d0a1ee Mon Sep 17 00:00:00 2001
From: Patrick <patrick@fet.at>
Date: Tue, 30 Jun 2020 22:11:31 +0000
Subject: [PATCH] change name 'news_type' to 'post_type' implement a  better
 condition to set post_type

---
 fet2020/posts/models.py | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/fet2020/posts/models.py b/fet2020/posts/models.py
index 46a96eff..90a8a12d 100644
--- a/fet2020/posts/models.py
+++ b/fet2020/posts/models.py
@@ -33,7 +33,7 @@ class ArticleManager(models.Manager):
     regular fet meetings should not be contained in the news stream
     """
     def get_queryset(self):
-        return super().get_queryset().filter(Q(news_type='E') | Q(news_type='N'))
+        return super().get_queryset().filter(Q(post_type='E') | Q(post_type='N'))
 
 class NewsManager(models.Manager):
     def get_queryset(self):
@@ -45,11 +45,11 @@ class EventManager(models.Manager):
     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(news_type='E'))
+        return super().get_queryset().filter(Q(is_event=True) & Q(post_type='E'))
 
 class FetMeetingManager(models.Manager):
     def get_queryset(self):
-        return super().get_queryset().filter(Q(news_type='F'))
+        return super().get_queryset().filter(Q(post_type='F'))
 
 
 ##########
@@ -100,7 +100,7 @@ class Post(models.Model):
         ('E', _('Event')),
         ('F', _('FetMeeting'))
     ]
-    news_type = models.CharField(max_length=1, choices=__choices, default='N', editable=False)
+    post_type = models.CharField(max_length=1, choices=__choices, editable=False)
 
     is_event = models.BooleanField(default=False)
 
@@ -163,12 +163,12 @@ class Post(models.Model):
         "save the post with some defaults"
         if (self.id is None) and (not self.slug):
             self.slug = slugify(self.public_date.date()) + "-" + slugify(self.title)
-        
+
         super().save(*args, **kwargs)
 
         self.tags.set(*re.findall(r'\#([\d\w-]+)', str(self.subtitle)),
                       *re.findall(r'\#([\d\w-]+)', str(self.title)))
-   
+
     def __str__(self):
         return "Post (%s, %s): %s " %(self.slug, self.public_date.strftime("%d.%m.%Y"), self.title)
 
@@ -199,7 +199,8 @@ class News(Post):
         verbose_name_plural = "News"
    
     def save(self, *args, **kwargs):
-        self.news_type = 'N'
+        if not self.post_type:
+            self.post_type = 'N'
     
         super().save(*args, **kwargs)
 
@@ -211,8 +212,9 @@ class Event(Post):
        
     def save(self, *args, **kwargs):
         self.is_event = True
-        if self.news_type == 'N':
-            self.news_type = 'E'
+
+        if not self.post_type:
+            self.post_type = 'E'
 
         super().save(*args, **kwargs)
 
@@ -240,8 +242,8 @@ class FetMeeting(Event):
         # self.protocol_key
         # self.agenda_key
 
-        if self.news_type == 'N':
-            self.news_type = 'F'
+        if not self.post_type:
+            self.post_type = 'F'
 
         if not self.event_place:
             self.event_place = "FET"