coding style
This commit is contained in:
@@ -4,13 +4,13 @@ from django.utils.translation import gettext_lazy as _
|
||||
from .models import Post, Event, News, FetMeeting, FileUpload
|
||||
from .forms import PostForm, EventForm, NewsForm, FetMeetingForm
|
||||
|
||||
from documents.api import createPadifNotExists
|
||||
from documents.api import create_pad
|
||||
|
||||
|
||||
def make_fetmeeting(self, request, queryset):
|
||||
qs = self.get_queryset(request).filter(id=request.POST["_selected_action"]).first()
|
||||
|
||||
agenda_key = createPadifNotExists(qs.slug + "-agenda")
|
||||
agenda_key = create_pad(qs.slug + "-agenda")
|
||||
if not agenda_key:
|
||||
self.message_user(
|
||||
request,
|
||||
@@ -19,7 +19,7 @@ def make_fetmeeting(self, request, queryset):
|
||||
)
|
||||
return
|
||||
|
||||
protocol_key = createPadifNotExists(qs.slug + "-protocol")
|
||||
protocol_key = create_pad(qs.slug + "-protocol")
|
||||
if not protocol_key:
|
||||
self.message_user(
|
||||
request,
|
||||
|
||||
@@ -13,7 +13,7 @@ from django.utils.translation import gettext_lazy as _
|
||||
from taggit.managers import TaggableManager
|
||||
|
||||
from core.models import CustomFlatPage
|
||||
from documents import getPadHTML, setPadHTML, createPadifNotExists
|
||||
from documents import create_pad, get_pad_html, set_pad_html
|
||||
from .managers import (
|
||||
PostManager,
|
||||
ArticleManager,
|
||||
@@ -34,12 +34,12 @@ def create_pad_for_post(slug, item="agenda"):
|
||||
Return a Etherpad key.
|
||||
"""
|
||||
logger.info(f"Pad-Type: {item}")
|
||||
padID = createPadifNotExists(slug + "-" + item)
|
||||
padID = create_pad(slug + "-" + item)
|
||||
if padID:
|
||||
# set template into the newly created pad if it exists
|
||||
page = CustomFlatPage.objects.filter(title__iexact=item).first()
|
||||
if page:
|
||||
setPadHTML(padID, page.content)
|
||||
set_pad_html(padID, page.content)
|
||||
logger.info(f"Template gesetzt von: {page.title}")
|
||||
else:
|
||||
padID = f"{slug}-{item}"
|
||||
@@ -128,7 +128,7 @@ class Post(models.Model):
|
||||
if not self.agenda_key:
|
||||
return None
|
||||
|
||||
return getPadHTML(self.agenda_key)
|
||||
return get_pad_html(self.agenda_key)
|
||||
|
||||
@property
|
||||
def protocol_html(self):
|
||||
@@ -136,7 +136,7 @@ class Post(models.Model):
|
||||
if not self.protocol_key:
|
||||
return None
|
||||
|
||||
return getPadHTML(self.protocol_key)
|
||||
return get_pad_html(self.protocol_key)
|
||||
|
||||
@agenda_html.setter
|
||||
def agenda_html(self, value):
|
||||
@@ -145,7 +145,7 @@ class Post(models.Model):
|
||||
if not value or not self.agenda_key:
|
||||
return None
|
||||
|
||||
setPadHTML(self.agenda_key, value)
|
||||
set_pad_html(self.agenda_key, value)
|
||||
|
||||
request_logger.info(
|
||||
"set etherpad! for post %s id: %s", self.slug, self.agenda_key
|
||||
@@ -159,7 +159,7 @@ class Post(models.Model):
|
||||
if not value or not self.protocol_key:
|
||||
return None
|
||||
|
||||
setPadHTML(self.protocol_key, value)
|
||||
set_pad_html(self.protocol_key, value)
|
||||
|
||||
request_logger.info(
|
||||
"set etherpad! for post %s id: %s", self.slug, self.protocol_key
|
||||
|
||||
Reference in New Issue
Block a user