Add redirect back to a correct page after editing/deleting a song

backend/mixins.py

@@ -1,7 +1,10 @@
+"""General mixins"""
 from django.contrib.auth.mixins import LoginRequiredMixin, UserPassesTestMixin
 
 from backend.auth import is_localadmin, is_superadmin
 
+# pylint: disable=no-member
+
 
 class RegenerateViewMixin:
     """Mixin which tell you if the object changed or not"""
@@ -42,3 +45,17 @@ class SuperAdminRequired(LoginRequiredMixin, UserPassesTestMixin):
 
     def test_func(self):
         return is_superadmin(self.request)
+
+
+class RedirectToNextMixin:
+    """Mixin for redirecting to the page specified in next parameter"""
+
+    default_next_page = None
+
+    def get_success_url(self):
+        """Returns success_url to redirect to"""
+        if "next" in self.request.GET:
+            return self.request.GET["next"]
+        if "next" in self.request.POST:
+            return self.request.POST["next"]
+        return self.default_next_page

backend/templates/songs/index.html

@@ -115,8 +115,8 @@ <h6 class="d-inline" ><%:author%></h6>
     const canWakeLock = () => 'wakeLock' in navigator;
 
     {% if user.is_authenticated %}
-    const baseEditUrl = "{% url "chords:edit" pk="0" %}"
-    const baseDeleteUrl = "{% url "chords:delete" pk="0" %}"
+    const baseEditUrl = "{% url "chords:edit" pk="0" %}?next={{ request.path }}"
+    const baseDeleteUrl = "{% url "chords:delete" pk="0" %}?next={{ request.path }}"
     {% endif %}
 
     $.views.settings.delimiters("<%", "%>");

backend/views.py

@@ -10,8 +10,8 @@
 from django.utils.translation import gettext_lazy as _
 from django.views.generic import ListView, CreateView, UpdateView, DeleteView, RedirectView
 
-from backend.mixins import RegenerateViewMixin, PassRequestToFormMixin, LocalAdminRequired
 from backend.forms import SongForm
+from backend.mixins import RegenerateViewMixin, PassRequestToFormMixin, LocalAdminRequired, RedirectToNextMixin
 from backend.models import Song
 from backend.utils import regenerate_pdf, regenerate_prerender
 
@@ -97,13 +97,20 @@ def get_success_url(self):
         return super().get_success_url()
 
 
-class SongUpdateView(LocalAdminRequired, PassRequestToFormMixin, SuccessMessageMixin, RegenerateViewMixin, UpdateView):
+class SongUpdateView(
+    LocalAdminRequired,
+    PassRequestToFormMixin,
+    SuccessMessageMixin,
+    RegenerateViewMixin,
+    RedirectToNextMixin,
+    UpdateView,
+):
     """Updates existing song"""
 
     form_class = SongForm
     model = Song
     template_name = "songs/add.html"
-    success_url = reverse_lazy("backend:index")
+    default_next_page = reverse_lazy("backend:index")
     success_message = _("Song %(name)s was successfully updated")
 
     def post(self, request, *args, **kwargs):
@@ -114,12 +121,12 @@ def post(self, request, *args, **kwargs):
         return response
 
 
-class SongDeleteView(LocalAdminRequired, DeleteView):
+class SongDeleteView(LocalAdminRequired, RedirectToNextMixin, DeleteView):
     """Removes song"""
 
     model = Song
     template_name = "songs/confirm_delete.html"
-    success_url = reverse_lazy("backend:index")
+    default_next_page = reverse_lazy("backend:index")
     success_message = _("Song %s was successfully deleted")
 
     def post(self, request, *args, **kwargs):