update

src/privatim/forms/search_form.py

@@ -22,7 +22,7 @@ def __init__(
                 'dbsession': session
             }
         )
-    search = SearchField(
+    term = SearchField(
         _('Search'),
         [DataRequired()],
         render_kw={

src/privatim/layouts/macros.pt

@@ -161,7 +161,7 @@
     <div class="container">
         <form enctype="multipart/form-data" method="POST" action="${action}" novalidate class="col-12 col-lg-auto mb-3 mb-lg-0 me-lg-3 d-flex align-items-center" id="search">
             <input type="hidden" name="csrf_token" value="${layout.csrf_token()}"/>
-             ${form.search}
+             ${form.term}
             <button type="submit" class="btn btn-secondary" id="search-button"><i class="fa fa-search"></i></button>
         </form>
     </div>

src/privatim/locale/de/LC_MESSAGES/privatim.po

@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE 1.0\n"
-"POT-Creation-Date: 2024-06-23 05:02+0200\n"
+"POT-Creation-Date: 2024-07-02 14:17+0200\n"
 "PO-Revision-Date: 2024-05-21 21:20+0200\n"
 "Last-Translator: cyrill <[email protected]>\n"
 "Language-Team: German <[email protected]>\n"
@@ -53,8 +53,7 @@ msgstr "Nachricht"
 msgid "Answer"
 msgstr "Antworten"
 
-#: src/privatim/layouts/navbar.pt src/privatim/layouts/navbar.py
-#: src/privatim/views/activities.py
+#: src/privatim/layouts/navbar.pt src/privatim/views/activities.py
 msgid "Activities"
 msgstr "Aktivitäten"
 
@@ -73,10 +72,6 @@ msgstr "Vernehmlassungen"
 msgid "Working Groups"
 msgstr "Gremien"
 
-#: src/privatim/layouts/navbar.pt
-msgid "Search..."
-msgstr "Suchen..."
-
 #: src/privatim/layouts/navbar.pt
 msgid "<dynamic element> Profile"
 msgstr " Profil"
@@ -339,13 +334,26 @@ msgstr "Status"
 msgid "Your Comment"
 msgstr "Ihr Kommentar"
 
+#: src/privatim/views/templates/search_results.pt
+msgid "Search Results"
+msgstr "Suchergebnisse"
+
+#: src/privatim/views/templates/search_results.pt
+#: src/privatim/views/templates/activities.pt
+msgid "Show Details"
+msgstr "Details anzeigen"
+
 #: src/privatim/views/templates/password_change.pt
 msgid "Change Password"
 msgstr "Passwort ändern"
 
 #: src/privatim/views/templates/activities.pt
-msgid "Show Details"
-msgstr "Details anzeigen"
+msgid "Unbekannter Ersteller"
+msgstr "Unbekannter Ersteller"
+
+#: src/privatim/views/templates/activities.pt
+msgid "Kein Leiter"
+msgstr "Kein Leiter"
 
 #: src/privatim/views/templates/activities.pt
 msgid "Show Meeting"
@@ -600,6 +608,10 @@ msgstr "Kein Leiter"
 msgid "Members"
 msgstr "Mitglieder"
 
+#: src/privatim/forms/search_form.py
+msgid "Search"
+msgstr ""
+
 #: src/privatim/forms/widgets/widgets.py
 msgid "Uploaded file"
 msgstr "Hochgeladene Datei"
@@ -629,5 +641,8 @@ msgstr "Auswählen"
 msgid "Protocol of meeting ${title}"
 msgstr "Protokoll der Sitzung ${title}"
 
+#~ msgid "Search..."
+#~ msgstr "Suchen..."
+
 #~ msgid "Do you really wish to delete \"${item_title}\"?"
 #~ msgstr "Möchten Sie \"${item_title}\" wirklich löschen?"

src/privatim/locale/fr/LC_MESSAGES/privatim.po

@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE 1.0\n"
-"POT-Creation-Date: 2024-06-23 05:02+0200\n"
+"POT-Creation-Date: 2024-07-02 14:17+0200\n"
 "PO-Revision-Date: 2024-04-11 15:53+0200\n"
 "Last-Translator: cyrill <[email protected]>\n"
 "Language-Team: French <[email protected]>\n"
@@ -50,8 +50,7 @@ msgstr "Message"
 msgid "Answer"
 msgstr "Répondre"
 
-#: src/privatim/layouts/navbar.pt src/privatim/layouts/navbar.py
-#: src/privatim/views/activities.py
+#: src/privatim/layouts/navbar.pt src/privatim/views/activities.py
 msgid "Activities"
 msgstr "Activités"
 
@@ -70,10 +69,6 @@ msgstr "Consultations"
 msgid "Working Groups"
 msgstr "Comités"
 
-#: src/privatim/layouts/navbar.pt
-msgid "Search..."
-msgstr "Recherche"
-
 #: src/privatim/layouts/navbar.pt
 msgid "<dynamic element> Profile"
 msgstr " Profil"
@@ -338,13 +333,26 @@ msgstr "Statut"
 msgid "Your Comment"
 msgstr "Votre commentaire"
 
+#: src/privatim/views/templates/search_results.pt
+msgid "Search Results"
+msgstr ""
+
+#: src/privatim/views/templates/search_results.pt
+#: src/privatim/views/templates/activities.pt
+msgid "Show Details"
+msgstr "Afficher les détails"
+
 #: src/privatim/views/templates/password_change.pt
 msgid "Change Password"
 msgstr "Changer le mot de passe"
 
 #: src/privatim/views/templates/activities.pt
-msgid "Show Details"
-msgstr "Afficher les détails"
+msgid "Unbekannter Ersteller"
+msgstr ""
+
+#: src/privatim/views/templates/activities.pt
+msgid "Kein Leiter"
+msgstr ""
 
 #: src/privatim/views/templates/activities.pt
 msgid "Show Meeting"
@@ -597,6 +605,10 @@ msgstr "Pas de chef"
 msgid "Members"
 msgstr "Membres"
 
+#: src/privatim/forms/search_form.py
+msgid "Search"
+msgstr ""
+
 #: src/privatim/forms/widgets/widgets.py
 msgid "Uploaded file"
 msgstr "Fichier téléchargé"
@@ -626,5 +638,8 @@ msgstr "Sélectionner..."
 msgid "Protocol of meeting ${title}"
 msgstr "Procès-verbal de la réunion ${title}"
 
+#~ msgid "Search..."
+#~ msgstr "Recherche"
+
 #~ msgid "Do you really wish to delete \"${item_title}\"?"
 #~ msgstr "Souhaitez-vous vraiment supprimer \"${item_title}\" ?"

src/privatim/locale/privatim.pot

@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE 1.0\n"
-"POT-Creation-Date: 2024-06-23 05:02+0200\n"
+"POT-Creation-Date: 2024-07-02 14:17+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[email protected]>\n"
@@ -50,8 +50,7 @@ msgstr ""
 msgid "Answer"
 msgstr ""
 
-#: ./src/privatim/layouts/navbar.pt ./src/privatim/layouts/navbar.py
-#: ./src/privatim/views/activities.py
+#: ./src/privatim/layouts/navbar.pt ./src/privatim/views/activities.py
 msgid "Activities"
 msgstr ""
 
@@ -70,10 +69,6 @@ msgstr ""
 msgid "Working Groups"
 msgstr ""
 
-#: ./src/privatim/layouts/navbar.pt
-msgid "Search..."
-msgstr ""
-
 #: ./src/privatim/layouts/navbar.pt
 msgid "<dynamic element> Profile"
 msgstr ""
@@ -329,12 +324,25 @@ msgstr ""
 msgid "Your Comment"
 msgstr ""
 
+#: ./src/privatim/views/templates/search_results.pt
+msgid "Search Results"
+msgstr ""
+
+#: ./src/privatim/views/templates/search_results.pt
+#: ./src/privatim/views/templates/activities.pt
+msgid "Show Details"
+msgstr ""
+
 #: ./src/privatim/views/templates/password_change.pt
 msgid "Change Password"
 msgstr ""
 
 #: ./src/privatim/views/templates/activities.pt
-msgid "Show Details"
+msgid "Unbekannter Ersteller"
+msgstr ""
+
+#: ./src/privatim/views/templates/activities.pt
+msgid "Kein Leiter"
 msgstr ""
 
 #: ./src/privatim/views/templates/activities.pt
@@ -588,6 +596,10 @@ msgstr ""
 msgid "Members"
 msgstr ""
 
+#: ./src/privatim/forms/search_form.py
+msgid "Search"
+msgstr ""
+
 #: ./src/privatim/forms/widgets/widgets.py
 msgid "Uploaded file"
 msgstr ""

src/privatim/models/comment.py

@@ -76,7 +76,6 @@ def __repr__(self) -> str:
     @classmethod
     def searchable_fields(cls):
         yield cls.content
-        yield cls.content
 
     __table_args__ = (
         Index('ix_comments_parent_id', 'parent_id'),

src/privatim/models/meeting.py

@@ -176,7 +176,6 @@ def __init__(
     def searchable_fields(cls) -> Iterator[str]:
         # todo: agenda item (seperately)
         yield cls.name
-        yield cls.name
 
     def __acl__(self) -> list['ACL']:
         return [