Merge remote-tracking branch 'origin/main'
This commit is contained in:
@@ -28,20 +28,23 @@ def get_flat_pages_links_Dict(site):
|
|||||||
|
|
||||||
def get_article_breadcrumbs(request, art):
|
def get_article_breadcrumbs(request, art):
|
||||||
# print('get_article_breadcrumbs')
|
# print('get_article_breadcrumbs')
|
||||||
articles_add_count = 1
|
articles_add_count = 3
|
||||||
# half_count = articlesCountInBlock / 2
|
# half_count = articlesCountInBlock / 2
|
||||||
|
|
||||||
arts_top = ArticleModel.objects.filter(enable=True, createDT__gt=art.createDT).order_by(
|
# arts_top = ArticleModel.objects.filter(enable=True, createDT__gt=art.createDT).order_by(
|
||||||
'createDT')[:articles_add_count]
|
# 'createDT')[:articles_add_count]
|
||||||
arts_down = ArticleModel.objects.filter(enable=True, createDT__lt=art.createDT).order_by(
|
# arts_down = ArticleModel.objects.filter(enable=True, createDT__lt=art.createDT).order_by(
|
||||||
'-createDT')[:articles_add_count]
|
# '-createDT')[:articles_add_count]
|
||||||
# if len(artListDown)<half_count:
|
# if len(artListDown)<half_count:
|
||||||
# art_List = ArticleModel.objects.filter(enable=True, article_DT__gte=art.article_DT).order_by(
|
# art_List = ArticleModel.objects.filter(enable=True, article_DT__gte=art.article_DT).order_by(
|
||||||
# 'article_DT')[:art.articlesCountInBlock-len(artListDown)]
|
# 'article_DT')[:art.articlesCountInBlock-len(artListDown)]
|
||||||
|
|
||||||
|
breadcrumbs_arts = ArticleModel.objects.exclude(id=art.id).order_by('?')[:3]
|
||||||
|
|
||||||
Dict = {
|
Dict = {
|
||||||
'arts_top': arts_top,
|
'breadcrumbs_arts': breadcrumbs_arts
|
||||||
'arts_down': arts_down
|
# 'arts_top': arts_top,
|
||||||
|
# 'arts_down': arts_down
|
||||||
}
|
}
|
||||||
return Dict
|
return Dict
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user