diff --git a/main/models.py b/main/models.py index 90baea38877a818d22da97a56045a8c934058b58..b56d30c043bb27b43b0140cebe8676b1d46da17f 100644 --- a/main/models.py +++ b/main/models.py @@ -489,13 +489,21 @@ class MainCareersPage( current_date = date.today() - if not show_closed: + if show_closed: + filter = filter & models.Q(closing_date__lt=current_date) + else: filter = filter & models.Q(closing_date__gte=current_date) if category is not None: filter = filter & models.Q(category=category) - return MainCareerPage.objects.child_of(self).filter(filter).live().all() + return ( + MainCareerPage.objects.child_of(self) + .filter(filter) + .order_by("-created_date") + .live() + .all() + ) class Meta: verbose_name = "Kariéry" diff --git a/main/templates/main/main_careers_page.html b/main/templates/main/main_careers_page.html index bc921775ced4d01d777452a3d62afa04fde60214..403a31a8832a54c45e600e6cad2d1284f7ae644f 100644 --- a/main/templates/main/main_careers_page.html +++ b/main/templates/main/main_careers_page.html @@ -13,6 +13,12 @@ <main role="main" class="mb-20"> <div class="container--wide"> + {% if not show_closed %} + <a class="underline" href="?show_closed=true">Zobrazit uzavřené</a> + {% else %} + <a class="underline" href="?show_closed=false">Skrýt uzavřené</a> + {% endif %} + <template v-if="isCurrentView('all')"> {% get_career_pages page show_closed as career_pages %} @@ -42,12 +48,6 @@ {% endif %} </template> {% endfor %} - - {% if not show_closed %} - <a class="underline" href="?show_closed=true">Zobrazit uzavřené</a> - {% else %} - <a class="underline" href="?show_closed=false">Skrýt uzavřené</a> - {% endif %} </div> </main> </ui-view-provider> diff --git a/shared/models/main.py b/shared/models/main.py index e8bf06fc1eaa6972ae10fa83d380c1ef6dc74324..0195e217af8ac67240fefc4b99333899e89ca89d 100644 --- a/shared/models/main.py +++ b/shared/models/main.py @@ -1747,7 +1747,10 @@ class MainArticlePageMixin( articles_with_same_tags = list( all_articles_in_same_web.filter( tags__in=self.get_tags, - ).distinct().specific().all() + ) + .distinct() + .specific() + .all() ) picked_articles = [] @@ -1784,9 +1787,9 @@ class MainArticlePageMixin( picked_articles ) main_web_articles = list( - MainArticlePage.objects.distinct().all().specific()[ - : needed_supplementary_articles_num - 1 - ] + MainArticlePage.objects.distinct() + .all() + .specific()[: needed_supplementary_articles_num - 1] ) picked_articles += main_web_articles diff --git a/shared/templates/styleguide2/includes/organisms/articles/article_links_block.html b/shared/templates/styleguide2/includes/organisms/articles/article_links_block.html index c4476eb2e2d9364bc86ae0239e7cbedbff36810f..05fd7e77a8741449cc7fb51f2ce92f5dba1f3896 100644 --- a/shared/templates/styleguide2/includes/organisms/articles/article_links_block.html +++ b/shared/templates/styleguide2/includes/organisms/articles/article_links_block.html @@ -4,4 +4,4 @@ {% include 'styleguide2/includes/molecules/articles/article_title_preview.html' %} {% endfor %} </div> -{% endif %} \ No newline at end of file +{% endif %} diff --git a/shared/templates/styleguide2/includes/organisms/articles/article_list_block.html b/shared/templates/styleguide2/includes/organisms/articles/article_list_block.html index 2df949daf78f2d39e83fa632f6ec4ad129ba31b9..a10c8204a571655bfb1613068476c52abe084653 100644 --- a/shared/templates/styleguide2/includes/organisms/articles/article_list_block.html +++ b/shared/templates/styleguide2/includes/organisms/articles/article_list_block.html @@ -15,4 +15,4 @@ {% include 'styleguide2/includes/molecules/articles/article_timeline_preview.html' %} {% endfor %} </div> -{% endif %} \ No newline at end of file +{% endif %}