From 0007a1dfa85e53c0bff1cb84fd19a9089afd3e64 Mon Sep 17 00:00:00 2001 From: Andy Kittner Date: Sun, 20 May 2012 23:12:50 +0200 Subject: [PATCH] Add log messages when poll is updated/deleted (#187) --- openslides/application/views.py | 14 +++ openslides/locale/de/LC_MESSAGES/django.mo | Bin 32661 -> 32798 bytes openslides/locale/de/LC_MESSAGES/django.po | 114 ++++++++++++--------- 3 files changed, 77 insertions(+), 51 deletions(-) diff --git a/openslides/application/views.py b/openslides/application/views.py index 9caffb3ca..7e6edd028 100644 --- a/openslides/application/views.py +++ b/openslides/application/views.py @@ -404,6 +404,7 @@ def delete_poll(request, poll_id): count = application.polls.filter(id__lte=poll_id).count() if request.method == 'POST': poll.delete() + application.writelog(_("Poll deleted"), request.user) messages.success(request, _('Poll was successfully deleted.')) else: del_confirm_form(request, poll, name=_("the %s. poll") % count, delete_link=reverse('application_poll_delete', args=[poll_id])) @@ -494,6 +495,19 @@ class ViewPoll(PollFormView): context['actions'] = self.application.get_allowed_actions(user=self.request.user) return context + def get_modelform_class(self): + cls = super(ViewPoll, self).get_modelform_class() + user = self.request.user + + class ViewPollFormClass(cls): + def save(self, commit = True): + instance = super(ViewPollFormClass, self).save(commit) + application = instance.application + application.writelog(_("Poll was updated"), user) + return instance + + return ViewPollFormClass + def get_success_url(self): if not 'apply' in self.request.POST: return reverse('application_view', args=[self.poll.application.id]) diff --git a/openslides/locale/de/LC_MESSAGES/django.mo b/openslides/locale/de/LC_MESSAGES/django.mo index e24e33ba00cac5b3e9658dc4ece602216e607010..1f1365f8484685056cff871161aac118b40a5245 100644 GIT binary patch delta 9400 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 U;^@k%87Y-v#R>a@iUWfF4_%}In*aa+ diff --git a/openslides/locale/de/LC_MESSAGES/django.po b/openslides/locale/de/LC_MESSAGES/django.po index 485bb1f9e..a5e965a6e 100644 --- a/openslides/locale/de/LC_MESSAGES/django.po +++ b/openslides/locale/de/LC_MESSAGES/django.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: OpenSlides 1.x\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-05-20 19:56+0200\n" +"POT-Creation-Date: 2012-05-20 23:11+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Emanuel Schuetze \n" "Language-Team: German\n" @@ -49,7 +49,7 @@ msgstr "Kommentar" msgid "Closed" msgstr "Abgeschlossen" -#: agenda/models.py:42 agenda/templates/agenda/overview.html:67 +#: agenda/models.py:42 agenda/templates/agenda/overview.html:71 msgid "Weight" msgstr "Gewichtung" @@ -66,7 +66,7 @@ msgstr "Darf die Tagesordung verwalten" #: agenda/templates/agenda/base_agenda.html:10 #: agenda/templates/agenda/overview.html:8 #: agenda/templates/agenda/overview.html:52 -#: agenda/templates/agenda/overview.html:74 +#: agenda/templates/agenda/overview.html:78 #: agenda/templates/projector/AgendaSummary.html:6 #: agenda/templates/projector/AgendaSummary.html:10 msgid "Agenda" @@ -94,7 +94,7 @@ msgstr "Eintrag %s wurde erfolgreich gelöscht." #: agenda/views.py:156 agenda/views.py:158 #: agenda/templates/agenda/overview.html:46 application/models.py:543 -#: application/views.py:472 application/views.py:764 application/views.py:814 +#: application/views.py:473 application/views.py:778 application/views.py:828 #: application/templates/application/view.html:79 #: application/templates/projector/Application.html:37 #: assignment/templates/assignment/view.html:160 @@ -107,7 +107,7 @@ msgstr "Ja" #: agenda/views.py:156 agenda/views.py:158 #: agenda/templates/agenda/overview.html:47 application/models.py:543 -#: application/views.py:472 application/views.py:764 application/views.py:815 +#: application/views.py:473 application/views.py:778 application/views.py:829 #: application/templates/application/view.html:80 #: application/templates/projector/Application.html:38 #: assignment/templates/assignment/view.html:161 @@ -120,7 +120,7 @@ msgstr "Nein" msgid "Yes, with all child items." msgstr "Ja, mit allen Kindelementen." -#: agenda/views.py:164 agenda/views.py:166 application/views.py:482 +#: agenda/views.py:164 agenda/views.py:166 application/views.py:483 #: participant/views.py:196 participant/views.py:295 utils/utils.py:47 #: utils/views.py:212 #, python-format @@ -265,7 +265,7 @@ msgstr[1] "Einträge" msgid "Done" msgstr "Erledigt" -#: agenda/templates/agenda/overview.html:66 +#: agenda/templates/agenda/overview.html:68 #: application/templates/application/overview.html:43 #: assignment/templates/assignment/overview.html:28 #: participant/templates/participant/group_overview.html:13 @@ -273,11 +273,11 @@ msgstr "Erledigt" msgid "Actions" msgstr "Aktionen" -#: agenda/templates/agenda/overview.html:90 +#: agenda/templates/agenda/overview.html:96 msgid "No items available." msgstr "Keine Einträge vorhanden." -#: application/forms.py:42 application/models.py:510 application/views.py:782 +#: application/forms.py:42 application/models.py:510 application/views.py:796 #: application/templates/application/view.html:226 #: application/templates/application/view.html:246 #: application/templates/projector/Application.html:77 @@ -292,14 +292,14 @@ msgstr "Triviale Änderung" msgid "Trivial changes don't create a new version." msgstr "Triviale Änderungen erzeugen keine neue Version." -#: application/forms.py:48 application/models.py:54 application/views.py:710 +#: application/forms.py:48 application/models.py:54 application/views.py:724 #: application/templates/application/overview.html:41 #: application/templates/application/view.html:18 #: application/templates/projector/Application.html:55 msgid "Submitter" msgstr "Antragsteller/in" -#: application/forms.py:49 application/models.py:56 application/views.py:723 +#: application/forms.py:49 application/models.py:56 application/views.py:737 #: application/templates/application/view.html:25 msgid "Supporters" msgstr "Unterstützer/innen" @@ -497,7 +497,7 @@ msgstr "Darf Anträge verwalten" msgid "Abstain" msgstr "Enthaltung" -#: application/models.py:576 application/views.py:667 application/views.py:873 +#: application/models.py:576 application/views.py:681 application/views.py:887 #: application/templates/application/base_application.html:9 #: application/templates/application/overview.html:7 #: application/templates/application/overview.html:10 @@ -522,7 +522,7 @@ msgstr "Neuer Antrag wurde erfolgreich angelegt." msgid "Application was successfully modified." msgstr "Antrag wurde erfolgreich geändert." -#: application/views.py:252 application/views.py:638 assignment/views.py:130 +#: application/views.py:252 application/views.py:652 assignment/views.py:130 #: participant/views.py:173 participant/views.py:280 participant/views.py:309 #: participant/views.py:467 utils/views.py:157 utils/views.py:173 #: utils/views.py:193 @@ -582,101 +582,109 @@ msgid "New vote was successfully created." msgstr "Neue Abstimmung erfolgreich angelegt." #: application/views.py:407 +msgid "Poll deleted" +msgstr "Abstimmung gelöscht" + +#: application/views.py:408 msgid "Poll was successfully deleted." msgstr "Abstimmung wurde erfolgreich gelöscht." -#: application/views.py:409 +#: application/views.py:410 #, python-format msgid "the %s. poll" msgstr "die %s. Abstimmung" -#: application/views.py:446 application/views.py:455 +#: application/views.py:447 application/views.py:456 #, python-format msgid "You can not delete application %s." msgstr "Sie können Antrag %s nicht löschen." -#: application/views.py:451 application/views.py:459 +#: application/views.py:452 application/views.py:460 #, python-format msgid "Application %s was successfully deleted." msgstr "Antrag %s wurde erfolgreich gelöscht." -#: application/views.py:461 +#: application/views.py:462 msgid "Invalid request" msgstr "Ungültige Anfrage" -#: application/views.py:480 +#: application/views.py:481 msgid "Do you really want to delete multiple applications?" msgstr "Soll %s wirklich gelöscht werden?" -#: application/views.py:509 +#: application/views.py:506 +msgid "Poll was updated" +msgstr "Abstimmung wurde aktualisiert" + +#: application/views.py:523 #, python-format msgid "Version %s accepted." msgstr "Version %s akzeptiert." -#: application/views.py:511 +#: application/views.py:525 #, python-format msgid "Do you really want to permit version %s?" msgstr "Soll Version %s wirklich zugelassen werden?" -#: application/views.py:521 +#: application/views.py:535 #, python-format msgid "Version %s rejected." msgstr "Version %s zurückgewiesen." -#: application/views.py:523 +#: application/views.py:537 msgid "ERROR by rejecting the version." msgstr "FEHLER beim Zurückweisen der Version." -#: application/views.py:525 +#: application/views.py:539 #, python-format msgid "Do you really want to reject version %s?" msgstr "Soll Version %s wirklich zurückgewiesen werden?" -#: application/views.py:534 participant/views.py:325 +#: application/views.py:548 participant/views.py:325 msgid "" "The import function is available for the superuser (without user profile) " "only." msgstr "" "Die Importfunktion ist nur für den 'superuser' (ohne Nutzerprofil) verfügbar." -#: application/views.py:565 application/views.py:569 application/views.py:575 -#: application/views.py:578 participant/views.py:394 +#: application/views.py:579 application/views.py:583 application/views.py:589 +#: application/views.py:592 participant/views.py:394 #, python-format msgid "Ignoring malformed line %d in import file." msgstr "Fehlerhafte Zeile %d der Quelldatei wurde ignoriert." -#: application/views.py:624 +#: application/views.py:638 #, python-format msgid "%d application was successfully imported." msgid_plural "%d applications were successfully imported." msgstr[0] "%d Antrag wurde erfolgreich importiert." msgstr[1] "%d Anträge wurden erfolgreich importiert." -#: application/views.py:627 +#: application/views.py:641 #, python-format msgid "%d application was successfully modified." msgid_plural "%d applications were successfully modified." msgstr[0] "%d Antrag wurde erfolgreich geändert." msgstr[1] "%d Anträge wurden erfolgreich geändert." -#: application/views.py:630 +#: application/views.py:644 #, python-format msgid "%d new user was added." msgid_plural "%d new users were added." msgstr[0] "%d neuer Nutzer wurde erstellt." msgstr[1] "%d neue Nutzer wurden erstellt." -#: application/views.py:634 participant/views.py:463 +#: application/views.py:648 participant/views.py:463 msgid "Import aborted because of severe errors in the input file." msgstr "Import auf Grund von schweren Fehlern in der Quelldatei abgebrochen." -#: application/views.py:636 participant/views.py:465 +#: application/views.py:650 participant/views.py:465 msgid "Import file has wrong character encoding, only UTF-8 is supported!" msgstr "" "Die Quelldatei benutzt eine ungültige Zeichenkodierung, es wird nur UTF-8 " "wird unterstützt!" -#: application/views.py:640 +#: application/views.py:654 msgid "" "Attention: Existing applications will be modified if you import new " "applications with the same number." @@ -684,7 +692,7 @@ msgstr "" "Achtung: Existierende Anträge werden geändert wenn Sie neue Anträge mit " "identischer Nummer importieren." -#: application/views.py:641 +#: application/views.py:655 msgid "" "Attention: Importing an application without a number multiple times will " "create duplicates." @@ -692,7 +700,7 @@ msgstr "" "Achtung: Bei mehrfachem Import eines Antrags ohne Nummer können Duplikate " "entstehen." -#: application/views.py:674 application/views.py:796 +#: application/views.py:688 application/views.py:810 #: application/templates/application/edit.html:6 #: application/templates/application/view.html:7 #: application/templates/application/view.html:210 @@ -701,8 +709,8 @@ msgstr "" msgid "Application" msgstr "Antrag" -#: application/views.py:689 application/views.py:691 application/views.py:703 -#: application/views.py:705 application/views.py:810 +#: application/views.py:703 application/views.py:705 application/views.py:717 +#: application/views.py:719 application/views.py:824 #: application/templates/application/base_application.html:24 #: application/templates/application/poll_view.html:9 #: application/templates/application/view.html:208 @@ -710,7 +718,7 @@ msgstr "Antrag" msgid "Application No." msgstr "Antrag Nr." -#: application/views.py:737 application/templates/application/overview.html:20 +#: application/views.py:751 application/templates/application/overview.html:20 #: application/templates/application/overview.html:40 #: application/templates/application/view.html:37 #: application/templates/projector/Application.html:11 @@ -722,12 +730,12 @@ msgstr "Antrag Nr." msgid "Status" msgstr "Status" -#: application/views.py:757 application/templates/application/view.html:47 +#: application/views.py:771 application/templates/application/view.html:47 #: assignment/views.py:361 msgid "Vote results" msgstr "Abstimmungsergebnis" -#: application/views.py:763 application/views.py:812 +#: application/views.py:777 application/views.py:826 #: application/templates/application/base_application.html:53 #: application/templates/application/poll_view.html:9 #: application/templates/application/poll_view.html:12 @@ -737,7 +745,7 @@ msgstr "Abstimmungsergebnis" msgid "Vote" msgstr "Abstimmung" -#: application/views.py:764 application/views.py:816 +#: application/views.py:778 application/views.py:830 #: application/templates/application/view.html:81 #: application/templates/projector/Application.html:39 #: assignment/templates/assignment/view.html:162 @@ -745,14 +753,14 @@ msgstr "Abstimmung" msgid "Abstention" msgstr "Enthaltung" -#: application/views.py:764 application/templates/application/view.html:82 +#: application/views.py:778 application/templates/application/view.html:82 #: application/templates/projector/Application.html:40 #: assignment/templates/assignment/view.html:181 #: assignment/templates/projector/Assignment.html:94 msgid "Invalid" msgstr "Ungültig" -#: application/views.py:764 +#: application/views.py:778 #: application/templates/application/poll_view.html:40 #: application/templates/application/view.html:84 #: application/templates/projector/Application.html:42 assignment/views.py:408 @@ -764,11 +772,11 @@ msgstr "Ungültig" msgid "Votes cast" msgstr "Abgegebene Stimmen" -#: application/views.py:796 +#: application/views.py:810 msgid "Poll" msgstr "Abstimmung" -#: application/views.py:866 +#: application/views.py:880 msgid "Application settings successfully saved." msgstr "Antrags-Einstellungen erfolgreich gespeichert." @@ -1222,6 +1230,7 @@ msgid "New ballot was successfully created." msgstr "Neuer Wahlgang erfolgreich angelegt." #: assignment/views.py:247 +#, python-format msgid "Ballot ID %d does not exist." msgstr "Wahlgang-ID %d existiert nicht." @@ -1455,7 +1464,7 @@ msgstr "Darf die Konfiguration verwalten" msgid "Presentation system for agenda, applications and elections" msgstr "Präsentationssystem für Tagesordnung, Anträge und Wahlen" -#: config/models.py:93 templates/base.html:29 +#: config/models.py:93 templates/base.html:30 msgid "Welcome" msgstr "Willkommen" @@ -1625,6 +1634,7 @@ msgid "Participant %s was successfully deleted." msgstr "Teilnehmer/in %s wurde erfolgreich gelöscht." #: participant/views.py:210 +#, python-format msgid "Participant ID %d does not exist." msgstr "Teilnehmer/in ID %d existiert nicht." @@ -1882,12 +1892,12 @@ msgstr "" #: participant/templates/participant/login.html:8 #: participant/templates/participant/login.html:16 -#: participant/templates/participant/login.html:50 templates/base.html:31 +#: participant/templates/participant/login.html:50 templates/base.html:32 msgid "Login" msgstr "Anmelden" -#: participant/templates/participant/login.html:21 templates/base.html:56 -#: templates/base.html.py:63 +#: participant/templates/participant/login.html:21 templates/base.html:57 +#: templates/base.html.py:64 msgid "Close this notification" msgstr "Meldung ausblenden" @@ -1979,6 +1989,7 @@ msgid "Overview" msgstr "Übersicht" #: projector/templates/projector/base_projector.html:20 +#: templates/front_page.html:25 msgid "Projector view" msgstr "Projektor-Ansicht" @@ -2063,7 +2074,8 @@ msgstr "Seite nicht gefunden." msgid "Server Error" msgstr "Serverfehler" -#: templates/base.html:21 templates/front_page.html:5 +#: templates/base.html:21 templates/front_page.html:6 +#: templates/front_page.html.py:22 msgid "Home" msgstr "Startseite" @@ -2071,11 +2083,11 @@ msgstr "Startseite" msgid "Logout" msgstr "Abmelden" -#: templates/base.html:28 +#: templates/base.html:29 msgid "User Settings" msgstr "Benutzereinstellungen" -#: templates/front_page.html:11 +#: templates/front_page.html:12 msgid "You have access to the following pages:" msgstr "Sie haben Zugriff auf folgende Seiten:"