Skip to content

Commit

Permalink
fix for reverse_lazy on access mixins
Browse files Browse the repository at this point in the history
  • Loading branch information
kennethlove committed Jul 28, 2013
1 parent d303d41 commit 8431b0f
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 2 deletions.
3 changes: 2 additions & 1 deletion braces/views.py
Expand Up @@ -10,6 +10,7 @@
from django.core.urlresolvers import reverse
from django.http import HttpResponse
from django.utils.decorators import method_decorator
from django.utils.encoding import force_text
from django.views.generic import CreateView
from django.views.decorators.csrf import csrf_exempt

Expand Down Expand Up @@ -67,7 +68,7 @@ def get_login_url(self):
"Define %(cls)s.login_url or override "
"%(cls)s.get_login_url()." % {"cls": self.__class__.__name__})

return self.login_url
return force_text(self.login_url)

def get_redirect_field_name(self):
"""
Expand Down
6 changes: 6 additions & 0 deletions tests/test_access_mixins.py
@@ -1,5 +1,6 @@
from django import test
from django.core.exceptions import ImproperlyConfigured, PermissionDenied
from django.core.urlresolvers import reverse_lazy
from .compat import force_text
from .factories import make_group, make_user
from .helpers import TestViewHelper
Expand Down Expand Up @@ -66,6 +67,11 @@ def test_custom_login_url(self):
resp = self.dispatch_view(req, login_url='/login/')
self.assertEqual('/login/?next=%s' % self.view_url, resp['Location'])

# Test with reverse_lazy
resp = self.dispatch_view(req, login_url=reverse_lazy('headline'))
self.assertEqual('/headline/?next={}'.format(
self.view_url), resp['Location'])

def test_custom_redirect_field_name(self):
"""
Redirect field name should be customizable.
Expand Down
2 changes: 1 addition & 1 deletion tests/urls.py
Expand Up @@ -26,7 +26,7 @@
url(r'^form_with_user_kwarg/$', views.FormWithUserKwargView.as_view()),

# SetHeadlineMixin tests
url(r'^headline/$', views.HeadlineView.as_view()),
url(r'^headline/$', views.HeadlineView.as_view(), name='headline'),
url(r'^headline/(?P<s>[\w-]+)/$', views.DynamicHeadlineView.as_view()),

# PermissionRequiredMixin tests
Expand Down

0 comments on commit 8431b0f

Please sign in to comment.