Hopiu/django-admin2
1
0
Fork 0
mirror of https://github.com/jazzband/django-admin2.git synced 2026-04-20 14:51:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

deleted LoginRequiredMixin

Browse source
This commit is contained in:
d1ffuz0r 2013-05-31 07:39:58 +07:00
parent b8413f96e3
commit b54c28afc1
3 changed files with 17 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
djadmin2/viewmixins.py
View file

@ -14,6 +14,7 @@ from .utils import admin2_urlname, model_options
class PermissionMixin(AccessMixin):
do_not_call_in_templates = True
permission_classes = (permissions.IsStaffPermission,)
login_url = reverse_lazy('admin2:dashboard')
def __init__(self, **kwargs):
self.permissions = [
@ -135,8 +136,3 @@ class Admin2ModelFormMixin(object):
# default to index view
return reverse(admin2_urlname(self, 'index'))
class LoginRequiredMixin(PermissionMixin):
login_url = reverse_lazy('admin2:dashboard')

9
djadmin2/views.py
View file

@ -13,8 +13,7 @@ from django.views import generic
import extra_views
from . import permissions, utils
from .viewmixins import (Admin2Mixin, AdminModel2Mixin, Admin2ModelFormMixin,
LoginRequiredMixin)
from .viewmixins import (Admin2Mixin, AdminModel2Mixin, Admin2ModelFormMixin)
class IndexView(Admin2Mixin, generic.TemplateView):
@ -137,7 +136,7 @@ class ModelDeleteView(AdminModel2Mixin, generic.DeleteView):
return context
class PasswordChangeView(Admin2Mixin, LoginRequiredMixin, generic.UpdateView):
class PasswordChangeView(Admin2Mixin, generic.UpdateView):
default_template_name = 'auth/password_change_form.html'
form_class = AdminPasswordChangeForm
@ -161,7 +160,7 @@ class PasswordChangeView(Admin2Mixin, LoginRequiredMixin, generic.UpdateView):
return super(PasswordChangeView, self).get_form_class()
class PasswordChangeDoneView(Admin2Mixin, LoginRequiredMixin, generic.TemplateView):
class PasswordChangeDoneView(Admin2Mixin, generic.TemplateView):
default_template_name = 'auth/password_change_done.html'
@ -178,7 +177,7 @@ class LoginView(Admin2Mixin, generic.TemplateView):
*args, **kwargs)
class LogoutView(Admin2Mixin, LoginRequiredMixin, generic.TemplateView):
class LogoutView(Admin2Mixin, generic.TemplateView):
default_template_name = 'auth/logout.html'

21
example/blog/tests/test_auth_admin.py
View file

@ -1,7 +1,8 @@
from django.contrib.auth.models import User
from django.contrib.auth import get_user_model
from django.core.urlresolvers import reverse
from django.test import TestCase
from django.test.client import RequestFactory
from django.test.client import Client
import floppyforms
@ -11,12 +12,10 @@ from blog.admin2 import UserAdmin2
class UserAdminTest(TestCase):
def setUp(self):
self.factory = RequestFactory()
self.user = User(
username='admin',
is_staff=True,
is_superuser=True)
self.user.set_password('admin')
self.client = Client()
self.user = get_user_model()(username='user', is_staff=True,
is_superuser=True)
self.user.set_password("password")
self.user.save()
def test_create_form_uses_floppyform_widgets(self):
@ -25,7 +24,7 @@ class UserAdminTest(TestCase):
isinstance(form.fields['username'].widget,
floppyforms.TextInput))
request = self.factory.get(reverse('admin2:auth_user_create'))
request = self.client.get(reverse('admin2:auth_user_create'))
request.user = self.user
model_admin = UserAdmin2(User, djadmin2.default)
view = model_admin.create_view.as_view(
@ -45,7 +44,7 @@ class UserAdminTest(TestCase):
isinstance(form.fields['date_joined'].widget,
floppyforms.DateTimeInput))
request = self.factory.get(
request = self.client.get(
reverse('admin2:auth_user_update', args=(self.user.pk,)))
request.user = self.user
model_admin = UserAdmin2(User, djadmin2.default)
@ -59,3 +58,7 @@ class UserAdminTest(TestCase):
self.assertTrue(
isinstance(form.fields['date_joined'].widget,
floppyforms.DateTimeInput))
def test_login_required(self):
index_path = reverse('admin2:blog_post_index')
self.assertRedirects(self.client.get(index_path), reverse('admin2:dashboard'))