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

revert rename name to title

Browse Source
This commit is contained in:
Patrick Mayr
2022-04-20 20:37:49 +00:00
parent a85ef4df44
commit 881e9d35cb
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
fet2020/tasks/admin.py
View File

@@ -22,7 +22,7 @@ class TaskListAdmin(admin.ModelAdmin):
None, None,
{ {
"fields": ( "fields": (
"title", "name",
"shortterm", "shortterm",
"slug", "slug",
"users", "users",

2
fet2020/tasks/forms.py
View File

@@ -41,7 +41,7 @@ class TaskListAdminForm(forms.ModelForm):
fields = "__all__" fields = "__all__"
labels = { labels = {
"title": _("Titel"), "name": _("Titel"),
"shortterm": _("Kürzel für den Link"), "shortterm": _("Kürzel für den Link"),
"slug": _("Permalink"), "slug": _("Permalink"),
} }

6
fet2020/tasks/models.py
View File

@@ -15,7 +15,7 @@ from .managers import TaskManager
class TaskList(models.Model): class TaskList(models.Model):
title = models.CharField(max_length=128) name = models.CharField(max_length=128)
shortterm = models.CharField(max_length=128, unique=True, blank=True) shortterm = models.CharField(max_length=128, unique=True, blank=True)
slug = models.SlugField(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" verbose_name_plural = "Auf­ga­ben­be­reiche"
def __str__(self): def __str__(self):
return self.title return self.name
def get_absolute_url(self): def get_absolute_url(self):
return reverse("tasks:index") return reverse("tasks:index")
def clean(self): def clean(self):
if not self.shortterm: if not self.shortterm:
self.shortterm = slugify(self.title) self.shortterm = slugify(self.name)
self.slug = slugify(self.shortterm) self.slug = slugify(self.shortterm)

2
fet2020/templates/tasks/index.html
View File

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