From 4f46a3d694351a2814a53efd4f1d867cd0493928 Mon Sep 17 00:00:00 2001 From: "root (fetsite6)" Date: Mon, 19 Oct 2020 22:27:29 +0200 Subject: [PATCH] datetime API fix --- fet2020/documents/api.py | 1 + fet2020/posts/models.py | 11 ++++++++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/fet2020/documents/api.py b/fet2020/documents/api.py index ee6dde9d..bbd093a0 100644 --- a/fet2020/documents/api.py +++ b/fet2020/documents/api.py @@ -56,6 +56,7 @@ def __checkPadExists(padID=None): def createPadifNotExists(padID): epc, group = get_ep_client() if not epc: + logger.info("if not epc") return None # Pad doesn't exist diff --git a/fet2020/posts/models.py b/fet2020/posts/models.py index bb7cf891..c93cca94 100644 --- a/fet2020/posts/models.py +++ b/fet2020/posts/models.py @@ -110,7 +110,10 @@ class Post(models.Model): def agenda_html(self, value): request_logger.info("Accessing etherpad ...") if not self.agenda_key: - self.agenda_key= self.__get_agenda_key() + request_logger.info("not agenda key!") + self.agenda_key = self.__get_agenda_key() + request_logger.info("AGENDA KEY: "+self.agenda_key) + request_logger.info("VALUE: "+value) setPadHTML(self.agenda_key, value) request_logger.info("set etherpad!") return value @@ -156,10 +159,10 @@ class Post(models.Model): def save(self, *args, **kwargs): # save the post with some defaults if not self.public_date: - self.public_date = timezone.now() + self.public_date = timezone.now().date() if not self.slug: - self.slug = slugify(self.public_date.date()) + "-" + slugify(self.title) + self.slug = slugify(self.public_date) + "-" + slugify(self.title) super().save(*args, **kwargs) @@ -171,6 +174,7 @@ class Post(models.Model): def __get_agenda_key(self): try: self.agenda_key = createPadifNotExists(self.slug + "-agenda") + return self.agenda_key except Exception as e: raise ValidationError( _('Die Agenda konnte nicht erstellt werden. Error: %(error)s'), @@ -180,6 +184,7 @@ class Post(models.Model): def __get_protocol_key(self): try: self.protocol_key = createPadifNotExists(self.slug + "-protocol") + return self.protocol_key except Exception as e: raise ValidationError( _('Das Protokoll konnte nicht erstellt werden. Error: %(error)s'),