Skip to content
Snippets Groups Projects
Commit 25a3b3f9 authored by Felix Blanke's avatar Felix Blanke
Browse files

Rename json import to make clear that a schedule is imported

parent c7b910c2
No related branches found
No related tags found
1 merge request!5Refactor main
...@@ -274,7 +274,7 @@ class RoomFormWithAvailabilities(AvailabilitiesFormMixin, RoomForm): ...@@ -274,7 +274,7 @@ class RoomFormWithAvailabilities(AvailabilitiesFormMixin, RoomForm):
self.fields["properties"].queryset = AKRequirement.objects.filter(event=self.instance.event) 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.""" """Form to import an AK schedule from a json file."""
json_data = forms.CharField( json_data = forms.CharField(
required=True, required=True,
......
...@@ -1262,8 +1262,8 @@ msgstr "" ...@@ -1262,8 +1262,8 @@ msgstr ""
"{u} Slot(s) aktualisiert, {c} Slot(s) hinzugefügt und {d} Slot(s) gelöscht" "{u} Slot(s) aktualisiert, {c} Slot(s) hinzugefügt und {d} Slot(s) gelöscht"
#: AKModel/views/manage.py:257 #: AKModel/views/manage.py:257
msgid "AK JSON Import" msgid "AK Schedule JSON Import"
msgstr "AK-JSON-Import" msgstr "AK-Plan JSON-Import"
#: AKModel/views/room.py:37 #: AKModel/views/room.py:37
#, python-format #, python-format
......
...@@ -5,7 +5,7 @@ from rest_framework.routers import DefaultRouter ...@@ -5,7 +5,7 @@ from rest_framework.routers import DefaultRouter
import AKModel.views.api import AKModel.views.api
from AKModel.views.manage import ExportSlidesView, PlanPublishView, PlanUnpublishView, DefaultSlotEditorView, \ from AKModel.views.manage import ExportSlidesView, PlanPublishView, PlanUnpublishView, DefaultSlotEditorView, \
AKsByUserView, AKJSONImportView AKsByUserView, AKScheduleJSONImportView
from AKModel.views.ak import AKRequirementOverview, AKCSVExportView, AKJSONExportView, AKWikiExportView, \ from AKModel.views.ak import AKRequirementOverview, AKCSVExportView, AKJSONExportView, AKWikiExportView, \
AKMessageDeleteView AKMessageDeleteView
from AKModel.views.event_wizard import NewEventWizardStartView, NewEventWizardPrepareImportView, \ from AKModel.views.event_wizard import NewEventWizardStartView, NewEventWizardPrepareImportView, \
...@@ -99,8 +99,8 @@ def get_admin_urls_event(admin_site): ...@@ -99,8 +99,8 @@ def get_admin_urls_event(admin_site):
name="ak_csv_export"), name="ak_csv_export"),
path('<slug:event_slug>/ak-json-export/', admin_site.admin_view(AKJSONExportView.as_view()), path('<slug:event_slug>/ak-json-export/', admin_site.admin_view(AKJSONExportView.as_view()),
name="ak_json_export"), name="ak_json_export"),
path('<slug:event_slug>/ak-json-import/', admin_site.admin_view(AKJSONImportView.as_view()), path('<slug:event_slug>/ak-schedule-json-import/', admin_site.admin_view(AKScheduleJSONImportView.as_view()),
name="ak_json_import"), name="ak_schedule_json_import"),
path('<slug:slug>/ak-wiki-export/', admin_site.admin_view(AKWikiExportView.as_view()), path('<slug:slug>/ak-wiki-export/', admin_site.admin_view(AKWikiExportView.as_view()),
name="ak_wiki_export"), name="ak_wiki_export"),
path('<slug:event_slug>/delete-orga-messages/', admin_site.admin_view(AKMessageDeleteView.as_view()), path('<slug:event_slug>/delete-orga-messages/', admin_site.admin_view(AKMessageDeleteView.as_view()),
......
...@@ -14,7 +14,7 @@ from django.views.generic import TemplateView, DetailView ...@@ -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.core import render_template_with_context, run_tex_in_directory
from django_tex.response import PDFResponse 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.metaviews.admin import EventSlugMixin, IntermediateAdminView, IntermediateAdminActionView, AdminViewMixin
from AKModel.models import ConstraintViolation, Event, DefaultSlot, AKOwner from AKModel.models import ConstraintViolation, Event, DefaultSlot, AKOwner
...@@ -249,12 +249,12 @@ class AKsByUserView(AdminViewMixin, EventSlugMixin, DetailView): ...@@ -249,12 +249,12 @@ class AKsByUserView(AdminViewMixin, EventSlugMixin, DetailView):
template_name = "admin/AKModel/aks_by_user.html" 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. View: Import an AK schedule from a json file that can be pasted into this view.
""" """
form_class = JSONImportForm form_class = JSONScheduleImportForm
title = _("AK JSON Import") title = _("AK Schedule JSON Import")
def form_valid(self, form): def form_valid(self, form):
self.event.schedule_from_json(form.data["json_data"]) self.event.schedule_from_json(form.data["json_data"])
......
...@@ -135,7 +135,7 @@ class EventAKsWidget(TemplateStatusWidget): ...@@ -135,7 +135,7 @@ class EventAKsWidget(TemplateStatusWidget):
}, },
{ {
"text": _("Import AK schedule from JSON"), "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"), "text": _("Export AKs as CSV"),
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment