Merge remote-tracking branch 'origin/main'

article picture

ArticlesApp/views.py

@@ -75,7 +75,7 @@ def ArticlesPageView(request, year=None):
             raise Http404
 
 
-    arts = ArticleModel.objects.filter(**kwargs)
+    arts = ArticleModel.objects.filter(**kwargs).order_by('createDT')
 
     Dict = {
         'articles': arts
@@ -141,5 +141,5 @@ def ArticlesOnePageView(request, art_url):
 
 
 
-    t = loader.get_template('pages/p_user_page.html')
+    t = loader.get_template('pages/p_article.html')
     return HttpResponse(t.render(Dict, request))

templates/pages/p_articles.html

@@ -6,6 +6,6 @@
         <div><img src="{{ MEDIA_URL }}{{ art.picture }}" /></div>
         <div>{{ art.name }}</div>
         <div>{{ art.description }}</div>
-        <div>{{ art.text|safe }}</div>
+{#        <div>{{ art.text|safe }}</div>#}
     {% endfor %}
 {% endblock %}