diff --git a/DjangoBlog/feeds.py b/DjangoBlog/feeds.py index bef50d5..245ef8c 100644 --- a/DjangoBlog/feeds.py +++ b/DjangoBlog/feeds.py @@ -18,7 +18,6 @@ from blog.models import Article from django.conf import settings from django.utils.feedgenerator import Rss201rev2Feed from DjangoBlog.common_markdown import common_markdown -from django.utils.safestring import mark_safe from django.contrib.auth import get_user_model from django.contrib.auth.models import User from django.contrib.sites.models import Site @@ -45,7 +44,7 @@ class DjangoBlogFeed(Feed): return item.title def item_description(self, item): - return mark_safe(common_markdown.get_markdown(item.body)) + return common_markdown.get_markdown(item.body) def feed_copyright(self): # print(Site.objects.get_current().name) diff --git a/blog/models.py b/blog/models.py index 6e4c344..93d7680 100644 --- a/blog/models.py +++ b/blog/models.py @@ -5,6 +5,7 @@ from django.conf import settings from uuslug import slugify from DjangoBlog.spider_notify import sipder_notify + class Article(models.Model): """文章""" STATUS_CHOICES = ( @@ -71,11 +72,11 @@ class Article(models.Model): if not self.slug or self.slug == 'no-slug' or not self.id: # Only set the slug when the object is created. self.slug = slugify(self.title) - try: - notify = sipder_notify() - notify.notify(self.get_absolute_url()) - except Exception as e: - print(e) + try: + notify = sipder_notify() + notify.notify(self.get_absolute_url()) + except Exception as e: + print(e) super().save(*args, **kwargs) def viewed(self): diff --git a/blog/views.py b/blog/views.py index 2c670a1..85490e5 100644 --- a/blog/views.py +++ b/blog/views.py @@ -55,7 +55,7 @@ class ArticleListView(ListView): class IndexView(ArticleListView): def get_queryset(self): - article_list = Article.objects.filter(status='p') + article_list = Article.objects.filter(type='a',status='p') # for article in article_list: # article.body = article.body[0:settings.ARTICLE_SUB_LENGTH] @@ -228,7 +228,7 @@ def fileupload(request): @login_required def refresh_memcache(request): try: - result = os.popen(' service memcache restart ').readline() + result = os.popen(' service memcached restart ').readline() return HttpResponse(result) except Exception as e: return HttpResponse(e); diff --git a/templates/blog/article_detail.html b/templates/blog/article_detail.html index 9639308..ec32c06 100755 --- a/templates/blog/article_detail.html +++ b/templates/blog/article_detail.html @@ -22,20 +22,21 @@