fix deletion

days/views.py

@@ -52,3 +52,6 @@ class DayDeleteView(generic.DeleteView):
     template_name = "common/confirm_delete.html"
     model = IngameDay
     success_url = reverse_lazy('daylist')
+
+    def get_object(self, queryset=None):
+        return IngameDay.objects.get(day=self.kwargs['day'])

locations/urls.py

@@ -7,6 +7,6 @@ urlpatterns=[
     path("add", views.LocationCreateView.as_view(), name="locationadd"),
     path("<slug:slug>", views.LocationDetailView.as_view(), name="locationdetail"),
     path("<slug:slug>/edit", views.LocationEditView.as_view(), name="locationedit"),
-    # path("<slug:slug>/delete", views.CharacterDeleteView.as_view(), name="characterdelete"),
+    path("<slug:slug>/delete", views.LocationDeleteView.as_view(), name="locationdelete"),
 
 ]

locations/views.py

@@ -1,5 +1,6 @@
 # Create your views here.
 from django.shortcuts import redirect
+from django.urls import reverse_lazy
 from django.views import generic
 
 from locations.forms import LocationForm
@@ -40,3 +41,9 @@ class LocationEditView(generic.UpdateView):
         data = super().get_context_data(**kwargs)
         data['edit'] = True
         return data
+
+
+class LocationDeleteView(generic.DeleteView):
+    template_name = "common/confirm_delete.html"
+    model = Location
+    success_url = reverse_lazy('locationlist')

loot/templates/loot/edit.html

@@ -6,8 +6,14 @@
 {% block heading %}
     {% if edit %}
         <h1>{% blocktrans with name=object.name %}Edit "{{ name }}"{% endblocktrans %}</h1>
-        {% if request.resolver_match.view_name %}
-            <a class="btn btn-danger" href="{% url "lootdelete" object.id %}">Delete</a>
+        {% if request.resolver_match.view_name == "lootedit" %}
+            <a class="btn btn-danger" href="{% url "lootdelete" object.id %}">{% translate "Delete" %}</a>
+        {% elif request.resolver_match.view_name == "dayedit" %}
+            <a class="btn btn-danger" href="{% url "daydelete" object.id %}">{% translate "Delete" %}</a>
+        {% elif request.resolver_match.view_name == "locationedit" %}
+            <a class="btn btn-danger" href="{% url "locationdelete" object.slug %}">{% translate "Delete" %}</a>
+        {% elif request.resolver_match.view_name == "characteredit" %}
+            <a class="btn btn-danger" href="{% url "characterdelete" object.slug %}">{% translate "Delete" %}</a>
         {% endif %}
     {% else %}
         <h1>{% translate "Add new" %}</h1>