Merge pull request #84 from dongweiming/finished_comment

finished topic comment

Author: halfcrazy

firefly/static/javascripts/create_comment.js

@@ -58,24 +58,15 @@ define(['jquery', 'sweetAlert'], function($, sweetAlert) {
     },
 
     reply : function(){
-      var title = $('#reply-title').val();
       var _this = this;
-      var params, content = [];
-      var category = $('#reply-category').val();
+      var params, text, content = [];
       $('.CodeMirror-code pre span[style]').each(
         function () {
           text = $(this).text();
           content.push(text);
         }
       );
 
-      if (!title.length) {
-        sweetAlert({
-          title: "标题没有内容",
-          type: "error"
-        });
-        return
-      }
       if (!content.length) {
         sweetAlert({
           title: "正文内容太少",
@@ -84,19 +75,20 @@ define(['jquery', 'sweetAlert'], function($, sweetAlert) {
         return
       }
       params = {
-        'title': title,
-        'content': content.join('\n'),
-        'category': category
+        'ref_id': $('.reply-to').data('comment-id'),
+        'content': content.join('\n')
       };
       $.ajax({
         type: 'POST',
-        url: '/create',
+        url: '/create/comment',
         traditional: true,
         data: params,
         dataType: "json",
         success: function(res) {
           if (!res.ok) {
-            alert('发表成功');
+            sweetAlert({
+              title: "发表成功"
+            });
             _this.closeModal();
             location.reload();
           }

firefly/static/javascripts/create_topic.js

@@ -138,7 +138,7 @@ define(['jquery', 'sweetAlert', 'select2', 'listItems'], function(
       };
       $.ajax({
         type: 'POST',
-        url: '/create',
+        url: '/create/topic',
         traditional: true,
         data: params,
         dataType: "json",

firefly/templates/widgets/markdown_editor.html

@@ -55,8 +55,8 @@
             div.reply-to data-comment-id=''
               span
                 回应
-              a.avatar href="/t/6"
-              img.avatar alt="" width="20" height="20"
+              a#reply-topic.avatar href="/t/6"
+              img.avatar.reply-author alt="" width="20" height="20"
               span
           div.wmd-controls style="top: 56px; bottom: 45px;"
             div.textarea-wrapper

firefly/views/home.py

@@ -7,7 +7,7 @@
 from flask_login import login_user, current_user, login_required
 
 from firefly.forms.user import LoginForm, RegisterForm
-from firefly.models.topic import Category, Post
+from firefly.models.topic import Category, Post, Comment
 from firefly.models.user import User
 
 
@@ -20,7 +20,7 @@ def get(self):
         return render_template('index.html', posts=posts)
 
 
-class CreateView(MethodView):
+class CreateTopicView(MethodView):
     decorators = [login_required]
 
     def post(self):
@@ -40,6 +40,28 @@ def post(self):
         return jsonify(ok=0, html=html)
 
 
+class CreateCommentView(MethodView):
+    decorators = [login_required]
+
+    def post(self):
+        ref_id = request.form.get('ref_id', 0)
+        content = request.form.get('content')
+        author = User.objects.get_or_404(id=current_user.id)
+        c = Comment(ref_id=ref_id, content=content, author=author)
+        c.save()
+        context = Post.objects(id=int(ref_id))
+        if not context:
+            context = Comment.objects(id=int(ref_id))
+            if not context:
+                return jsonify(ok=1, msg='not exists')
+        else:
+            context = context[0]
+            context.comments.append(c)
+            context.save()
+
+        return jsonify(ok=0)
+
+
 class LoginView(MethodView):
     def get(self):
         return redirect(url_for('home.index'))
@@ -65,6 +87,9 @@ def post(self):
 
 
 bp.add_url_rule('/', view_func=HomeView.as_view('index'))
-bp.add_url_rule('create', view_func=CreateView.as_view('create'))
+bp.add_url_rule('create/topic',
+                view_func=CreateTopicView.as_view('create_topic'))
+bp.add_url_rule('create/comment',
+                view_func=CreateCommentView.as_view('create_comment'))
 bp.add_url_rule('login', view_func=LoginView.as_view('login'))
 bp.add_url_rule('register', view_func=RegisterView.as_view('register'))

firefly/views/post.py

@@ -1,13 +1,10 @@
 # coding=utf-8
 from __future__ import absolute_import
-from flask import request, redirect, url_for, abort
 from flask.views import MethodView
 from flask.blueprints import Blueprint
 from flask_mako import render_template
 from flask_mongoengine.wtf import model_form
-from flask_login import current_user
 
-from firefly.models.user import User
 from firefly.models.topic import Post, Comment
 
 
@@ -18,39 +15,9 @@ class DetailView(MethodView):
 
     form = model_form(Comment, exclude=['created_at', 'author', 'id'])
 
-    def get_context(self, id):
-        post = Post.objects.get_or_404(id=id)
-        form = self.form(request.form)
-
-        context = {
-            "post": post,
-            "form": form
-        }
-        return context
-
     def get(self, id):
-        context = self.get_context(id)
+        post = Post.objects.get_or_404(id=id)
         Post.objects(id=id).update_one(inc__views=1)
-        return render_template('posts/detail.html', **context)
-
-    def post(self, id):
-        if not current_user.is_authenticated():
-            abort(403)
-
-        context = self.get_context(id)
-        form = context.get('form')
-
-        if form.validate():
-            comment = Comment()
-            form.populate_obj(comment)
-            comment.author = User.objects.get_or_404(id=current_user.id)
-            comment.save()
-
-            post = context.get('post')
-            post.comments.append(comment)
-            post.save()
-
-            return redirect(url_for('post.detail', id=id))
-        return render_template('posts/detail.html', **context)
+        return render_template('posts/detail.html', post=post)
 
 bp.add_url_rule('/<int:id>/', view_func=DetailView.as_view('detail'))

tests/test_post.py

@@ -22,7 +22,7 @@ def setup(self):
     def test_create(self):
 
         category = Category.objects.first()
-        url = url_for('home.create')
+        url = url_for('home.create_topic')
         form = {
             'title': '标题',
             'content': '内容喜喜喜喜喜喜',
@@ -43,10 +43,10 @@ def test_detail(self):
 
     def test_comment(self):
         post = Post.objects.first()
-        url = url_for('post.detail', id=post.id)
+        url = url_for('home.create_comment')
         form = {
             'content': '评论测试',
-            'ref_id': 0,
+            'ref_id': post.id,
         }
         self.client.post(url, data=form, follow_redirects=False)
         post.reload()