Change bootstrap_setting from filter to tag (#595)

dyve · web-flow · commit b3ad05dfba9f · 2024-04-22T12:00:51.000+02:00
diff --git a/src/django_bootstrap5/templates/django_bootstrap5/bootstrap5.html b/src/django_bootstrap5/templates/django_bootstrap5/bootstrap5.html
@@ -2,41 +2,29 @@
 {% load django_bootstrap5 %}
 {% load i18n %}
 {% get_current_language as LANGUAGE_CODE %}
+{% bootstrap_setting 'javascript_in_head' as BOOTSTRAP_JAVASCRIPT_IN_HEAD %}
 <html lang="{{ LANGUAGE_CODE|default:'en_us' }}">
 
 <head>
-
     <!-- Required meta tags -->
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
-
     <!-- Page title -->
     <title>{% block bootstrap5_title %}django-bootstrap5 template title{% endblock %}</title>
-
     <!-- Bootstrap CSS -->
     {% bootstrap_css %}
-
     <!-- Bootstrap JavaScript if it is in head -->
-    {% if 'javascript_in_head'|bootstrap_setting %}
-        {% bootstrap_javascript %}
-    {% endif %}
-
+    {% if BOOTSTRAP_JAVASCRIPT_IN_HEAD %}{% bootstrap_javascript %}{% endif %}
     {% block bootstrap5_extra_head %}{% endblock %}
-
 </head>
 
 <body>
 {% block bootstrap5_before_content %}{% endblock %}
 {% block bootstrap5_content %} CONTENT {% endblock %}
 {% block bootstrap5_after_content %}{% endblock %}
-
 <!-- Bootstrap JavaScript if it is in body -->
-{% if not 'javascript_in_head'|bootstrap_setting %}
-    {% bootstrap_javascript %}
-{% endif %}
-
+{% if not BOOTSTRAP_JAVASCRIPT_IN_HEAD %}{% bootstrap_javascript %}{% endif %}
 {% block bootstrap5_extra_script %}{% endblock %}
-
 </body>
 
 </html>
diff --git a/src/django_bootstrap5/templatetags/django_bootstrap5.py b/src/django_bootstrap5/templatetags/django_bootstrap5.py
@@ -26,12 +26,12 @@
 register = template.Library()
 
 
-@register.filter
+@register.simple_tag
 def bootstrap_setting(value):
     """
     Return django-bootstrap5 setting for use in in a template.
 
-    Please consider this filter private, do not use it in your own templates.
+    Please consider this tag private, do not use it in your own templates.
     """
     return get_bootstrap_setting(value)
 
diff --git a/tests/test_bootstrap_css_and_js_tags.py b/tests/test_bootstrap_css_and_js_tags.py
@@ -42,7 +42,14 @@ def test_bootstrap_css_tag_with_theme(self):
             )
 
     def test_bootstrap_setting_filter(self):
-        self.assertEqual(self.render('{{ "required_css_class"|bootstrap_setting }}'), "django_bootstrap5-req")
         self.assertEqual(
-            self.render('{% if "javascript_in_head"|bootstrap_setting %}head{% else %}body{% endif %}'), "head"
+            self.render("{% bootstrap_setting 'required_css_class' %}"),
+            "django_bootstrap5-req",
+        )
+        self.assertEqual(
+            self.render(
+                "{% bootstrap_setting 'javascript_in_head' as BOOTSTRAP_JAVASCRIPT_IN_HEAD %}"
+                "{% if BOOTSTRAP_JAVASCRIPT_IN_HEAD %}head{% else %}body{% endif %}"
+            ),
+            "head",
         )
