update choicefiled display name

gothack329 · Mar 5, 2018 · cb9c42d · cb9c42d
1 parent af1b606
commit cb9c42d
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 4 deletions.
diff --git a/article/__pycache__/views.cpython-36.pyc b/article/__pycache__/views.cpython-36.pyc
diff --git a/article/templates/article/detail.html b/article/templates/article/detail.html
@@ -118,6 +118,25 @@ <h1>{% if art %}{{art.title}}{% endif %} </h1>
     {% endfor %}
 {% endif %}  
 
+{% if errors %}
+        {% for error in errors %}
+            <script type="text/javascript">
+            $.notify({
+                // options
+                message: '{{ error|escape }}',
+            },{
+                // settings
+                type: 'danger',
+                delay: 5000,
+                timer: 1000,
+                animate: {
+                    enter: 'animated flipInY',
+                    exit: 'animated flipOutX'
+                },
+            },);
+           </script>
+        {% endfor %}
+{% endif %}  
     <form class="textarea" method="post" novalidate>
         {% csrf_token %}
         <input type='hidden' name="article" value="{{art.id}}" />

diff --git a/article/views.py b/article/views.py
@@ -17,18 +17,24 @@ def detail(request, article_id):
 
     art = Article.objects.get(pk=article_id)
     comments = Comment.objects.filter(article_id=article_id).order_by('comment_time')
+    errors = []
 
     if request.method == 'POST':
         comment_form = CommentForm(request.POST,instance=None)
+        commenter = User.objects.get(pk=request.user.id)
+
 
-        if comment_form.is_valid():
+        user_p = Profile.objects.get(user=commenter)
+        if user_p.point < 1:
+            errors.append('您没有足够的积分进行评论！')
+        elif comment_form.is_valid():
             instance = comment_form.save(commit=False)
             instance.ip = request.META['REMOTE_ADDR']
             instance.save()
 
             point=1
             author = User.objects.get(pk=art.author_id.id)
-            commenter = User.objects.get(pk=request.user.id)
+
             updatepoint = Point.objects.create(user=author,point_record=point,event="commented")
             updatepoint = Point.objects.create(user=commenter,point_record=-point,event="comment")
 
@@ -42,7 +48,7 @@ def detail(request, article_id):
         comment_form = CommentForm(instance=None)
 
 
-    return render(request,'article/detail.html',{'art':art,'comments':comments,'comment_form':comment_form})
+    return render(request,'article/detail.html',{'art':art,'comments':comments,'comment_form':comment_form,'errors':errors})
     #return HttpResponse("You're looking at article %s." % article_id)
 
 

diff --git a/db.sqlite3 b/db.sqlite3
diff --git a/userpage/templates/userpage/profile.html b/userpage/templates/userpage/profile.html
@@ -145,7 +145,7 @@
         <p></p>
         {% for i in points %}
         <div class="row member_comments">
-            <p>{{i.record_time|timetonow}},{{i.event}},{{i.point_record}}</p>
+            <p>{{i.record_time|timetonow}},{{i.get_event_display}},{{i.point_record}}</p>
         </div>
         {% endfor %}
         </div>