Merge branch 'Step24_extract-content-automatically-using-markdown' into demo

yangxg · yangxg · commit c7062800ea9c · 2017-06-08T18:57:35.000+08:00
diff --git a/blog/views.py b/blog/views.py
@@ -1,7 +1,11 @@
 import markdown
 
+from markdown.extensions.toc import TocExtension
+
 from django.shortcuts import render, get_object_or_404
 from django.views.generic import ListView, DetailView
+from django.utils.text import slugify
+
 from comments.forms import CommentForm
 from .models import Post, Category, Tag
 
@@ -227,12 +231,13 @@ def get(self, request, *args, **kwargs):
     def get_object(self, queryset=None):
         # 覆写 get_object 方法的目的是因为需要对 post 的 body 值进行渲染
         post = super(PostDetailView, self).get_object(queryset=None)
-        post.body = markdown.markdown(post.body,
-                                      extensions=[
-                                          'markdown.extensions.extra',
-                                          'markdown.extensions.codehilite',
-                                          'markdown.extensions.toc',
-                                      ])
+        md = markdown.Markdown(extensions=[
+            'markdown.extensions.extra',
+            'markdown.extensions.codehilite',
+            TocExtension(slugify=slugify),
+        ])
+        post.body = md.convert(post.body)
+        post.toc = md.toc
         return post
 
     def get_context_data(self, **kwargs):
diff --git a/templates/blog/detail.html b/templates/blog/detail.html
@@ -78,22 +78,6 @@ <h3>评论列表，共 <span>{{ post.comment_set.count }}</span> 条评论</h3>
 {% block toc %}
     <div class="widget widget-content">
         <h3 class="widget-title">文章目录</h3>
-        <ul>
-            <li>
-                <a href="#">教程特点</a>
-            </li>
-            <li>
-                <a href="#">谁适合这个教程</a>
-            </li>
-            <li>
-                <a href="#">在线预览</a>
-            </li>
-            <li>
-                <a href="#">资源列表</a>
-            </li>
-            <li>
-                <a href="#">获取帮助</a>
-            </li>
-        </ul>
+        {{ post.toc|safe }}
     </div>
 {% endblock toc %}
