From df958fdded67149f11a85274abbc70f95e9d2545 Mon Sep 17 00:00:00 2001
From: andis <andis@fet.at>
Date: Sun, 30 Aug 2020 17:56:33 +0000
Subject: [PATCH] =?UTF-8?q?author=20wieder=20zur=C3=BCck=20&=20events=20fi?=
 =?UTF-8?q?lter?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 fet2020/fet2020/views.py          |  2 +-
 fet2020/posts/admin.py            |  3 ++-
 fet2020/posts/models.py           | 17 +++++++++++++++--
 fet2020/templates/posts/show.html | 26 +++++++++++++++++++-------
 4 files changed, 37 insertions(+), 11 deletions(-)

diff --git a/fet2020/fet2020/views.py b/fet2020/fet2020/views.py
index 53c6f739..caab4b18 100644
--- a/fet2020/fet2020/views.py
+++ b/fet2020/fet2020/views.py
@@ -20,7 +20,7 @@ def index(request):
 
     context = {
         'posts': posts,
-        'events': Event.objects.all(),
+        'events': Event.objects.get_five_events(),
         'featured_post': featured_post,
         'featured_post2': FetMeeting.objects.first(),
         'tags_list': ", ".join(t)
diff --git a/fet2020/posts/admin.py b/fet2020/posts/admin.py
index 64c86842..24f3b901 100644
--- a/fet2020/posts/admin.py
+++ b/fet2020/posts/admin.py
@@ -40,7 +40,8 @@ class MyPostAdmin(admin.ModelAdmin):
         )
 
     def save_model(self, request, obj, form, change):
-        obj.author = request.user
+        if obj.author is None:
+            obj.author = request.user
         super().save_model(request, obj, form, change)
 
     class Media:
diff --git a/fet2020/posts/models.py b/fet2020/posts/models.py
index b31933a3..399aaa12 100644
--- a/fet2020/posts/models.py
+++ b/fet2020/posts/models.py
@@ -8,6 +8,8 @@ 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 ckeditor_uploader import RichTextUploadingField
 # import uuid
@@ -63,7 +65,11 @@ class EventManager(models.Manager):
             Q(is_event=True)
             & Q(event_start__gt=date_today)
         ).order_by('-event_start')
-
+    def get_five_events(self):
+        date_today = timezone.now().date()
+        return super().get_queryset().filter(
+            Q(is_event=True)
+        ).order_by('-event_start')[:5]
 
 class FetMeetingManager(models.Manager):
     def get_queryset(self):
@@ -185,13 +191,20 @@ class Post(models.Model):
         return reverse('posts.show', kwargs={"id": self.slug})
 
     @property
-    def username(self):
+    def author_member(self):
         return (Member.all_members.get(nickname=self.author.username))
 
     def save(self, *args, **kwargs):
         "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)
+        
+        if self.has_agenda and (self.agenda_key =="" or self.agenda_key is None):
+            print("should create an agenda document")
+
+        if self.has_protocol and (self.agenda_key =="" or self.agenda_key is None):
+            print("should initialize protocol document")
+
         super().save(*args, **kwargs)
 
         self.tags.set(
diff --git a/fet2020/templates/posts/show.html b/fet2020/templates/posts/show.html
index cc10f856..2dbbfdcf 100644
--- a/fet2020/templates/posts/show.html
+++ b/fet2020/templates/posts/show.html
@@ -15,13 +15,17 @@
           </div>
           <div class="article-details">
           {{post.subtitle | tags_to_url }}
-          {% if post.username != None %}
-            <div class="article-author">
-              <img src="{{post.author.image | thumbnail_url:'avatar'}}" alt="" />
-              <a href="/members/member/{{post.author}}">{{post.author}}</a>
-
+          {% if post.author_member != None %}
+            <div class="article-author"><a href="{% url 'member' post.author_member.nickname %}">
+              <img src="{{post.author_member.image | thumbnail_url:'avatar'}}" alt="" />
+              {{post.author}}</a>
             </div>
-            {% endif  %}
+          {% else %}
+            <div class="article-author"><a href="">
+              <img src="" alt="" />
+              FET</a>
+            </div>  
+          {% endif  %}
             
           </div> <button class="">
         
@@ -36,8 +40,16 @@
  <a href="{% url 'posts.show' next %}">Nächster Artikel</a><br>
 {{post.event_start}}
 {{post.event_end}}
+
+{% if post.has_agenda %}
 <a href="{{ep_link}}">EP</a>
-<a href="{% url "admin:posts_news_change" post.id %}">{% url "admin:posts_news_change" post.slug %}</a>
+{% endif %}
+
+
+--
+<a href="{% url "admin:posts_news_change" post.id %}">Bearbeiten</a>
+
+
 <hr>
 {{post.body | safe | add_internal_links | tags_to_url}}
 <hr>