Skip to content
Snippets Groups Projects

Prepare release 2.0rc4 (the second time)

Merged Jonathan Weth requested to merge prepare-release-2.0rc4 into release/2.0
2 files
+ 11
4
Compare changes
  • Side-by-side
  • Inline
Files
2
@@ -7,18 +7,19 @@ from django.template.loader import get_template
from django.urls import reverse
from django.utils.translation import gettext_lazy as _
from aleksis.apps.alsijil.models import PersonalNote
from aleksis.core.models import Notification
def mark_as_excused(modeladmin, request, queryset):
queryset.update(excused=True, excuse_type=None)
queryset.filter(absent=True).update(excused=True, excuse_type=None)
mark_as_excused.short_description = _("Mark as excused")
def mark_as_unexcused(modeladmin, request, queryset):
queryset.update(excused=False, excuse_type=None)
queryset.filter(absent=True).update(excused=False, excuse_type=None)
mark_as_unexcused.short_description = _("Mark as unexcused")
@@ -26,7 +27,7 @@ mark_as_unexcused.short_description = _("Mark as unexcused")
def mark_as_excuse_type_generator(excuse_type) -> Callable:
def mark_as_excuse_type(modeladmin, request, queryset):
queryset.update(excused=True, excuse_type=excuse_type)
queryset.filter(absent=True).update(excused=True, excuse_type=excuse_type)
mark_as_excuse_type.short_description = _(f"Mark as {excuse_type.name}")
mark_as_excuse_type.__name__ = f"mark_as_excuse_type_{excuse_type.short_name}"
@@ -35,7 +36,11 @@ def mark_as_excuse_type_generator(excuse_type) -> Callable:
def delete_personal_note(modeladmin, request, queryset):
queryset.delete()
notes = []
for personal_note in queryset:
personal_note.reset_values()
notes.append(personal_note)
PersonalNote.objects.bulk_update(notes)
delete_personal_note.short_description = _("Delete")
Loading