From 081e7daad6e58b77e0aee4abba38889a93649dbf Mon Sep 17 00:00:00 2001
From: baoliang <j2eer@163.com>
Date: Sun, 13 Sep 2020 15:21:23 +0800
Subject: [PATCH] add news

---
 polls/urls.py                                   |   1 +
 polls/views/__init__.py                         |   4 ++--
 polls/views/__pycache__/__init__.cpython-38.pyc | Bin 625 -> 645 bytes
 polls/views/__pycache__/news.cpython-38.pyc     | Bin 355 -> 859 bytes
 polls/views/news.py                             |  16 ++++++++++++++++
 5 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/polls/urls.py b/polls/urls.py
index 7907663..0ba4fc2 100644
--- a/polls/urls.py
+++ b/polls/urls.py
@@ -16,6 +16,7 @@ urlpatterns = [
     path('notices/read/', views.read_notice, name='polls_read_notice'),
     path('medias/create/', views.create_media, name='polls_add_media'),
     path('medias/list/', views.medias, name='polls_medias'),
+    path('news/list/', views.news_list, name='polls_news'),
     path('news/detail/', views.news_detail, name='polls_news_detail'),
     path('monitor/statistics/', views.monitor_statistics, name='polls_monitor_statistics')
 ]
diff --git a/polls/views/__init__.py b/polls/views/__init__.py
index 97b8ab9..6926182 100644
--- a/polls/views/__init__.py
+++ b/polls/views/__init__.py
@@ -1,5 +1,5 @@
 from .user import index, status_500, status_401, polls_login, send_code, register_step_one, register_step_two, password_recover_step_one, password_recover_step_two
 from .notice import notices, read_notice
 from .media import medias, create_media
-from .news import news_detail
-from .monitor import monitor_statistics
\ No newline at end of file
+from .news import news_list, news_detail
+from .monitor import monitor_statistics
diff --git a/polls/views/__pycache__/__init__.cpython-38.pyc b/polls/views/__pycache__/__init__.cpython-38.pyc
index 1ae94de47d17ce2f6b1da88c47928fbf54273d56..1e6d763ab7a1274eabaeb8cc272683a2327aa37d 100644
GIT binary patch
delta 105
zcmey!(#pyk%FD~e00fVY#m2i$<dtR2nW!BpkSi1=#K@4skiwcHoGTI~GI7FX9;REI
zd8y^a@j02rC6iMaRT)JmcQGc)6bS%z-(t_r&&w>yFDeoQ@>Vhwi36!3@ySd~xl96#
E0OK<oZvX%Q

delta 85
zcmZo={m8-_%FD~e00f>+G4WOtd1V<hCTd6WFfybtq_E})<qAg$Pn>d@k#TY{qbj4w
l<e7|#;<wmy^Yb!G@{5WDfcjQ46o~<;BC*M0Ou0-vi~wTL6fXb(

diff --git a/polls/views/__pycache__/news.cpython-38.pyc b/polls/views/__pycache__/news.cpython-38.pyc
index 852cee9dbe6269b6b7e36d0fba227f36522a3e97..d1ac08445ec78df2dd4f7fc355644999091d0a4b 100644
GIT binary patch
literal 859
zcmY*XyKWRQ6tz9ieMONF5dun@X?8*?iU=VAK>}$DAk9iqG&^>7XYq_Dwij45TZK0N
zkd*lZB)-Hg6~92mz1|1~TR!)AeBXDDN25N0_4CKc=_f|WFTC7c@Qu8HW1azU!l@)R
zol=UNNmd8b!1F+cbu^8DhdlaDrZJCs0y5$02a@%EgEhIKF4m&qLTA*46Y<4>9KJQG
zc`r<>8Y4=IdbcYE8Nzu9$9x6o$dX)9PC2_~8*14yScV<t!6n_WIoSjqdqqx;Hld9!
z$R_H-W!yzPJS4ypV3B7ju-LO6u*9=IuoPHuHRz&iDDM1;9d-fl@%|-)^am4{mW35_
zrPq!=#q9066^>QhMYgh1xVTu^h0-o5RbxeCUC6=U2vtpSCbE$W-n{<kg1N97i*kvY
zEk$XKi_a=)g$9GFw7Lgx8b_iB2t$Ms00d}T=$($>lEp63;(R5H)z~H1YoM8@vN9GQ
z%u0e^s<7M0Z-{;fT7TZ<$3|$A&k7~0qM7HdRz8RPVE<r0uhp!QA_rHs;8jtprm{*`
zsHdbf`R59P;IkRGYrO{^F&FayfY2S-Ax&va`~UWkdaeJ4iUSVd_@QE*7RJiy1-6+@
zzU^&8`Et0hMJ2}zTT6|<VMg_R5WbczJc6qm+)=&<9}MaesviSRvefPJCDf|M2F7E{
zl{FgUPj`7?7Bf|7KCTrP(rm{vxYb@*+xlMn61=lJfw7(1M^6vIdL_kkEX<?;LkgRv
GJAVPjMb6Fu

delta 192
zcmcc3_Lzw;l$V!_0SJ!%iij^^n8+uiD*@!CFr+Z%Fyt~uF)}iwFr_fJFhnt>umm$`
zvc3c<Udecittd4wCADaB3X>P_E%u_+!qU{@l9dcatdn0d2BhBN&Py#Xj!#J~NzBY)
z2I?qg0_kHcVh56bn#{KZQnC{B()0C-GxCc{l1od9i$JQt(nYKw7J^^{a&K|i<mRW8
O=A_y&0(oG=c$ffPh%MIu

diff --git a/polls/views/news.py b/polls/views/news.py
index 1212d68..a8f6cc3 100644
--- a/polls/views/news.py
+++ b/polls/views/news.py
@@ -1,4 +1,20 @@
 from django.shortcuts import render
+from dashboard.models import News
+from django.http import JsonResponse
+
+def news_list(request):
+    category = request.GET.get('category','1')
+    news_list = News.objects.filter(type=category)
+    results = []
+    for o in news_list:
+        result = dict()
+        result['id'] = o.id
+        result['title'] = o.title
+        result['author'] = o.author
+        result['content'] = o.content
+        result['date'] = o.date
+        results.append(result)
+    return JsonResponse(results, safe=False)
 
 def news_detail(request):
     return render(request, 'polls/news_detail.html')