Merge pull request #539 from liangliangyy/dev

close #537

blog/tests.py

@@ -8,11 +8,11 @@ from django.test import Client, RequestFactory, TestCase
 from django.urls import reverse
 from django.utils import timezone
 
-from djangoblog.utils import get_current_site, get_sha256
 from accounts.models import BlogUser
 from blog.forms import BlogSearchForm
 from blog.models import Article, Category, Tag, SideBar, Links
 from blog.templatetags.blog_tags import load_pagination_info, load_articletags
+from djangoblog.utils import get_current_site, get_sha256
 
 
 # Create your tests here.
@@ -98,12 +98,7 @@ class ArticleTest(TestCase):
         s = load_articletags(article)
         self.assertIsNotNone(s)
 
-        rsp = self.client.get('/refresh')
-        self.assertEqual(rsp.status_code, 302)
-
         self.client.login(username='liangliangyy', password='liangliangyy')
-        rsp = self.client.get('/refresh')
-        self.assertEqual(rsp.status_code, 200)
 
         response = self.client.get(reverse('blog:archives'))
         self.assertEqual(response.status_code, 200)
@@ -140,9 +135,6 @@ class ArticleTest(TestCase):
         response = self.client.get('/links.html')
         self.assertEqual(response.status_code, 200)
 
-        rsp = self.client.get('/refresh')
-        self.assertEqual(rsp.status_code, 200)
-
         response = self.client.get('/feed/')
         self.assertEqual(response.status_code, 200)
 

blog/urls.py

@@ -55,7 +55,4 @@ urlpatterns = [
         r'upload',
         views.fileupload,
         name='upload'),
-    path(
+]
-        r'refresh',
-        views.refresh_memcache,
-        name='refresh')]

blog/views.py

@@ -6,7 +6,6 @@ import uuid
 
 from django import forms
 from django.conf import settings
-from django.contrib.auth.decorators import login_required
 from django.http import HttpResponse, HttpResponseForbidden
 from django.shortcuts import get_object_or_404
 from django.shortcuts import render
@@ -313,22 +312,6 @@ def fileupload(request):
         return HttpResponse("only for post")
 
 
-@login_required
-def refresh_memcache(request):
-    try:
-
-        if request.user.is_superuser:
-            from djangoblog.utils import cache
-            if cache and cache is not None:
-                cache.clear()
-            return HttpResponse("ok")
-        else:
-            return HttpResponseForbidden()
-    except Exception as e:
-        logger.error(e)
-        return HttpResponse("error")
-
-
 def page_not_found_view(
         request,
         exception,

templates/blog/tags/sidebar.html

@@ -126,7 +126,6 @@
                 <li><a href="{% url "account:login" %}" rel="nofollow">登录</a></li>
             {% endif %}
             {% if user.is_superuser %}
-                <li><a href="{% url "blog:refresh" %}" target="_blank">刷新缓存</a></li>
                 <li><a href="{% url 'owntracks:show_dates' %}" target="_blank">运动轨迹记录</a></li>
             {% endif %}
             <li><a href="http://gitbook.lylinux.net" target="_blank" rel="nofollow">GitBook</a></li>