Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- diff -r 349898dd5478 tests/regressiontests/admin_views/customadmin.py
- --- a/tests/regressiontests/admin_views/customadmin.py Fri Jul 17 17:04:03 2009 -0300
- +++ b/tests/regressiontests/admin_views/customadmin.py Sun Jul 19 16:31:27 2009 -0300
- @@ -1,15 +1,22 @@
- """
- A second, custom AdminSite -- see tests.CustomAdminSiteTests.
- """
- -from django.conf.urls.defaults import patterns
- +import random
- +from django.conf.urls.defaults import patterns, url
- from django.contrib import admin
- from django.http import HttpResponse
- import models
- +def function_view(request):
- + return HttpResponse("Django is a magical pony!")
- +
- class Admin2(admin.AdminSite):
- login_template = 'custom_admin/login.html'
- index_template = 'custom_admin/index.html'
- +
- + random.seed()
- + secret = random.randint(0, 100)
- # A custom index view.
- def index(self, request, extra_context=None):
- @@ -18,10 +25,20 @@
- def get_urls(self):
- return patterns('',
- (r'^my_view/$', self.admin_view(self.my_view)),
- + url(r'^my_view/$', self.admin_view(self.my_view), name='named-view'),
- + url(r'^function_view/$', self.admin_view(function_view), name='function-view'),
- + url(r'^protected_cacheable_view/$', self.admin_view(self.protected_cacheable_view, cacheable=True), name='protected-cacheable'),
- + url(r'^protected_view/$', self.admin_view(self.protected_view), name='protected'),
- ) + super(Admin2, self).get_urls()
- def my_view(self, request):
- return HttpResponse("Django is a magical pony!")
- +
- + def protected_cacheable_view(self, request):
- + return HttpResponse("The secret behind Django magical pony powers: a Python with limbs!")
- +
- + def protected_view(self, request):
- + return HttpResponse("The secret number behind Django magical pony powers: %d" % self.secret)
- site = Admin2(name="admin2")
- diff -r 349898dd5478 tests/regressiontests/admin_views/tests.py
- --- a/tests/regressiontests/admin_views/tests.py Fri Jul 17 17:04:03 2009 -0300
- +++ b/tests/regressiontests/admin_views/tests.py Sun Jul 19 16:31:27 2009 -0300
- @@ -12,6 +12,7 @@
- from django.contrib.admin.helpers import ACTION_CHECKBOX_NAME
- from django.utils.cache import get_max_age
- from django.utils.html import escape
- +from django.core.urlresolvers import reverse
- # local test models
- from models import Article, BarAccount, CustomArticle, EmptyModel, \
- @@ -287,6 +288,12 @@
- self.client.login(username='super', password='secret')
- response = self.client.get('/test_admin/%s/my_view/' % self.urlbit)
- self.assert_(response.content == "Django is a magical pony!", response.content)
- +
- + def testCustomAdminNamedCustomViewsReverse(self):
- + self.assertEqual(reverse('admin2:function-view'), '/test_admin/%s/function_view/' % self.urlbit)
- + self.assertEqual(reverse('admin2:named-view'), '/test_admin/%s/my_view/' % self.urlbit)
- + self.assertEqual(reverse('admin2:protected-cacheable'), '/test_admin/%s/protected_cacheable_view/' % self.urlbit)
- + self.assertEqual(reverse('admin2:protected'), '/test_admin/%s/protected_view/' % self.urlbit)
- def get_perm(Model, perm):
- """Return the permission object, for the Model"""
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement