bofh/fet2020
8
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Compare commits

base: bofh:72570e25c273000431a79172c09fed9deefb0def
Branches Tags
bofh:master bofh:patrick-crazy-experiment bofh:layout2021 bofh:etherpadintern
...
compare: bofh:78c2860cca6260486731ac0dc8a7cbc4eeba3f4c
Branches Tags
bofh:master bofh:patrick-crazy-experiment bofh:layout2021 bofh:etherpadintern

2 Commits
72570e25c2 ... 78c2860cca

Author SHA1 Message Date
Patrick Mayr
78c2860cca update etherpad to 2.5.2; fix charset and add auth method 2025-11-04 22:02:07 +01:00
Patrick Mayr
2024466a48 Fix the help text 2025-11-04 18:49:03 +01:00
2 changed files with 278 additions and 277 deletions
Expand all files Collapse all files

5
docker-compose.yml
View File

@@ -47,7 +47,7 @@ services:
retries: 20 retries: 20
etherpad: etherpad:
container_name: etherpad-container container_name: etherpad-container
image: etherpad/etherpad:1.8.17 image: etherpad/etherpad:2.5.2
# ports: # ports:
# - 9001:9001 # - 9001:9001
environment: environment:
@@ -57,8 +57,9 @@ services:
DB_NAME: etherpaddb DB_NAME: etherpaddb
DB_USER: user DB_USER: user
DB_PASS: "hgu" DB_PASS: "hgu"
DB_CHARSET: utf8 DB_CHARSET: "utf8mb4"
TRUST_PROXY: false TRUST_PROXY: false
AUTHENTICATION_METHOD: "apikey"
depends_on: depends_on:
etherpadsql: etherpadsql:
condition: "service_healthy" condition: "service_healthy"

550
fet2020/posts/forms.py
View File

@@ -1,275 +1,275 @@
from ckeditor_uploader.widgets import CKEditorUploadingWidget from ckeditor_uploader.widgets import CKEditorUploadingWidget
from django import forms from django import forms
from django.forms.widgets import CheckboxInput from django.forms.widgets import CheckboxInput
from django.utils.dates import MONTHS from django.utils.dates import MONTHS
from taggit.models import Tag from taggit.models import Tag
from .models import Event, FetMeeting, News, Post from .models import Event, FetMeeting, News, Post
class PostForm(forms.ModelForm): class PostForm(forms.ModelForm):
class Meta: class Meta:
model = Post model = Post
fields = [ fields = [
"title", "title",
"subtitle", "subtitle",
"tags", "tags",
"image", "image",
"body", "body",
"slug", "slug",
"author", "author",
"public_date", "public_date",
] ]
widgets = {"body": CKEditorUploadingWidget(config_name="default")} widgets = {"body": CKEditorUploadingWidget(config_name="default")}
class Media: class Media:
js = ( js = (
"js/auto_slug.js", # automatic slag completion via ajax "js/auto_slug.js", # automatic slag completion via ajax
"js/tag_completion.js", # to get a list for tag autocompletion via ajax "js/tag_completion.js", # to get a list for tag autocompletion via ajax
) )
class NewsForm(PostForm): class NewsForm(PostForm):
class Meta: class Meta:
model = News model = News
fields = "__all__" fields = "__all__"
help_texts = { help_texts = {
"tags": ( "tags": (
"Die Hashtags ohne '#' eintragen, und mit Komma kann man mehrere Tags anfügen." "Die Hashtags ohne '#' eintragen, und mit Komma kann man mehrere Tags anfügen."
), ),
"image": "Verwendbare Formate: ...", "image": "Verwendbare Formate: ...",
"is_pinned": ( "is_pinned": (
"Der Post soll als erster auf der Startseite angeheftet werden und sich " "Der Post soll als erster auf der Startseite angeheftet werden und sich "
"automatisch einen Monat nach der Veröffentlichung wieder lösen." "automatisch einen Monat nach der Veröffentlichung wieder lösen."
), ),
} }
labels = { labels = {
"title": "Titel", "title": "Titel",
"subtitle": "Untertitel", "subtitle": "Untertitel",
"image": "Hintergrundbild", "image": "Hintergrundbild",
"body": "Text", "body": "Text",
"slug": "Permalink", "slug": "Permalink",
"author": "Autor", "author": "Autor",
"public_date": "Veröffentlichung", "public_date": "Veröffentlichung",
"is_pinned": "Post anheften", "is_pinned": "Post anheften",
} }
widgets = {"body": CKEditorUploadingWidget(config_name="default")} widgets = {"body": CKEditorUploadingWidget(config_name="default")}
def __init__(self, *args, **kwargs): def __init__(self, *args, **kwargs):
super().__init__(*args, **kwargs) # to get the self.fields set super().__init__(*args, **kwargs) # to get the self.fields set
author_qs = self.fields["author"].queryset.order_by("username") author_qs = self.fields["author"].queryset.order_by("username")
self.fields["author"].queryset = author_qs self.fields["author"].queryset = author_qs
class EventForm(PostForm): class EventForm(PostForm):
class Meta: class Meta:
model = Event model = Event
fields = "__all__" fields = "__all__"
help_texts = { help_texts = {
"tags": ( "tags": (
"Die Hashtags ohne '#' eintragen, und mit Komma kann man mehrere Tags anfügen." "Die Hashtags ohne '#' eintragen, und mit Komma kann man mehrere Tags anfügen."
), ),
"image": "Verwendbare Formate: Bildformate", "image": "Verwendbare Formate: Bildformate",
"is_pinned": ( "is_pinned": (
"Dieses Event soll als erstes auf der Startseite angeheftet werden und sich " "Dieses Event soll als erstes auf der Startseite angeheftet werden und sich "
"automatisch einen Monat nach der Veröffentlichung wieder lösen." "automatisch ein Tag nach dem Eventende wieder lösen."
), ),
} }
labels = { labels = {
"title": "Titel", "title": "Titel",
"subtitle": "Untertitel", "subtitle": "Untertitel",
"image": "Hintergrundbild", "image": "Hintergrundbild",
"body": "Text", "body": "Text",
"event_start": "Start des Events", "event_start": "Start des Events",
"event_end": "Ende des Events", "event_end": "Ende des Events",
"event_place": "Ort des Events", "event_place": "Ort des Events",
"slug": "Permalink", "slug": "Permalink",
"author": "Autor", "author": "Autor",
"public_date": "Veröffentlichung", "public_date": "Veröffentlichung",
"is_pinned": "Event anheften", "is_pinned": "Event anheften",
} }
widgets = {"body": CKEditorUploadingWidget(config_name="default")} widgets = {"body": CKEditorUploadingWidget(config_name="default")}
def __init__(self, *args, **kwargs): def __init__(self, *args, **kwargs):
super().__init__(*args, **kwargs) # to get the self.fields set super().__init__(*args, **kwargs) # to get the self.fields set
author_qs = self.fields["author"].queryset.order_by("username") author_qs = self.fields["author"].queryset.order_by("username")
self.fields["author"].queryset = author_qs self.fields["author"].queryset = author_qs
self.fields["event_start"].required = True self.fields["event_start"].required = True
self.fields["event_end"].required = False self.fields["event_end"].required = False
if "event_place" in self.fields: if "event_place" in self.fields:
self.fields["event_place"].required = True self.fields["event_place"].required = True
class FetMeetingForm(PostForm): class FetMeetingForm(PostForm):
class Meta: class Meta:
model = FetMeeting model = FetMeeting
fields = ["event_start", "event_end", "event_place", "tags"] fields = ["event_start", "event_end", "event_place", "tags"]
labels = { labels = {
"event_start": "Start der Sitzung", "event_start": "Start der Sitzung",
"event_end": "Ende der Sitzung", "event_end": "Ende der Sitzung",
"event_place": "Ort der Sitzung", "event_place": "Ort der Sitzung",
} }
help_texts = { help_texts = {
"event_end": "Bei einer leeren Eingabe werden 2 Stunden zur Startzeit dazugezählt.", "event_end": "Bei einer leeren Eingabe werden 2 Stunden zur Startzeit dazugezählt.",
"tags": ( "tags": (
"Die Hashtags ohne '#' eintragen, und mit Komma kann man mehrere Tags anfügen." "Die Hashtags ohne '#' eintragen, und mit Komma kann man mehrere Tags anfügen."
), ),
} }
def __init__(self, *args, **kwargs): def __init__(self, *args, **kwargs):
super().__init__(*args, **kwargs) # to get the self.fields set super().__init__(*args, **kwargs) # to get the self.fields set
self.fields["event_start"].required = True self.fields["event_start"].required = True
self.fields["event_end"].required = False self.fields["event_end"].required = False
self.fields["event_place"].initial = "FET" self.fields["event_place"].initial = "FET"
tags = [] tags = []
tags.append(Tag()) tags.append(Tag())
tags[0].name = "fachschaft" tags[0].name = "fachschaft"
self.fields["tags"].initial = tags self.fields["tags"].initial = tags
class PostSearchForm(forms.Form): class PostSearchForm(forms.Form):
year_choices = [("", "Alle")] year_choices = [("", "Alle")]
month_choices = [("", "Alle")] + list(MONTHS.items()) month_choices = [("", "Alle")] + list(MONTHS.items())
year = forms.ChoiceField(label="Jahr", choices=year_choices, required=False) year = forms.ChoiceField(label="Jahr", choices=year_choices, required=False)
month = forms.ChoiceField(label="Monat", choices=month_choices, required=False) month = forms.ChoiceField(label="Monat", choices=month_choices, required=False)
compact_view = forms.BooleanField( compact_view = forms.BooleanField(
label="Kompakte Ansicht", label="Kompakte Ansicht",
required=False, required=False,
widget=CheckboxInput, widget=CheckboxInput,
) )
fet_meeting_only = forms.BooleanField( fet_meeting_only = forms.BooleanField(
label="nur FET Sitzungen", label="nur FET Sitzungen",
required=False, required=False,
widget=CheckboxInput, widget=CheckboxInput,
) )
def __init__(self, *args, **kwargs): def __init__(self, *args, **kwargs):
super().__init__(*args, **kwargs) # to get the self.fields set super().__init__(*args, **kwargs) # to get the self.fields set
try: try:
first_post = Post.objects.get_queryset().last() first_post = Post.objects.get_queryset().last()
last_post = Post.objects.get_queryset().first() last_post = Post.objects.get_queryset().first()
if first_post and last_post: if first_post and last_post:
years = range(last_post.date.year, first_post.date.year - 1, -1) years = range(last_post.date.year, first_post.date.year - 1, -1)
year_choices = [("", "Alle")] + [(i, i) for i in years] year_choices = [("", "Alle")] + [(i, i) for i in years]
self.fields["year"].choices = year_choices self.fields["year"].choices = year_choices
except Exception: except Exception:
pass pass
class NewsUpdateForm(forms.ModelForm): class NewsUpdateForm(forms.ModelForm):
class Meta: class Meta:
model = News model = News
fields = [ fields = [
"title", "title",
"status", "status",
"body", "body",
] ]
labels = { labels = {
"title": "Titel", "title": "Titel",
"image": "Hintergrundbild", "image": "Hintergrundbild",
"body": "Text", "body": "Text",
} }
widgets = {"body": CKEditorUploadingWidget(config_name="default")} widgets = {"body": CKEditorUploadingWidget(config_name="default")}
def __init__(self, *args, **kwargs): def __init__(self, *args, **kwargs):
super().__init__(*args, **kwargs) # to get the self.fields set super().__init__(*args, **kwargs) # to get the self.fields set
self.fields["title"].autofocus = True self.fields["title"].autofocus = True
class EventUpdateForm(forms.ModelForm): class EventUpdateForm(forms.ModelForm):
class Meta: class Meta:
model = Event model = Event
fields = [ fields = [
"title", "title",
"status", "status",
"event_start", "event_start",
"event_end", "event_end",
"event_place", "event_place",
] ]
labels = { labels = {
"title": "Titel", "title": "Titel",
"event_start": "Start des Events", "event_start": "Start des Events",
"event_end": "Ende des Events", "event_end": "Ende des Events",
"event_place": "Ort des Events", "event_place": "Ort des Events",
} }
def __init__(self, *args, **kwargs): def __init__(self, *args, **kwargs):
super().__init__(*args, **kwargs) # to get the self.fields set super().__init__(*args, **kwargs) # to get the self.fields set
self.fields["event_start"].required = True self.fields["event_start"].required = True
self.fields["event_start"].autofocus = True self.fields["event_start"].autofocus = True
self.fields["event_end"].required = False self.fields["event_end"].required = False
if "event_place" in self.fields: if "event_place" in self.fields:
self.fields["event_place"].required = True self.fields["event_place"].required = True
class FetMeetingCreateForm(forms.ModelForm): class FetMeetingCreateForm(forms.ModelForm):
class Meta: class Meta:
model = FetMeeting model = FetMeeting
fields = ["event_start", "event_end", "event_place"] fields = ["event_start", "event_end", "event_place"]
help_texts = { help_texts = {
"event_end": "Bei einer leeren Eingabe werden 2 Stunden zur Startzeit dazugezählt.", "event_end": "Bei einer leeren Eingabe werden 2 Stunden zur Startzeit dazugezählt.",
} }
labels = { labels = {
"event_start": "Start der Sitzung", "event_start": "Start der Sitzung",
"event_end": "Ende der Sitzung", "event_end": "Ende der Sitzung",
"event_place": "Ort der Sitzung", "event_place": "Ort der Sitzung",
} }
def __init__(self, *args, **kwargs): def __init__(self, *args, **kwargs):
super().__init__(*args, **kwargs) # to get the self.fields set super().__init__(*args, **kwargs) # to get the self.fields set
self.fields["event_start"].required = True self.fields["event_start"].required = True
self.fields["event_start"].autofocus = True self.fields["event_start"].autofocus = True
self.fields["event_end"].required = False self.fields["event_end"].required = False
self.fields["event_place"].initial = "FET" self.fields["event_place"].initial = "FET"
class FetMeetingUpdateForm(forms.ModelForm): class FetMeetingUpdateForm(forms.ModelForm):
class Meta: class Meta:
model = FetMeeting model = FetMeeting
fields = ["event_start", "event_end", "event_place"] fields = ["event_start", "event_end", "event_place"]
labels = { labels = {
"event_start": "Start der Sitzung", "event_start": "Start der Sitzung",
"event_end": "Ende der Sitzung", "event_end": "Ende der Sitzung",
"event_place": "Ort der Sitzung", "event_place": "Ort der Sitzung",
} }
def __init__(self, *args, **kwargs): def __init__(self, *args, **kwargs):
super().__init__(*args, **kwargs) # to get the self.fields set super().__init__(*args, **kwargs) # to get the self.fields set
self.fields["event_start"].required = True self.fields["event_start"].required = True
self.fields["event_start"].autofocus = True self.fields["event_start"].autofocus = True
self.fields["event_end"].required = False self.fields["event_end"].required = False
self.fields["event_place"].initial = "FET" self.fields["event_place"].initial = "FET"