minule jsem ty změny zapomněla uložit

This commit is contained in:
Kateřina Č 2020-07-01 19:55:03 +02:00
parent 6b9d9f35a7
commit 04c4c77c48

View file

@ -245,13 +245,9 @@ def spravne_novinky(request):
class TitulniStranaView(generic.ListView): class TitulniStranaView(generic.ListView):
template_name='seminar/titulnistrana.html' template_name='seminar/titulnistrana.html'
<<<<<<< HEAD
queryset = Novinky.objects.order_by('-datum')[:2]
=======
def get_queryset(self): def get_queryset(self):
return spravne_novinky(self.request)[:5] return spravne_novinky(self.request)[:5]
>>>>>>> data_migrations
def get_context_data(self, **kwargs): def get_context_data(self, **kwargs):
context = super(TitulniStranaView, self).get_context_data(**kwargs) context = super(TitulniStranaView, self).get_context_data(**kwargs)