Merge branch 'master' of https://git.fet.at/bofh/fet2020

fet2020/documents/__init__.py

@@ -6,7 +6,7 @@ import urllib.parse
 t = datetime.now() + timedelta(days=1)
 
 
-from .etherpadlib import get_ep_sessionid2, add_ep_cookie
+# from .etherpadlib import get_ep_sessionid2, add_ep_cookie
 
 
 SERVER_URL = "https://etherpad2.2020.fet.at/"

fet2020/documents/etherpadlib.py

@@ -1,11 +1,9 @@
 from etherpad_lite import EtherpadLiteClient
 
 from datetime import datetime, timedelta
-from django.utils.text import slugify
+# from django.utils.text import slugify
 import urllib.parse
-from django.conf import settings
-
-
+# from django.conf import settings
 
 
 with open("/srv/andis_test/etherpad_test2/etherpad-lite/APIKEY.txt", "r") as f:
@@ -42,6 +40,7 @@ def get_ep_sessionid2(request):
 
     return result['sessionID'], expires
 
+
 def add_ep_cookie(request, response):
     response.set_cookie("HILib", "TestWert", domain="https://andis.2020.fet.at")
     ep_sessid, expires = get_ep_sessionid2(request)
@@ -52,4 +51,4 @@ def add_ep_cookie(request, response):
         domain=".2020.fet.at",
         path="/"
     )
-    return response
+    return response

fet2020/fet2020/settings.py

@@ -194,4 +194,4 @@ THUMBNAIL_ALIASES = {
 ETHERPAD_CLIENT = {
     'url': "http://localhost:9003"
 
-}
+}

fet2020/members/urls.py

@@ -10,4 +10,4 @@ urlpatterns = [
     path('jobs/<str:slug>', views.jobs_view),
     path('job/<str:slug>', views.job_view),
     path('member/<str:member_name>', views.profile_view, name="member"),
-]
+]

fet2020/members/views.py

@@ -10,7 +10,6 @@ from rest_framework import permissions
 # from django_filters.rest_framework import DjangoFilterBackend
 
 
-
 def index(request, slug=None, filter=None):
     job_group = deque(JobGroup.objects.all())
     members = None
@@ -51,7 +50,7 @@ def jobs_view(request, slug=None):
 def job_view(request, slug=None):
     job_group = deque(JobGroup.objects.all())
     job_list = []
-    job=Job.objects.get(slug=slug)
+    job = Job.objects.get(slug=slug)
     job_names = [job.name]
     active_members = JobMember.active_member.get_members_of_job(job_names=job_names)
     inactive_members = JobMember.inactive_member.get_members_of_job(job_names=job_names)

fet2020/posts/models.py

@@ -8,7 +8,7 @@ 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
+# import documents
 
 
 # from ckeditor_uploader import RichTextUploadingField
@@ -65,12 +65,13 @@ 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):
         return super().get_queryset().filter(Q(post_type='F'))
@@ -198,11 +199,11 @@ 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)
-        
-        if self.has_agenda and (self.agenda_key =="" or self.agenda_key is None):
+
+        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):
+        if self.has_protocol and (self.agenda_key == "" or self.agenda_key is None):
             print("should initialize protocol document")
 
         super().save(*args, **kwargs)

fet2020/posts/templatetags/post_helpers.py

@@ -2,10 +2,12 @@ from django import template
 import re
 from django.template.defaultfilters import stringfilter
 from django.utils.safestring import mark_safe
-register = template.Library()
 from django.urls import reverse
 from members.models import Member, Job
 
+register = template.Library()
+
+
 @register.filter(is_safe=True)
 @stringfilter
 def tags_to_url(value):
@@ -14,24 +16,25 @@ def tags_to_url(value):
 
 
 def create_a_link_for(v):
-    v=v.group(1)
+    v = v.group(1)
     try:
         m = Member.all_members.get(nickname=v)
-        return '<a href="' + str(reverse('member', kwargs= {"member_name": m.nickname})) + '">' + v + "</a>"    
-    except:
+        str_nickname = str(reverse('member', kwargs={"member_name": m.nickname}))
+        return '<a href="' + str_nickname + '">' + v + "</a>"
+    except Exception:
         m = None
-    try: 
+    try:
         j = Job.objects.filter(shortterm=v).first
         if j:
-            return '<a href="' +'"'> + j.name + '</a>'
-    except: 
-        j=None
+            return '<a href="' + '"' > + j.name + '</a>'
+    except Exception:
+        j = None
+
+    return "<a href=\"/posts/%s\">%s</a>" % (v, v)
 
-        
-    return "<a href=\"/posts/%s\">%s</a>" % (v,v)
 
 @register.filter(is_safe=True)
 def add_internal_links(value):
-    #m=Member.all_members.get(value)
+    # m=Member.all_members.get(value)
 
-    return mark_safe(re.sub(r'\[\[([\d\w-]+)\]\]',create_a_link_for, value))
+    return mark_safe(re.sub(r'\[\[([\d\w-]+)\]\]', create_a_link_for, value))

fet2020/posts/views.py

@@ -10,9 +10,10 @@ from rest_framework import viewsets
 # from rest_framework import permissions
 
 from .models import Post, PostSerializer
-from members.models import Member
-# from documents import add_ep_to_response
-from documents import get_ep_sessionid2, get_pad_link,add_ep_cookie
+# from members.models import Member
+# from documents import add_ep_to_response, get_ep_sessionid2
+from documents import get_pad_link
+from documents.etherpadlib import add_ep_cookie
 
 from collections import deque
 
@@ -47,7 +48,7 @@ def show(request, id=None):
     elif id != "" and id is not None:
         p = Post.objects.get(slug=(id))
 
-    post_author = Member.all_members.filter(nickname=p.author)
+    # post_author = Member.all_members.filter(nickname=p.author)
 
     context = {
         "post": p,
@@ -59,7 +60,7 @@ def show(request, id=None):
 
     response = render(request, 'posts/show.html', context)
 
-    return add_ep_cookie(request,response)
+    return add_ep_cookie(request, response)
 
 
 ###########