diff --git a/fet2020/tasks/admin.py b/fet2020/tasks/admin.py
index 78c4c860..63279c72 100644
--- a/fet2020/tasks/admin.py
+++ b/fet2020/tasks/admin.py
@@ -12,6 +12,45 @@ class DocumentInline(admin.TabularInline):
verbose_name_plural = "Dokumentensammlung"
+class TaskListAdmin(admin.ModelAdmin):
+ form = TaskListAdminForm
+ model = TaskList
+
+ readonly_fields = ("slug",)
+ fieldsets = (
+ (
+ None,
+ {
+ "fields": (
+ "title",
+ "shortterm",
+ "slug",
+ "users",
+ )
+ },
+ ),
+ )
+
+ def add_view(self, request, form_url="", extra_context=None):
+ extra_context = extra_context or {}
+ extra_context["help_text"] = "Fette Schriften sind Pflichtfelder."
+ return super().add_view(
+ request,
+ form_url,
+ extra_context=extra_context,
+ )
+
+ def change_view(self, request, object_id, form_url="", extra_context=None):
+ extra_context = extra_context or {}
+ extra_context["help_text"] = "Fette Schriften sind Pflichtfelder."
+ return super().change_view(
+ request,
+ object_id,
+ form_url,
+ extra_context=extra_context,
+ )
+
+
class TaskAdmin(admin.ModelAdmin):
form = TaskAdminForm
model = Task
@@ -73,44 +112,5 @@ class TaskAdmin(admin.ModelAdmin):
super().save_model(request, obj, form, change)
-class TaskListAdmin(admin.ModelAdmin):
- form = TaskListAdminForm
- model = TaskList
-
- readonly_fields = ("slug",)
- fieldsets = (
- (
- None,
- {
- "fields": (
- "name",
- "shortterm",
- "slug",
- "users",
- )
- },
- ),
- )
-
- def add_view(self, request, form_url="", extra_context=None):
- extra_context = extra_context or {}
- extra_context["help_text"] = "Fette Schriften sind Pflichtfelder."
- return super().add_view(
- request,
- form_url,
- extra_context=extra_context,
- )
-
- def change_view(self, request, object_id, form_url="", extra_context=None):
- extra_context = extra_context or {}
- extra_context["help_text"] = "Fette Schriften sind Pflichtfelder."
- return super().change_view(
- request,
- object_id,
- form_url,
- extra_context=extra_context,
- )
-
-
admin.site.register(TaskList, TaskListAdmin)
admin.site.register(Task, TaskAdmin)
diff --git a/fet2020/tasks/forms.py b/fet2020/tasks/forms.py
index 9bd7ce6c..0bc2723e 100644
--- a/fet2020/tasks/forms.py
+++ b/fet2020/tasks/forms.py
@@ -40,6 +40,12 @@ class TaskListAdminForm(forms.ModelForm):
model = TaskList
fields = "__all__"
+ labels = {
+ "title": _("Titel"),
+ "shortterm": _("Kürzel für den Link"),
+ "slug": _("Permalink"),
+ }
+
class TaskAdminForm(forms.ModelForm):
class Meta:
diff --git a/fet2020/tasks/models.py b/fet2020/tasks/models.py
index 010f5e51..c9c1e6fc 100644
--- a/fet2020/tasks/models.py
+++ b/fet2020/tasks/models.py
@@ -15,7 +15,7 @@ from .managers import TaskManager
class TaskList(models.Model):
- name = models.CharField(max_length=128)
+ title = models.CharField(max_length=128)
shortterm = models.CharField(max_length=128, unique=True, blank=True)
slug = models.SlugField(unique=True, blank=True)
@@ -29,14 +29,14 @@ class TaskList(models.Model):
verbose_name_plural = "Aufgabenbereiche"
def __str__(self):
- return self.name
+ return self.title
def get_absolute_url(self):
return reverse("tasks:index")
def clean(self):
if not self.shortterm:
- self.shortterm = slugify(self.name)
+ self.shortterm = slugify(self.title)
self.slug = slugify(self.shortterm)
diff --git a/fet2020/templates/tasks/index.html b/fet2020/templates/tasks/index.html
index 58906d40..c3cc523c 100644
--- a/fet2020/templates/tasks/index.html
+++ b/fet2020/templates/tasks/index.html
@@ -45,7 +45,7 @@
{% regroup tasks by task_list as section_list %}
{% for group in section_list %}
-
+
{% endfor %}