From fa0ef1773773c58b5708abad0e90a44fc9a308f8 Mon Sep 17 00:00:00 2001 From: Carlton Gibson Date: Tue, 2 Sep 2014 14:53:37 +0200 Subject: [PATCH 1/5] Remove Login Dropdown when Auth Views are not registered. Fixes #1738 --- .../templates/rest_framework/base.html | 26 +++----- rest_framework/templatetags/rest_framework.py | 17 +++-- tests/browsable_api/__init__.py | 0 tests/browsable_api/auth_urls.py | 10 +++ tests/browsable_api/no_auth_urls.py | 9 +++ tests/browsable_api/test_browsable_api.py | 65 +++++++++++++++++++ tests/browsable_api/views.py | 15 +++++ 7 files changed, 121 insertions(+), 21 deletions(-) create mode 100644 tests/browsable_api/__init__.py create mode 100644 tests/browsable_api/auth_urls.py create mode 100644 tests/browsable_api/no_auth_urls.py create mode 100644 tests/browsable_api/test_browsable_api.py create mode 100644 tests/browsable_api/views.py diff --git a/rest_framework/templates/rest_framework/base.html b/rest_framework/templates/rest_framework/base.html index e54e38148..5a12277bc 100644 --- a/rest_framework/templates/rest_framework/base.html +++ b/rest_framework/templates/rest_framework/base.html @@ -5,14 +5,14 @@ {% block head %} - + {% block meta %} {% endblock %} - + {% block title %}Django REST framework{% endblock %} - + {% block style %} {% block bootstrap_theme %} @@ -21,7 +21,7 @@ {% endblock %} - + {% endblock %} @@ -44,15 +44,7 @@ diff --git a/rest_framework/templatetags/rest_framework.py b/rest_framework/templatetags/rest_framework.py index f7332c3b5..c228d5c3d 100644 --- a/rest_framework/templatetags/rest_framework.py +++ b/rest_framework/templatetags/rest_framework.py @@ -41,7 +41,7 @@ def optional_login(request): except NoReverseMatch: return '' - snippet = "Log in" % (login_url, escape(request.path)) + snippet = "
  • Log in
    • " % (login_url, escape(request.path)) return snippet From ef1fb3d8df8227961e3b24d1955af93be13519ea Mon Sep 17 00:00:00 2001 From: Carlton Gibson Date: Thu, 4 Sep 2014 08:54:50 +0200 Subject: [PATCH 5/5] Prefer `format` and use named blocks --- rest_framework/templatetags/rest_framework.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/rest_framework/templatetags/rest_framework.py b/rest_framework/templatetags/rest_framework.py index c228d5c3d..864d64dd0 100644 --- a/rest_framework/templatetags/rest_framework.py +++ b/rest_framework/templatetags/rest_framework.py @@ -41,7 +41,7 @@ def optional_login(request): except NoReverseMatch: return '' - snippet = "
  • Log in
    • " % (login_url, escape(request.path)) + snippet = "
  • Log in
    • ".format(href=login_url, next=escape(request.path)) return snippet @@ -53,19 +53,19 @@ def optional_logout(request, user): try: logout_url = reverse('rest_framework:logout') except NoReverseMatch: - return '
  • {0}
    • '.format(user) + return '
  • {user}
    • '.format(user=user) snippet = """
  • - {0} + {user}
    • """ - return snippet.format(user, logout_url, escape(request.path)) + return snippet.format(user=user, href=logout_url, next=escape(request.path)) @register.simple_tag