Merge branch 'master' of https://git.fet.at/bofh/fet2020; make master pep8-ready again

This commit is contained in:
2020-09-07 11:42:16 +00:00
8 changed files with 129 additions and 132 deletions

View File

@@ -7,11 +7,13 @@ from django.utils.text import slugify
from django.utils.translation import gettext_lazy as _
from taggit.managers import TaggableManager
# import documents
from documents import ep
from .managers import (
PostManager, ArticleManager, NewsManager, AllEventManager, EventManager, FetMeetingManager
)
# from ckeditor_uploader import RichTextUploadingField
# import uuid
import re
@@ -145,7 +147,9 @@ class Post(models.Model):
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):
self.agenda_key = ep.createPadifNotExists(self.slug + "agenda")
print("AgendaKey: %s" % self.agenda_key)
print("should create an agenda document")
if self.has_protocol and (self.agenda_key == "" or self.agenda_key is None):