增加设置登录验证函数方法和设置登录函数, 优化demo

Author: ZhangBohan

README.md

@@ -35,6 +35,17 @@ url(r'^adminlte/', include('adminlte.urls')),
 5 Look the examples in the code to see how to start.
 
 
+## Settings
+
+### ADMINLTE_LOGIN_VIEW
+
+adminlte login view. default is `adminlte.login`
+
+### ADMINLTE_IS_LOGIN_FUNC
+
+adminlte login validate method. if `required_login=False` will not validate login
+
+
 ## Develop
 
 ```shell

adminlte/views.py renamed to adminlte/adminlte.py

@@ -1,3 +1,4 @@
+from django.conf import settings
 from django.contrib.auth import authenticate, login as django_login, logout as django_logout
 from django.shortcuts import render, redirect
 
@@ -10,10 +11,21 @@ class IndexView(AdminLTEBaseView):
     menu = AdminMenu(name="Dashboard", description='Empty Dashboard page', icon_classes='fa-dashboard', sort=99999)
 
 
-def login(request):
-    if request.method == 'GET':
+class LogoutView(AdminLTEBaseView):
+
+    def get(self, request, *args, **kwargs):
+        django_logout(request)
+        return redirect(getattr(settings, 'ADMINLTE_LOGIN_VIEW', 'adminlte.login'))
+
+
+class LoginView(AdminLTEBaseView):
+
+    login_required = False
+
+    def get(self, request, *args, **kwargs):
         return render(request, 'adminlte/login.html')
-    else:
+
+    def post(self, request, *args, **kwargs):
         username = request.POST.get('username')
         password = request.POST.get('password')
         user = authenticate(username=username, password=password, type=1)
@@ -24,8 +36,3 @@ def login(request):
             })
         django_login(request, user)
         return redirect('adminlte.index')
-
-
-def logout(request):
-    django_logout(request)
-    return redirect('adminlte.login')

adminlte/urls.py

@@ -1,12 +1,4 @@
-from django.conf.urls import url
-
-from . import views
 from . import utils
 
 
 urlpatterns = utils.AdminLTEBaseView.urlpatterns()
-
-urlpatterns += [
-            url(r'^login$', views.login, name='adminlte.login'),
-            url(r'^logout$', views.logout, name='adminlte.logout'),
-]

adminlte/utils.py

@@ -1,5 +1,6 @@
 import math
 
+from django.conf import settings
 from django.contrib.auth.models import AnonymousUser
 
 try:
@@ -36,14 +37,22 @@ def active(self, view_name):
 class AdminLTEBaseView(View):
     template_name = 'adminlte/index.html'
 
+    login_required = True
+
+    @staticmethod
+    def _default_is_login_func(request):
+        return not isinstance(request.user, AnonymousUser) and request.user.is_staff
+
     def dispatch(self, request, *args, **kwargs):
         # Try to dispatch to the right method; if a method doesn't exist,
         # defer to the error handler. Also defer to the error handler if the
         # request method isn't on the approved list.
 
         if getattr(self, 'login_required', True):
-            if not request.user.id or not request.user.is_staff:
-                return redirect('adminlte.login')
+            is_login = getattr(settings, 'ADMINLTE_IS_LOGIN_FUNC', self._default_is_login_func)
+            login_view = getattr(settings, 'ADMINLTE_LOGIN_VIEW', 'adminlte.login')
+            if not is_login(request):
+                return redirect(login_view)
 
         if request.method.lower() in self.http_method_names:
             handler = getattr(self, request.method.lower(), self.http_method_not_allowed)

exmaples/demo/demo/urls.py

@@ -14,12 +14,7 @@
     2. Add a URL to urlpatterns:  url(r'^blog/', include('blog.urls'))
 """
 from django.conf.urls import url, include
-from django.contrib import admin
-
-from page import views
 
 urlpatterns = [
-    url(r'^admin/', admin.site.urls),
     url(r'^adminlte/', include('adminlte.urls')),
-    url(r'^pages/(?P<page_id>[0-9]+)/$', views.pages, name='adminlte.example.pages'),
 ]

exmaples/demo/page/views.py renamed to exmaples/demo/page/adminlte.py

@@ -9,7 +9,7 @@
 
 
 class ExampleView(AdminLTEBaseView):
-    template_name = 'adminlte/example.html'
+    template_name = 'example.html'
 
     menu = AdminMenu(name="样例", description='这是一个测试页面', icon_classes='fa-code')
 
@@ -21,7 +21,7 @@ def get(self, request, *args, **kwargs):
 
 
 class ExamplePagesView(AdminLTEBaseView):
-    template_name = 'adminlte/pages/index.html'
+    template_name = 'pages/index.html'
 
     menu = AdminMenu(name="富文本列表", parent_menu=page_manager)
 
@@ -35,7 +35,7 @@ def get(self, request, *args, **kwargs):
 
 
 class ExamplePagesCreateView(AdminLTEBaseView):
-    template_name = 'adminlte/pages/edit.html'
+    template_name = 'pages/edit.html'
 
     menu = AdminMenu(name="新页面", parent_menu=page_manager)
 
@@ -51,7 +51,7 @@ def post(self, request, *args, **kwargs):
 
 
 class ExamplePageEditView(AdminLTEBaseView):
-    template_name = 'adminlte/pages/edit.html'
+    template_name = 'pages/edit.html'
 
     _regex_name = 'pages/(?P<page_id>[0-9]+)/edit'
 
@@ -75,8 +75,12 @@ def post(self, request, page_id, *args, **kwargs):
         return render(request, self.template_name)
 
 
-def pages(request, page_id):
-    page = Page.objects.get(pk=page_id)
-    return render_to_response('adminlte/page.html', context={
-        "page": page
-    })
+class PagesView(AdminLTEBaseView):
+
+    _regex_name = 'pages/(?P<page_id>[0-9]+)'
+
+    def get(self, request, page_id, *args, **kwargs):
+        page = Page.objects.get(pk=page_id)
+        return render_to_response('page.html', context={
+            "page": page
+        })

adminlte/templates/adminlte/example.html renamed to exmaples/demo/page/templates/example.html

@@ -12,7 +12,7 @@
                 {% for page in pager.items %}
                     <tr>
                         <td>{{ forloop.counter }}</td>
-                        <td><a target="_blank" href="{% url 'adminlte.example.pages' page_id=page.id %}">{{ page.title }}</a></td>
+                        <td><a target="_blank" href="{% url 'adminlte.pages' page_id=page.id %}">{{ page.title }}</a></td>
                         <td><a href="{% url 'adminlte.example.page.edit' page_id=page.id %}">编辑</a></td>
                     </tr>
                 {% endfor %}

adminlte/templates/adminlte/page.html renamed to exmaples/demo/page/templates/page.html

@@ -6,7 +6,7 @@
 
 setup(
     name='django-adminlte-admin',
-    version='0.2.2',
+    version='0.3.0',
     packages=find_packages(),
     include_package_data=True,
     license='MIT License',

adminlte/templates/adminlte/pages/edit.html renamed to exmaples/demo/page/templates/pages/edit.html

@@ -1,5 +1,6 @@
 import logging
 
+from django.conf import settings
 from django.contrib.auth.models import AnonymousUser, User
 from django.test import RequestFactory
 from django.test import TestCase
@@ -50,3 +51,18 @@ def test_index_view(self):
 
         response = IndexView.as_view()(request)
         self.assertEqual(response.status_code, 200)
+
+    def test_setting_login_method(self):
+        """
+        test change is login validate method
+        """
+
+        def is_login(request):
+            return isinstance(request.user, AnonymousUser)
+        settings.ADMINLTE_IS_LOGIN_FUNC = is_login
+        request = self.factory.get('/adminlte/index')
+
+        request.user = AnonymousUser()
+
+        response = IndexView.as_view()(request)
+        self.assertEqual(response.status_code, 200)