add 'delete etherpad cookie', optimize the 'checkPadExists' function

This commit is contained in:
2020-09-23 16:47:44 +00:00
parent 99e3034c0d
commit 526bfcd989
6 changed files with 142 additions and 132 deletions

View File

@@ -6,7 +6,7 @@ from django.utils import timezone
from django.utils.text import slugify
from django.utils.translation import gettext_lazy as _
from taggit.managers import TaggableManager
from documents import ep
from documents.api import getPadHTML, setPadHTML, createPadifNotExists
from .managers import (
PostManager, ArticleManager, NewsManager, AllEventManager, EventManager, FetMeetingManager
@@ -102,13 +102,14 @@ class Post(models.Model):
def agenda_html(self):
if not self.agenda_key:
return None
h = ep.getPadHTML(self.agenda_key)
return h
html = getPadHTML(self.agenda_key)
return html
@agenda_html.setter
def agenda_html(self, value):
request_logger.info("Accessing etherpad ...")
ep.setPadHTML(self.agenda_key, value)
setPadHTML(self.agenda_key, value)
request_logger.info("set etherpad!")
return value
@@ -259,7 +260,7 @@ class FetMeeting(Event):
def __get_agenda_key(self):
try:
self.agenda_key = ep.createPadifNotExists(self.slug + "-agenda")
self.agenda_key = createPadifNotExists(self.slug + "-agenda")
except Exception as e:
raise ValidationError(
_('Die Agenda konnte nicht erstellt werden. Error: %(error)s'),
@@ -268,7 +269,7 @@ class FetMeeting(Event):
def __get_protocol_key(self):
try:
self.protocol_key = ep.createPadifNotExists(self.slug + "-protocol")
self.protocol_key = createPadifNotExists(self.slug + "-protocol")
except Exception as e:
raise ValidationError(
_('Das Protokoll konnte nicht erstellt werden. Error: %(error)s'),