From 0a2cacf7fa992d4a03e4d4d2a15a192da94792e5 Mon Sep 17 00:00:00 2001 From: Felix Blanke <info@fblanke.de> Date: Thu, 26 Dec 2024 18:51:18 +0100 Subject: [PATCH] Rename json import to make clear that a schedule is imported --- AKModel/forms.py | 2 +- AKModel/locale/de_DE/LC_MESSAGES/django.po | 6 +++--- AKModel/models.py | 2 +- AKModel/urls.py | 6 +++--- AKModel/views/manage.py | 8 ++++---- AKModel/views/status.py | 2 +- 6 files changed, 13 insertions(+), 13 deletions(-) diff --git a/AKModel/forms.py b/AKModel/forms.py index 25b6e4fe..9ec3d24e 100644 --- a/AKModel/forms.py +++ b/AKModel/forms.py @@ -283,7 +283,7 @@ class RoomFormWithAvailabilities(AvailabilitiesFormMixin, RoomForm): self.fields["properties"].queryset = AKRequirement.objects.filter(event=self.instance.event) -class JSONImportForm(AdminIntermediateForm): +class JSONScheduleImportForm(AdminIntermediateForm): """Form to import an AK schedule from a json file.""" json_data = forms.CharField( required=True, diff --git a/AKModel/locale/de_DE/LC_MESSAGES/django.po b/AKModel/locale/de_DE/LC_MESSAGES/django.po index 648cd9bf..0b7afd2a 100644 --- a/AKModel/locale/de_DE/LC_MESSAGES/django.po +++ b/AKModel/locale/de_DE/LC_MESSAGES/django.po @@ -1322,9 +1322,9 @@ msgid "Updated {u} slot(s). created {c} new slot(s) and deleted {d} slot(s)" msgstr "" "{u} Slot(s) aktualisiert, {c} Slot(s) hinzugefügt und {d} Slot(s) gelöscht" -#: AKModel/views/manage.py:252 -msgid "AK JSON Import" -msgstr "AK-JSON-Import" +#: AKModel/views/manage.py:257 +msgid "AK Schedule JSON Import" +msgstr "AK-Plan JSON-Import" #: AKModel/views/room.py:37 #, python-format diff --git a/AKModel/models.py b/AKModel/models.py index 8b2aa676..b14e6189 100644 --- a/AKModel/models.py +++ b/AKModel/models.py @@ -668,7 +668,7 @@ class AK(models.Model): availabilities = ', \n'.join(f'{a.simplified}' for a in Availability.objects.select_related('event') .filter(ak=self)) detail_string = f"""{self.name}{" (R)" if self.reso else ""}: - + {self.owners_list} {_('Interest')}: {self.interest}""" diff --git a/AKModel/urls.py b/AKModel/urls.py index 9871b411..9c103405 100644 --- a/AKModel/urls.py +++ b/AKModel/urls.py @@ -5,7 +5,7 @@ from rest_framework.routers import DefaultRouter import AKModel.views.api from AKModel.views.manage import ExportSlidesView, PlanPublishView, PlanUnpublishView, DefaultSlotEditorView, \ - AKsByUserView, AKJSONImportView + AKsByUserView, AKScheduleJSONImportView from AKModel.views.ak import AKRequirementOverview, AKCSVExportView, AKJSONExportView, AKWikiExportView, \ AKMessageDeleteView from AKModel.views.event_wizard import NewEventWizardStartView, NewEventWizardPrepareImportView, \ @@ -99,8 +99,8 @@ def get_admin_urls_event(admin_site): name="ak_csv_export"), path('<slug:event_slug>/ak-json-export/', admin_site.admin_view(AKJSONExportView.as_view()), name="ak_json_export"), - path('<slug:event_slug>/ak-json-import/', admin_site.admin_view(AKJSONImportView.as_view()), - name="ak_json_import"), + path('<slug:event_slug>/ak-schedule-json-import/', admin_site.admin_view(AKScheduleJSONImportView.as_view()), + name="ak_schedule_json_import"), path('<slug:slug>/ak-wiki-export/', admin_site.admin_view(AKWikiExportView.as_view()), name="ak_wiki_export"), path('<slug:event_slug>/delete-orga-messages/', admin_site.admin_view(AKMessageDeleteView.as_view()), diff --git a/AKModel/views/manage.py b/AKModel/views/manage.py index ec5076fb..1bad9534 100644 --- a/AKModel/views/manage.py +++ b/AKModel/views/manage.py @@ -14,7 +14,7 @@ from django.views.generic import TemplateView, DetailView from django_tex.core import render_template_with_context, run_tex_in_directory from django_tex.response import PDFResponse -from AKModel.forms import SlideExportForm, DefaultSlotEditorForm, JSONImportForm +from AKModel.forms import SlideExportForm, DefaultSlotEditorForm, JSONScheduleImportForm from AKModel.metaviews.admin import EventSlugMixin, IntermediateAdminView, IntermediateAdminActionView, AdminViewMixin from AKModel.models import ConstraintViolation, Event, DefaultSlot, AKOwner @@ -249,12 +249,12 @@ class AKsByUserView(AdminViewMixin, EventSlugMixin, DetailView): template_name = "admin/AKModel/aks_by_user.html" -class AKJSONImportView(EventSlugMixin, IntermediateAdminView): +class AKScheduleJSONImportView(EventSlugMixin, IntermediateAdminView): """ View: Import an AK schedule from a json file that can be pasted into this view. """ - form_class = JSONImportForm - title = _("AK JSON Import") + form_class = JSONScheduleImportForm + title = _("AK Schedule JSON Import") def form_valid(self, form): self.event.schedule_from_json(form.data["json_data"]) diff --git a/AKModel/views/status.py b/AKModel/views/status.py index 451d8b27..0cb26c3c 100644 --- a/AKModel/views/status.py +++ b/AKModel/views/status.py @@ -140,7 +140,7 @@ class EventAKsWidget(TemplateStatusWidget): }, { "text": _("Import AK schedule from JSON"), - "url": reverse_lazy("admin:ak_json_import", kwargs={"event_slug": context["event"].slug}), + "url": reverse_lazy("admin:ak_schedule_json_import", kwargs={"event_slug": context["event"].slug}), }, { "text": _("Export AKs as CSV"), -- GitLab