Skip to content
Snippets Groups Projects
Verified Commit e9282bc9 authored by Jonathan Weth's avatar Jonathan Weth :keyboard:
Browse files

Merge branch 'master' into 73-add-rules-and-permissions

parents e4189166 a7727a68
No related branches found
No related tags found
1 merge request!49Resolve "Add rules and permissions"
Pipeline #3625 passed
...@@ -8,7 +8,7 @@ msgstr "" ...@@ -8,7 +8,7 @@ msgstr ""
"Project-Id-Version: \n" "Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2020-08-21 12:39+0200\n" "POT-Creation-Date: 2020-08-21 12:39+0200\n"
"PO-Revision-Date: 2020-08-21 14:02+0000\n" "PO-Revision-Date: 2020-09-06 17:48+0000\n"
"Last-Translator: Jonathan Weth <teckids@jonathanweth.de>\n" "Last-Translator: Jonathan Weth <teckids@jonathanweth.de>\n"
"Language-Team: German <https://translate.edugit.org/projects/aleksis/" "Language-Team: German <https://translate.edugit.org/projects/aleksis/"
"aleksis-app-alsijil/de/>\n" "aleksis-app-alsijil/de/>\n"
...@@ -302,7 +302,7 @@ msgstr "Statistiken zu Fehlzeiten, Verspätungen und Bemerkungen" ...@@ -302,7 +302,7 @@ msgstr "Statistiken zu Fehlzeiten, Verspätungen und Bemerkungen"
#: templates/alsijil/class_register/person.html:60 #: templates/alsijil/class_register/person.html:60
#: templates/alsijil/print/full_register.html:269 #: templates/alsijil/print/full_register.html:269
msgid "Absences" msgid "Absences"
msgstr "Absenzen" msgstr "Fehlstunden"
#: templates/alsijil/class_register/person.html:64 #: templates/alsijil/class_register/person.html:64
#: templates/alsijil/print/full_register.html:274 #: templates/alsijil/print/full_register.html:274
......
...@@ -50,7 +50,7 @@ def mark_absent( ...@@ -50,7 +50,7 @@ def mark_absent(
# Create and update all personal notes for the discovered lesson periods # Create and update all personal notes for the discovered lesson periods
for lesson_period in lesson_periods: for lesson_period in lesson_periods:
sub = lesson_period.get_substitution() sub = lesson_period.get_substitution()
if sub and sub.is_cancelled: if sub and sub.cancelled:
continue continue
with reversion.create_revision(): with reversion.create_revision():
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment