From 478112a610aca939c8acddb68aa51eaf3af06e1a Mon Sep 17 00:00:00 2001 From: gothack329 Date: Tue, 27 Feb 2018 13:21:30 +0800 Subject: [PATCH] update comment --- article/__pycache__/models.cpython-36.pyc | Bin 3435 -> 3507 bytes article/__pycache__/views.cpython-36.pyc | Bin 1324 -> 1371 bytes article/models.py | 6 ++--- article/templates/article/detail.html | 30 +++++++++++++++++++++- article/views.py | 13 +++++++--- db.sqlite3 | Bin 266240 -> 266240 bytes templates/base.html | 4 +-- 7 files changed, 43 insertions(+), 10 deletions(-) diff --git a/article/__pycache__/models.cpython-36.pyc b/article/__pycache__/models.cpython-36.pyc index 35a5cb0fa20ae93b45a6f9a12fc21009774cdfb2..bbb3ebe8ac504b40db0c113d9bcb87b7a51157f6 100644 GIT binary patch delta 1664 zcmah}OK%)S5T2gtdCz*s>)5axLqZZq83T?(6d=Y#CQ$+?@k$V%CI_&#+slM`NHuFk z35P`@*BngefKWJb;=qXm;>Lv|e_+Cm14R4<6j3#6*=v)9mFC;3>ZcFN`=qizD3opJ>9}H8s%W2_Kz&>7dIL>VasW-q`hM zqGd`n(bB9vLJ{87qUk4Cpcb*p$_gRVGSVyey^Zx7*AkhE%HBxwyX#l3?o_|AruvaR zWUjiQUkIBR1N#uF9es9Y4vpQ&gBC5$5FAlI=_gM$NSr1hkFl^iK}a_DOJf#OKXBUW ztnrw6%I9aSfL7+!MSk@~5+fa6BFhPq4X9T~2K9(9h9hrUV=#|@>T`Bl{mtFkDGC~^ zmDFj~F+UrQ6-vfggvu#ENJ#SjSjc{zbbuxNN}8|3IIEA;{Z5CIXn<1)C@+wF8Uagw zh2&RBeqp>ZWS!RupCfo4q4KU3Ad`N6UET#(EnADMt!`PXEK*-tA0GSf26mKdN4$e+ zcAn0u!at#MTMQ%0{TjhC!J7mZ2;M;GM$X}iD84dlB2?BEF`xvSZ1$Z*^yQ$O*p&0= zRaywtlu#eFWi{f5cbLe46^x}yOKOV4UDGX@|lOCc+ zx^Nz_gvGXS@dfekg;z#}BY(4{bvf7^9q=8@GCBbje~+JAUS4=Y6U8@%_lmTvI23nE ze0$8z!2rrG(xvXq@L=S>c}n#H9RpSg=rY3F1e0dg#l<~(@?CmPWG7ymu}t*?br}<^ zQ<7bJlHQG`)wjWd4qW{b9B-RwiUVJtMv~=%p1G_ delta 1640 zcmb7EOK;Oa5cc}*ByLQ2^#O%a5Osm_EU&gugeV|r4!{L-fU3IWap;*pfDqzGSll@95(gxH05f((L!d|`+Rw9}XJ=<;KJTl6ul=pVu3LEXT?XF@ zit<6}_~~d*<4B$&aD}r-iCMrH*=nT5TA*dN7U{7O7@4g{W^4skYzKBWHzMbna$eyk zw;n0n5^S-stOZ46Z0;cAh#NUoLaM-vNEL;JE-ubX+{L-uUetq34=*EA&OFN8yQ=u> zK4Wr<&r&mPa1kYFITx#2MVu6j|;z-D_S&5ZYTLW7TYd@GHd-V~s zNNxjiMn5-5rmw>yy*gi`EE5JV>yg z;26OXf};pk-|o(%59!p%M3I^cq=p1c;;efiuZd=|W+@J%S3<5-3Qx@iG3o2wJFF># z6S(#e1!*hlgnVYdKIR|;3<2xcPxb)W3kjjKYhje6wcq7Z!FcD&`X2?VnIM)%+>H*YkqeY zWXhkCr;EdE3WYKupBH;uw9Pb*go-PafN>>Ig%;=>FDkAHb6E*lU~wI95c7d|Hm@Ek zH6EkuAU_EO$a1aXrA725^g#zDzBpH}HO3b3cnKItWgkLNrY7CR`i|vSXKKvS6`I{* qc~?ouke!Tz|Lr8HJ&B8#B5{hcNa(u6TMz#pv#p9%tn_8`AL}@Aa))$65m20TigcWi5FG^w+M_unBsVC^8WQ7mqV*<~tt(8M z;$#X6Dq1M`2k;kYO$i9`FBn@_u&a4|JKyfi&hBUVLtfqwL%IL;E`BNq`APm86#Yji zMTSZd1sTy0gQhWs4%3Wj9&;^X(PNf5+KpZ9#h&(KU&~nPAP)K%&jvb-L-d7mvf*>0 zT;;tb@kpKdN}>~~Kn>82Rd_*W!@ro4%xLSFBv*-PJ(H-FNf!3%)2rqL-hsAVZnMF|S_P%-NuauLxzq@H3mR2=!f;%}(gS&4pt z*AshMiBhD4ngBr?*2FCBP&qYR5IahvlH5~njlIaFmHh^&gdOAIlbTeHJt&FtN?Nj# zm!fo(|3Nfsx(!6@ZHvU@bDcE5>G7?@mUp;~R>jNt)-IFWt`>8fD0752Y9u>9p<6^K7LI>jE2g2i)e0-G*uNm>)D>nL7@Vc%3Hs9F|IBov0bKuPbe*EI3 zV{}hTz}!XsY&K~lmCp0m>$76HHg>VKh3N==mNvMKEv?-c-Yw%lA?@gT*(Q3EVX@5@ d{xCT0!rh@})K?_Ma56*~K?GA6fX8v({0H3bkud-O delta 581 zcmYjOJ&zMH5S_8TA91pq97HGx5C~34_W=z;G!#hG*KkyBLd5Jrmfa-snyWUtVyTc) zAR{Q?Cmb~e|758U6*Yf=*+79u^XARWvpgez*XR1|UXti5hwsfd1@II8JA(Nm_R293 z5Ef9PLF~9FL@A9dl~LPV7C{-Bu#8Mp#wIR%rdMjCw>`!8`li3-K`|&3lQ0h{D$=Jw zhcWfufEkjeKF1LaDB-w6=`rjLfAQ0>hiz!H1!eZ#my?SZ{?e&iPHk4LmWwL$Bm9Kg zpX1~#WPQy3n7w+-;2_6b)JV9&wQ!O%#hKV(9*}HsEo;a_Qm=%4<|5`XuNQ2@TGcA= zHDI4`)D0lGK7|b)gB#>Y4HPv3VWC~L)#F;ZG{;FkY+xO@5ewp4)UsA}K)uh(SK>7) z|6A>VtPLr1vw4wr zt6gFMOmQqUW89fYg=Vw+exi<0`V+OA-0Za7M*`Xd|507L)AlK!EnY0|zI1M7C3h@; qJha1qWtWw!V&*a%aMk}%55xUVbKq|Ux5wQW103O19I(ZTZTts}tbDfs diff --git a/article/models.py b/article/models.py index 14b022e..6df8184 100644 --- a/article/models.py +++ b/article/models.py @@ -1,6 +1,6 @@ # coding=utf-8 from django.db import models -from tinymce.models import HTMLField +from tinymce.models import HTMLField,TinyMCE from django.contrib.auth.models import User from django.forms import ModelForm,Textarea from userpage.models import * @@ -77,7 +77,7 @@ class Meta: class CommentForm(ModelForm): class Meta: model = Comment - fields = ('article','user','comment') + fields = ('article','user','comment','ip') widgets = { - 'comment':Textarea(), + 'comment':TinyMCE(attrs={'cols':'100%','rows':10}), } diff --git a/article/templates/article/detail.html b/article/templates/article/detail.html index bef1be3..5223725 100644 --- a/article/templates/article/detail.html +++ b/article/templates/article/detail.html @@ -2,6 +2,23 @@ {% block header %} {{art.title}} - 物志 + + {% endblock %} @@ -48,9 +65,20 @@

{% if art %}{{art.title}}{% endif %}

+ {% if messages %} +
    + {% for message in messages %} + {{ message }} + {% endfor %} +
+ {% endif %}
{% csrf_token %} - {{ comment_form.comment }} + + + + + {{comment_form.comment}}
diff --git a/article/views.py b/article/views.py index b53ec54..5b516e4 100644 --- a/article/views.py +++ b/article/views.py @@ -1,7 +1,6 @@ -from django.shortcuts import render +from django.shortcuts import render,redirect from django.http import HttpResponse,HttpResponseRedirect from django.template import RequestContext,Template,Context,loader,defaultfilters -from django.shortcuts import render_to_response from django.contrib import messages from .models import * @@ -12,13 +11,19 @@ def homepage(request): def detail(request, article_id): + + if request.user.is_authenticated :# and request.user.has_perm('cmdb.permit')): + username = request.user.username + else: + username = None + art = Article.objects.get(pk=article_id) comments = Comment.objects.filter(article_id=article_id).order_by('comment_time') if request.method == 'POST': comment_form = CommentForm(request.POST,instance=None) + comment_form.save() if comment_form.is_valid(): - comment_form.save() return redirect('.') else: messages.error(request, 'Please correct the error below.') @@ -27,7 +32,7 @@ def detail(request, article_id): secs = Section.objects.all() - return render(request,'article/detail.html',{'art':art,'comments':comments,'comment_form':comment_form,'secs':secs}) + return render(request,'article/detail.html',{'username':username,'art':art,'comments':comments,'comment_form':comment_form,'secs':secs}) #return HttpResponse("You're looking at article %s." % article_id) diff --git a/db.sqlite3 b/db.sqlite3 index 0074135d557aa05597577d19af9e9ae08dc589d7..b572d4356c986e4ea16fcb638d22b4a15ba08d2e 100644 GIT binary patch delta 572 zcmZvYy)Oho7>9RutlPEZJs%g5Q=CR2vA46cU$>nQp%aN3$to0RbRrf7(fBA3jgyE< z;w!AH{0X9=Kq8SnRzpLhV0LxuX6Ah|dEfk=NyaOty<&PTi_X_uyV3c{$i9N4MIpZ= zJi;B^oYjw%VC#Jt3oVj>5#q&|shHI<1)q%@(#;&l ziEzuo7jp#g1ovcWRRq(#O_qJPR+`xhNEhZt|>M(Ow}qEmtGc1 zFNX)gs$V|c4ZR(r#CvjTax5x-P-LF|iXP$+s_4{EH5zVTl{b&Vy{lk#J@n>-<+)>a zW3AVXh1ZqCq|{C^Y39FFcZ`Cg+KOqImZgufl}r|@S+coe(sn3OOuIl#!*v^7*G*>q ho(DXQ`+9}SKf@lUjz$$?7{t@qMm;W~dGyf|F{%`yr_+M>SREX!@o?FYD$)sgxs0W65`FW`zY-C_) z!OG0Y$ixCBnOK-P8JQUv7+9IMH83*<@bm9rVCHdQ;8)|%2U2E0qfB_VyWC+eVdep< X@^Cbk<`5O->DoI diff --git a/templates/base.html b/templates/base.html index 3ca6408..5c1e74f 100644 --- a/templates/base.html +++ b/templates/base.html @@ -25,8 +25,8 @@
  • - {% if username %} - {{username}} + {% if request.user %} + {{request.user.username}} {% else%} 登录 {% endif %}