rename name to title

fet2020/tasks/admin.py

@@ -12,6 +12,45 @@ class DocumentInline(admin.TabularInline):
     verbose_name_plural = "Do­ku­men­ten­samm­lung"
 
 
+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)

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:

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 = "Auf­ga­ben­be­reiche"
 
     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)
 
 

fet2020/templates/tasks/index.html

@@ -45,7 +45,7 @@
                                 <option value="all" {% if not show_tasklist %}selected{% endif %}>alle Task-Gruppen</option>
                                 {% regroup tasks by task_list as section_list %}
                                 {% for group in section_list %}
-                                    <option value="{{ group.grouper.id }}" {% if show_tasklist == group.grouper.id %}selected{% endif %}>{{ group.grouper.name }}</option>
+                                    <option value="{{ group.grouper.id }}" {% if show_tasklist == group.grouper.id %}selected{% endif %}>{{ group.grouper.title }}</option>
                                 {% endfor %}
                             </select>
                         </label>