diff --git a/days/templates/days/day_detail.html b/days/templates/days/day_detail.html index 08ac586..5e7f7e8 100644 --- a/days/templates/days/day_detail.html +++ b/days/templates/days/day_detail.html @@ -16,13 +16,13 @@ {% endfor %} - Add Day + Add Day

{{ day.prettyname }} - + edit

diff --git a/days/views.py b/days/views.py index 785a569..793002a 100644 --- a/days/views.py +++ b/days/views.py @@ -18,13 +18,8 @@ class DayDetailView(generic.DetailView): model = IngameDay context_object_name = "day" - def get_context_data(self, **kwargs): - data = super().get_context_data(**kwargs) - data["days"] = IngameDay.objects.filter(campaign__slug=self.kwargs['campslug']) - return data - def get_object(self, queryset=None): - return IngameDay.objects.get(campaign__slug=self.kwargs['campslug'], day=self.kwargs['day']) + return IngameDay.objects.get(day=self.kwargs['day']) class DayCreateView(generic.CreateView): @@ -44,14 +39,11 @@ class DayEditView(generic.UpdateView): data['edit'] = True return data - # def get_object(self, queryset=None): - # return IngameDay.objects.get(campaign__slug=self.kwargs['campslug'], day=self.kwargs['day']) + def get_object(self, queryset=None): + return IngameDay.objects.get(day=self.kwargs['day']) class DayDeleteView(generic.DeleteView): template_name = "common/campaign_confirm_delete.html" model = IngameDay success_url = reverse_lazy('daylist') - - # def get_object(self, queryset=None): - # return IngameDay.objects.get(campaign__slug=self.kwargs['campslug'], day=self.kwargs['day']) diff --git a/loot/views.py b/loot/views.py index 4c6a9d0..3d77809 100644 --- a/loot/views.py +++ b/loot/views.py @@ -2,8 +2,8 @@ from django.db.models import Sum from django.urls import reverse_lazy from django.views import generic -from loot.models import Loot from loot.forms import LootForm +from loot.models import Loot class LootListView(generic.ListView): @@ -11,9 +11,6 @@ class LootListView(generic.ListView): model = Loot context_object_name = "loot" - # def get_queryset(self): - # return Loot.objects.filter(campaign__slug=self.kwargs['campslug']) - def get_context_data(self, **kwargs): data = super().get_context_data(**kwargs) data['total_value'] = self.get_queryset().aggregate(Sum("value_gold"))["value_gold__sum"]