Skip to content

Commit d9c00e5

Browse files
authored
Merge pull request #600 from digitalfabrik/develop
Release 2025.10.0
2 parents 1de1e90 + 8171ecf commit d9c00e5

4 files changed

Lines changed: 38 additions & 11 deletions

File tree

.circleci/config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ jobs:
147147
- attach_workspace:
148148
at: .
149149
- run:
150-
name: Install pylint requirements
150+
name: Install requirements
151151
command: sudo apt-get update && sudo apt-get install ffmpeg
152152
- run:
153153
name: Activate virtual environment

CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
UNRELEASED
22
----------
33

4+
* [ [#599](https://github.com/digitalfabrik/lunes-cms/pull/599) ] Has image filter in word overview
5+
46

57
2025.9.0
68
---------

lunes_cms/cmsv2/admins/word_admin.py

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,26 @@
1313
from lunes_cms.core import settings
1414

1515

16+
class HasImageFilter(admin.SimpleListFilter):
17+
"""Filter for displaying words with or without images."""
18+
19+
title = _("Has Image")
20+
parameter_name = "has_image"
21+
22+
def lookups(self, request, model_admin):
23+
return [
24+
("yes", _("Yes")),
25+
("no", _("No")),
26+
]
27+
28+
def queryset(self, request, queryset):
29+
if self.value() == "yes":
30+
return queryset.exclude(image="")
31+
if self.value() == "no":
32+
return queryset.filter(image="")
33+
return queryset
34+
35+
1636
class UnitOrJobDropdownFilter(admin.SimpleListFilter):
1737
"""Filter for displaying units or jobs in the admin interface."""
1838

@@ -118,6 +138,7 @@ class WordAdmin(BaseAdmin):
118138
"word_type",
119139
"audio_check_status",
120140
"image_check_status",
141+
HasImageFilter,
121142
UnitOrJobDropdownFilter,
122143
]
123144
list_per_page = 25

lunes_cms/locale/de/LC_MESSAGES/django.po

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ msgid ""
77
msgstr ""
88
"Project-Id-Version: PACKAGE VERSION\n"
99
"Report-Msgid-Bugs-To: \n"
10-
"POT-Creation-Date: 2025-09-23 07:29+0000\n"
10+
"POT-Creation-Date: 2025-10-07 08:08+0000\n"
1111
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
1212
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
1313
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -105,7 +105,7 @@ msgstr "veröffentlichte Vokabeln in veröffentlichten Modulen"
105105

106106
#: cms/admins/discipline_admin.py:387 cms/admins/document_admin.py:179
107107
#: cms/admins/training_set_admin.py:378 cmsv2/admins/unit_admin.py:108
108-
#: cmsv2/admins/word_admin.py:215
108+
#: cmsv2/admins/word_admin.py:236
109109
msgid "creator group"
110110
msgstr "Besitzergruppe"
111111

@@ -115,7 +115,7 @@ msgid "training set"
115115
msgstr "Modul"
116116

117117
#: cms/admins/document_admin.py:196 cms/models/document.py:66
118-
#: cmsv2/admins/word_admin.py:282 cmsv2/models/word.py:64
118+
#: cmsv2/admins/word_admin.py:303 cmsv2/models/word.py:64
119119
msgid "audio"
120120
msgstr "Audio"
121121

@@ -125,7 +125,7 @@ msgid "image"
125125
msgstr "Bild"
126126

127127
#: cms/admins/document_admin.py:231 cms/models/alternative_word.py:24
128-
#: cms/models/document.py:43 cmsv2/admins/word_admin.py:456
128+
#: cms/models/document.py:43 cmsv2/admins/word_admin.py:477
129129
#: cmsv2/models/word.py:41
130130
msgid "singular article"
131131
msgstr "Singular-Artikel"
@@ -150,11 +150,11 @@ msgstr "Plural Artikel"
150150
msgid "Has audio?"
151151
msgstr "Audio"
152152

153-
#: cms/admins/document_resource.py:63
153+
#: cms/admins/document_resource.py:63 cmsv2/admins/word_admin.py:24
154154
msgid "Yes"
155155
msgstr "Ja"
156156

157-
#: cms/admins/document_resource.py:64
157+
#: cms/admins/document_resource.py:64 cmsv2/admins/word_admin.py:25
158158
msgid "No"
159159
msgstr "Nein"
160160

@@ -391,7 +391,7 @@ msgid "example sentence"
391391
msgstr "Beispielsatz"
392392

393393
#: cms/models/document.py:70 cms/models/group_api_key.py:65
394-
#: cmsv2/admins/word_admin.py:470 cmsv2/models/word.py:81
394+
#: cmsv2/admins/word_admin.py:491 cmsv2/models/word.py:81
395395
msgid "creation date"
396396
msgstr "Erstellt am"
397397

@@ -668,18 +668,22 @@ msgid "jobs"
668668
msgstr "Berufe"
669669

670670
#: cmsv2/admins/word_admin.py:19
671+
msgid "Has Image"
672+
msgstr "Hat Bild"
673+
674+
#: cmsv2/admins/word_admin.py:39
671675
msgid "Unit or Job"
672676
msgstr "Einheit oder Job"
673677

674-
#: cmsv2/admins/word_admin.py:442 cmsv2/models/unit.py:106
678+
#: cmsv2/admins/word_admin.py:463 cmsv2/models/unit.py:106
675679
msgid "Image"
676680
msgstr "Bilder"
677681

678-
#: cmsv2/admins/word_admin.py:484 cmsv2/models/word.py:70
682+
#: cmsv2/admins/word_admin.py:505 cmsv2/models/word.py:70
679683
msgid "audio check status"
680684
msgstr "Audio Prüfstatus"
681685

682-
#: cmsv2/admins/word_admin.py:499 cmsv2/models/unit.py:37
686+
#: cmsv2/admins/word_admin.py:520 cmsv2/models/unit.py:37
683687
#: cmsv2/models/word.py:118
684688
msgid "image check status"
685689
msgstr "Bild Prüfstatus"

0 commit comments

Comments
 (0)