diff --git a/DjangoBlog/admin_site.py b/DjangoBlog/admin_site.py new file mode 100644 index 0000000..1c7fdb2 --- /dev/null +++ b/DjangoBlog/admin_site.py @@ -0,0 +1,59 @@ +#!/usr/bin/env python +# encoding: utf-8 + + +""" +@version: ?? +@author: liangliangyy +@license: MIT Licence +@contact: liangliangyy@gmail.com +@site: https://www.lylinux.net/ +@software: PyCharm +@file: admin_site.py +@time: 2018/1/7 上午2:21 +""" +from django.contrib.admin import AdminSite +from django.contrib import admin +from blog.admin import * +from accounts.admin import * +from oauth.admin import * +from servermanager.admin import * +from comments.admin import * + + +class DjangoBlogAdminSite(AdminSite): + site_header = 'DjangoBlog administration' + site_title = 'DjangoBlog site admin' + + def __init__(self, name='admin'): + super().__init__(name) + + def has_permission(self, request): + return request.user.is_superuser + + # def get_urls(self): + # urls = super().get_urls() + # from django.urls import path + # from blog.views import refresh_memcache + # + # my_urls = [ + # path('refresh/', self.admin_view(refresh_memcache), name="refresh"), + # ] + # return urls + my_urls + + +admin_site = DjangoBlogAdminSite(name='admin') + +admin_site.register(Article, ArticlelAdmin) +admin_site.register(Category, CategoryAdmin) +admin_site.register(Tag, TagAdmin) +admin_site.register(Links, LinksAdmin) +admin_site.register(SideBar, SideBarAdmin) + +admin_site.register(commands, CommandsAdmin) + +admin_site.register(BlogUser, BlogUserAdmin) + +admin_site.register(Comment, CommentAdmin) + +admin_site.register(OAuthUser, OAuthUserAdmin) diff --git a/DjangoBlog/settings.py b/DjangoBlog/settings.py index 26cc311..f08b988 100644 --- a/DjangoBlog/settings.py +++ b/DjangoBlog/settings.py @@ -31,7 +31,8 @@ ALLOWED_HOSTS = ['www.lylinux.net', '127.0.0.1', 'example.com'] # Application definition INSTALLED_APPS = [ - 'django.contrib.admin', + # 'django.contrib.admin', + 'django.contrib.admin.apps.SimpleAdminConfig', 'django.contrib.auth', 'django.contrib.contenttypes', 'django.contrib.sessions', diff --git a/DjangoBlog/urls.py b/DjangoBlog/urls.py index eaca1b6..e8f2aa5 100644 --- a/DjangoBlog/urls.py +++ b/DjangoBlog/urls.py @@ -21,6 +21,7 @@ from DjangoBlog.feeds import DjangoBlogFeed from django.views.decorators.cache import cache_page from django.conf import settings from django.conf.urls.static import static +from DjangoBlog.admin_site import admin_site sitemaps = { @@ -35,7 +36,7 @@ handler404 = 'blog.views.page_not_found_view' handler500 = 'blog.views.server_error_view' urlpatterns = [ - url(r'^admin/', admin.site.urls), + url(r'^admin/', admin_site.urls), url(r'', include('blog.urls', namespace='blog')), url(r'', include('comments.urls', namespace='comment')), diff --git a/accounts/admin.py b/accounts/admin.py index 001df08..83a4086 100644 --- a/accounts/admin.py +++ b/accounts/admin.py @@ -1,14 +1,8 @@ from django.contrib import admin - # Register your models here. from .models import BlogUser - class BlogUserAdmin(admin.ModelAdmin): - list_display = ('id', 'nickname', 'username','email','last_login','date_joined') + list_display = ('id', 'nickname', 'username', 'email', 'last_login', 'date_joined') list_display_links = ('id', 'username') - - - -admin.site.register(BlogUser, BlogUserAdmin) diff --git a/blog/admin.py b/blog/admin.py index 32f5616..ab4a40a 100644 --- a/blog/admin.py +++ b/blog/admin.py @@ -1,5 +1,5 @@ -from django.contrib import admin +from django.contrib import admin # Register your models here. from .models import Article, Category, Tag, Links, SideBar from pagedown.widgets import AdminPagedownWidget @@ -8,6 +8,8 @@ from django.contrib.auth import get_user_model from django.utils.translation import ugettext_lazy as _ + + class ArticleListFilter(admin.SimpleListFilter): title = _("作者") parameter_name = 'author' @@ -103,8 +105,4 @@ class SideBarAdmin(admin.ModelAdmin): exclude = ('last_mod_time', 'created_time') -admin.site.register(Article, ArticlelAdmin) -admin.site.register(Category, CategoryAdmin) -admin.site.register(Tag, TagAdmin) -admin.site.register(Links, LinksAdmin) -admin.site.register(SideBar, SideBarAdmin) + diff --git a/comments/admin.py b/comments/admin.py index b8f3471..e6834bf 100644 --- a/comments/admin.py +++ b/comments/admin.py @@ -1,5 +1,4 @@ from django.contrib import admin - # Register your models here. from .models import Comment @@ -22,6 +21,3 @@ class CommentAdmin(admin.ModelAdmin): list_filter = ('author', 'article', 'is_enable') exclude = ('created_time', 'last_mod_time') actions = [disable_commentstatus, enable_commentstatus] - - -admin.site.register(Comment, CommentAdmin) diff --git a/oauth/admin.py b/oauth/admin.py index 8ec2eec..9f16f04 100644 --- a/oauth/admin.py +++ b/oauth/admin.py @@ -1,5 +1,4 @@ from django.contrib import admin - # Register your models here. from .models import OAuthUser @@ -8,6 +7,3 @@ class OAuthUserAdmin(admin.ModelAdmin): list_display = ('id', 'author', 'nikename', 'type', 'picture', 'email',) list_display_links = ('id', 'nikename') list_filter = ('author', 'type',) - - -admin.site.register(OAuthUser, OAuthUserAdmin) diff --git a/servermanager/admin.py b/servermanager/admin.py index bb7d87e..99ed5e5 100644 --- a/servermanager/admin.py +++ b/servermanager/admin.py @@ -1,11 +1,7 @@ from django.contrib import admin - # Register your models here. from .models import commands class CommandsAdmin(admin.ModelAdmin): list_display = ('title', 'command', 'describe') - - -admin.site.register(commands, CommandsAdmin) diff --git a/templates/blog/tags/sidebar.html b/templates/blog/tags/sidebar.html index d8cc463..df5abaf 100755 --- a/templates/blog/tags/sidebar.html +++ b/templates/blog/tags/sidebar.html @@ -119,6 +119,9 @@ {% else %}