Save form in UpdateTemplateView

- Fixes image not being passed around correctly
- Update list urls to point to root

Author: pehala

chords/locale/cs/LC_MESSAGES/django.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-12-27 20:43+0100\n"
+"POT-Creation-Date: 2024-12-28 18:50+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[email protected]>\n"
@@ -155,48 +155,48 @@ msgstr "Písnička"
 msgid "Songs"
 msgstr "Písničky"
 
-#: backend/templates/songs/index.html:27
+#: backend/templates/songs/index.html:25
 msgid "Hide chords"
 msgstr "Skrýt akordy"
 
-#: backend/templates/songs/index.html:33
+#: backend/templates/songs/index.html:31
 msgid "Prevent sleep"
 msgstr "Zabránit uspání"
 
-#: backend/templates/songs/index.html:39
+#: backend/templates/songs/index.html:37
 msgid "Single page"
 msgstr "Bez stránek"
 
-#: backend/templates/songs/index.html:64
+#: backend/templates/songs/index.html:62
 #: category/templates/category/list.html:21
 #: pdf/templates/pdf/files/list.html:30
 #: pdf/templates/pdf/templates/list.html:36
 msgid "Actions"
 msgstr "Akce"
 
-#: backend/templates/songs/index.html:69
+#: backend/templates/songs/index.html:67
 #: category/templates/category/list.html:55
 #: pdf/templates/pdf/files/list.html:56
 #: pdf/templates/pdf/templates/list.html:73
 msgid "Edit"
 msgstr "Upravit"
 
-#: backend/templates/songs/index.html:72
+#: backend/templates/songs/index.html:70
 #: category/templates/category/list.html:74
 #: pdf/templates/pdf/files/list.html:71
 #: pdf/templates/pdf/templates/list.html:83
 msgid "Delete"
 msgstr "Smazat"
 
-#: backend/templates/songs/index.html:86
+#: backend/templates/songs/index.html:83
 msgid "Transpose"
 msgstr "Transponovat"
 
-#: backend/templates/songs/index.html:105
+#: backend/templates/songs/index.html:101
 msgid "Search"
 msgstr "Vyhledávání"
 
-#: backend/templates/songs/index.html:107
+#: backend/templates/songs/index.html:102
 msgid "Number, text or author"
 msgstr "Číslo, text nebo autor"
 
@@ -229,7 +229,7 @@ msgid "Category"
 msgstr "Kategorie"
 
 #: category/templates/category/list.html:14
-#: frontend/templates/base/index.html:82 pdf/models/__init__.py:54
+#: frontend/templates/base/index.html:81 pdf/models/__init__.py:54
 msgid "Language"
 msgstr "Jazyk"
 
@@ -332,7 +332,7 @@ msgstr "Zpátky domů"
 msgid "URL %(request_path)s does not exist."
 msgstr "URL %(request_path)s neexistuje."
 
-#: frontend/templates/base/error.html:8
+#: frontend/templates/base/error.html:7
 msgid "Not found"
 msgstr "Nenalezeno"
 
@@ -341,27 +341,27 @@ msgstr "Nenalezeno"
 msgid "Submit"
 msgstr "Odeslat"
 
-#: frontend/templates/base/index.html:38 tenants/models.py:44
+#: frontend/templates/base/index.html:37 tenants/models.py:44
 msgid "Logo"
 msgstr ""
 
-#: frontend/templates/base/index.html:72
+#: frontend/templates/base/index.html:71
 msgid "Options"
 msgstr "Možnosti"
 
-#: frontend/templates/base/index.html:101
+#: frontend/templates/base/index.html:100
 msgid "Version"
 msgstr "Verze"
 
-#: frontend/templates/base/index.html:102
+#: frontend/templates/base/index.html:101
 msgid "Git"
 msgstr ""
 
-#: frontend/templates/base/index.html:110
+#: frontend/templates/base/index.html:109
 msgid "Logged as"
 msgstr "Přihlášen jako"
 
-#: frontend/templates/base/index.html:112
+#: frontend/templates/base/index.html:111
 msgid "Log in"
 msgstr "Přihlásit se"
 
@@ -383,22 +383,22 @@ msgstr "Ne"
 msgid "Yes"
 msgstr "Ano"
 
-#: frontend/templates/markdownx/widget.html:8
+#: frontend/templates/markdownx/widget.html:10
+msgid "Preview"
+msgstr "Náhled"
+
+#: frontend/templates/markdownx/widget.html:17
 msgid "Help"
 msgstr "Nápověda"
 
-#: frontend/templates/markdownx/widget.html:10
+#: frontend/templates/markdownx/widget.html:19
 msgid "Displays chord"
 msgstr "Zobrazí akord"
 
-#: frontend/templates/markdownx/widget.html:11
+#: frontend/templates/markdownx/widget.html:20
 msgid "Adds N empty spaces"
 msgstr "Přidá N mezer"
 
-#: frontend/templates/markdownx/widget.html:18
-msgid "Preview"
-msgstr "Náhled"
-
 #: frontend/templates/registration/login.html:4
 #: frontend/templates/registration/login.html:5
 msgid "Login"
@@ -649,7 +649,7 @@ msgstr "Postup"
 msgid "Back to all files"
 msgstr "Zpátky na seznam souborů"
 
-#: pdf/templates/pdf/index.html:45
+#: pdf/templates/pdf/index.html:44
 msgid "Table of Contents"
 msgstr "Obsah"
 
@@ -662,15 +662,15 @@ msgstr "Pořadí písniček"
 msgid "Please, choose song order and their numbers"
 msgstr "Zvolte prosím pořadí písniček a jejich čísla"
 
-#: pdf/templates/pdf/templates/assign.html:23
+#: pdf/templates/pdf/templates/assign.html:20
 msgid "Song numbers"
 msgstr "Čísla písniček"
 
-#: pdf/templates/pdf/templates/assign.html:37
+#: pdf/templates/pdf/templates/assign.html:34
 msgid "Sort by name"
 msgstr "Seřadit podle jména"
 
-#: pdf/templates/pdf/templates/assign.html:38
+#: pdf/templates/pdf/templates/assign.html:35
 msgid "Finish"
 msgstr "Dokončit"
 
@@ -682,28 +682,28 @@ msgstr "Přidat Šablonu"
 msgid "Generate"
 msgstr "Generovat"
 
+#: pdf/templates/pdf/templates/select.html:8
 #: pdf/templates/pdf/templates/select.html:9
-#: pdf/templates/pdf/templates/select.html:10
 msgid "Create new File Template"
 msgstr "Vytvořit novou Šablonu"
 
-#: pdf/templates/pdf/templates/select.html:26
+#: pdf/templates/pdf/templates/select.html:25
 msgid ""
 "Please enter file configuration option and select which songs you would like "
 "to include"
 msgstr ""
 "Prosím vyplňte parametry PDF souboru a vyberte písničky, které má soubor "
 "obsahovat"
 
-#: pdf/templates/pdf/templates/select.html:93
+#: pdf/templates/pdf/templates/select.html:92
 msgid "Select All"
 msgstr "Vybrat všechny"
 
-#: pdf/templates/pdf/templates/select.html:100
+#: pdf/templates/pdf/templates/select.html:99
 msgid "Deselect all"
 msgstr "Zrušit výběr"
 
-#: pdf/templates/pdf/templates/select.html:105
+#: pdf/templates/pdf/templates/select.html:104
 msgid "Finish selecting"
 msgstr "Dokončit výběr"
 
@@ -717,16 +717,21 @@ msgstr "Jiný Soubor (%(id)s) for %(name)s je již ve frontě"
 msgid "Scheduled File (%(id)s) generation from template %(template)s"
 msgstr "Generování souboru (%(id)s) ze šablony %(template)s bylo naplánováno"
 
-#: pdf/views/templates.py:171
+#: pdf/views/templates.py:141
 #, python-format
 msgid "File Template '%(name)s' was successfully updated"
 msgstr "Šablona %(name)s byla úspěšně upravena"
 
-#: pdf/views/templates.py:176
+#: pdf/views/templates.py:146
 #, python-format
 msgid "File Template '%(name)s' was successfully created"
 msgstr "Šablona %(name)s byl úspěšně vytvořena"
 
+#: pdf/views/templates.py:174
+#,  python-format
+msgid "Songs in File Template '%(name)s' were successfully updated"
+msgstr "Písničky Šablony %(name)s byly úspěšně upraveny"
+
 #: tenants/admin.py:21 tenants/models.py:58
 msgid "Tenant"
 msgstr "Zpěvník"

pdf/templates/pdf/templates/assign.html

@@ -13,11 +13,8 @@
 
 {% block framed_body %}
   <p class="text-center fw-bold">{% trans "Please, choose song order and their numbers" %}</p>
-  <form method="post" action="{{ action }}">
+  <form method="post" action="{{ action }}" enctype="multipart/form-data">
     {% csrf_token %}
-    <div class="d-none">
-    {% bootstrap_form form %}
-    </div>
     {{ formset.management_form }}
     {{ formset.non_form_errors.as_ul }}
     <h4>{% trans "Song numbers" %}</h4>
@@ -36,8 +33,8 @@ <h4>{% trans "Song numbers" %}</h4>
 
     {% bootstrap_button _("Sort by name") button_type="button" button_class="btn-secondary" id="sort"%}
     {% bootstrap_button _("Finish") button_type="submit"%}
+    {{ form.media }}
   </form>
-  {{ form.media }}
 <script type="module">
     const sortable = $('#sortable')
     function reassign_numbers() {

pdf/urls.py

@@ -19,11 +19,10 @@
 )
 
 template_patterns = [
-    path("list", TemplateListView.as_view(), name="list"),
+    path("", TemplateListView.as_view(), name="list"),
     path("new", UpdateTemplateView.as_view(), name="new"),
     path("edit/<int:pk>", UpdateTemplateView.as_view(), name="edit"),
     path("delete/<int:pk>", TemplateDeleteView.as_view(), name="delete"),
-    path("assign", TemplateNumberSelectView.as_view(), name="assign"),
     path("assign/<int:pk>", TemplateNumberSelectView.as_view(), name="assign"),
     path("<int:pk>/generate", GenerateFromTemplateView.as_view(), name="generate"),
     path("move", MovePDFTemplatesView.as_view(), name="move"),
@@ -34,7 +33,7 @@
     path("info/<int:pk>", RenderInfoView.as_view(), name="info"),
     path("delete/<int:pk>", FileDeleteView.as_view(), name="delete"),
     path("edit/<int:pk>", FileUpdateView.as_view(), name="edit"),
-    path("list", FileListView.as_view(), name="list"),
+    path("", FileListView.as_view(), name="list"),
 ]
 
 urlpatterns = [

pdf/views/templates.py

@@ -76,21 +76,17 @@ class TemplateNumberingMixin:
 
     PDFSongFormset = formset_factory(PDFSongForm, formset=BasePDFSongFormset, min_num=1, validate_min=True, extra=0)
 
-    def render_assign_template(self, form, formset=None, songs: Iterable[Song] | None = None):
+    def render_assign_template(self, pk=None, formset=None, songs: Iterable[Song] | None = None):
         """Renders assign template"""
         formset = formset or self.PDFSongFormset(
             prefix="songs",
             initial=[
                 {"name": song.name, "song_number": number, "song": song} for number, song in enumerate(songs, start=1)
             ],
         )
-        if "pk" in self.kwargs:
-            assign_url = reverse("pdf:templates:assign", kwargs={"pk": self.kwargs.get("pk")})
-        else:
-            assign_url = reverse("pdf:templates:assign")
-        return render(
-            self.request, "pdf/templates/assign.html", {"form": form, "formset": formset, "action": assign_url}
-        )
+        pk = pk or self.kwargs.get("pk")
+        assign_url = reverse("pdf:templates:assign", kwargs={"pk": pk})
+        return render(self.request, "pdf/templates/assign.html", {"formset": formset, "action": assign_url})
 
 
 class UpdateTemplateView(LocalAdminRequired, TemplateNumberingMixin, TemplateView):
@@ -135,7 +131,21 @@ def post(self, request, *args, **kwargs):
         template_form = ManualTemplateForm(self.request.POST, request.FILES, prefix=self.PREFIX)
         songs_form = SongSelectionForm(self.request.POST, request.FILES, request=self.request)
         if template_form.is_valid() and songs_form.is_valid():
-            return self.render_assign_template(template_form, songs=songs_form.cleaned_data["songs"])
+            template = template_form.instance
+            template.tenant = self.request.tenant
+            template.pdftemplate_ptr_id = self.kwargs.get("pk", None)
+            template_form.save()
+            if "pk" in self.kwargs:
+                messages.success(
+                    self.request,
+                    _("File Template '%(name)s' was successfully updated") % {"name": template.name},
+                )
+            else:
+                messages.success(
+                    self.request,
+                    _("File Template '%(name)s' was successfully created") % {"name": template.name},
+                )
+            return self.render_assign_template(pk=template_form.instance.pk, songs=songs_form.cleaned_data["songs"])
         return self.render_to_response(self.get_context_data(template_form=template_form, songs_form=songs_form))
 
 
@@ -146,38 +156,22 @@ class TemplateNumberSelectView(LocalAdminRequired, TemplateNumberingMixin, View)
 
     def get(self, *args, **kwargs):
         """Redirect back to the start of the process"""
-        if "pk" in self.kwargs:
-            return redirect(reverse("pdf:templates:edit", kwargs={"pk": self.kwargs.get("pk")}))
-        return redirect(reverse("pdf:templates:new"))
+        return redirect(reverse("pdf:templates:edit", kwargs={"pk": self.kwargs.get("pk")}))
 
     # pylint: disable=unused-argument
-    def post(self, template, *args, **kwargs):
+    def post(self, request, *args, **kwargs):
         """POST request method handler"""
-        form = ManualTemplateForm(self.request.POST, template.FILES, prefix="template")
+        template = ManualPDFTemplate.objects.get(pk=self.kwargs["pk"])
         formset = self.PDFSongFormset(self.request.POST, prefix="songs")
-        if form.is_valid() and formset.is_valid():
-            template = form.instance
-            template.tenant = self.request.tenant
-            template.pdftemplate_ptr_id = self.kwargs.get("pk", None)
+        if formset.is_valid():
             with transaction.atomic():
-                form.save()
                 template.songs.clear()
                 for form in formset:
                     form.instance.request = template
                     form.save()
-            if "pk" in self.kwargs:
-                messages.success(
-                    self.request,
-                    _("File Template '%(name)s' was successfully updated") % {"name": template.name},
-                )
-            else:
-                messages.success(
-                    self.request,
-                    _("File Template '%(name)s' was successfully created") % {"name": template.name},
-                )
+            messages.success(
+                self.request,
+                _("Songs in File Template '%(name)s' were successfully updated") % {"name": template.name},
+            )
             return redirect("pdf:templates:list")
-        return self.form_invalid(form, formset)
-
-    def form_invalid(self, form, formset):
-        """If the form is invalid, render the invalid form."""
-        return self.render_assign_template(form, formset)
+        return self.render_assign_template(formset)