Merge pull request #513 from digitalfabrik/profession_in_vocabulary_o…

…verview

Add professions in the vocabulary overview

CHANGELOG.md

@@ -1,6 +1,8 @@
 UNRELEASED
 ----------
 
+* [ [#267](https://github.com/digitalfabrik/lunes-cms/issues/267) ] Add professions in the vocabulary list
+
 
 2023.7.0
 --------

lunes_cms/cms/admins/document_admin.py

@@ -33,6 +33,7 @@ class DocumentAdmin(admin.ModelAdmin):
         "word_type",
         "article_display",
         "related_training_set",
+        "related_disciplines",
         "has_audio",
         "has_image",
         "creator_group",
@@ -129,6 +130,26 @@ def related_training_set(self, obj):
 
     related_training_set.short_description = _("training set")
 
+    def related_disciplines(self, obj):
+        """
+        Display related desciplines in list display
+
+        :param obj: Document object
+        :type obj: models.Document
+        :return: comma seperated list of related training sets
+        :rtype: str
+        """
+        disciplines = []
+
+        for training_set in obj.training_sets.all():
+            disciplines += [
+                discipline.title for discipline in training_set.discipline.all()
+            ]
+
+        return ", ".join(disciplines)
+
+    related_disciplines.short_description = _("disciplines")
+
     def creator_group(self, obj):
         """
         Include creator group of discipline in list display

lunes_cms/locale/de/LC_MESSAGES/django.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-10-07 11:10+0000\n"
+"POT-Creation-Date: 2024-02-10 17:19+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[email protected]>\n"
@@ -32,8 +32,9 @@ msgstr ""
 msgid "{} with id {} does not exist."
 msgstr "{} mit der ID {} existiert nicht."
 
-#: cms/admin.py:35 cms/admins/training_set_admin.py:359 cms/forms.py:46
-#: cms/forms.py:48 cms/list_filter.py:14 cms/models/discipline.py:101
+#: cms/admin.py:35 cms/admins/document_admin.py:151
+#: cms/admins/training_set_admin.py:359 cms/forms.py:46 cms/forms.py:48
+#: cms/list_filter.py:14 cms/models/discipline.py:101
 msgid "disciplines"
 msgstr "Modulgruppen"
 
@@ -74,25 +75,25 @@ msgstr "unveröffentlichte Module"
 msgid "published words in released modules"
 msgstr "veröffentlichte Vokabeln in veröffentlichten Modulen"
 
-#: cms/admins/discipline_admin.py:336 cms/admins/document_admin.py:147
+#: cms/admins/discipline_admin.py:336 cms/admins/document_admin.py:168
 #: cms/admins/training_set_admin.py:376
 msgid "creator group"
 msgstr "Besitzergruppe"
 
-#: cms/admins/document_admin.py:130 cms/models/training_set.py:25
+#: cms/admins/document_admin.py:131 cms/models/training_set.py:25
 #: cms/models/training_set.py:90
 msgid "training set"
 msgstr "Modul"
 
-#: cms/admins/document_admin.py:164 cms/models/document.py:48
+#: cms/admins/document_admin.py:185 cms/models/document.py:48
 msgid "audio"
 msgstr "Audio"
 
-#: cms/admins/document_admin.py:184 cms/models/document_image.py:123
+#: cms/admins/document_admin.py:205 cms/models/document_image.py:123
 msgid "image"
 msgstr "Bild"
 
-#: cms/admins/document_admin.py:199 cms/models/alternative_word.py:17
+#: cms/admins/document_admin.py:220 cms/models/alternative_word.py:17
 #: cms/models/document.py:37
 msgid "article"
 msgstr "Artikel"