Skip to content

Commit 86aa857

Browse files
committed
Fix issue zostera#204
Fix issue zostera#153 Version bump to 21.2
1 parent c6bb055 commit 86aa857

File tree

4 files changed

+17
-7
lines changed

4 files changed

+17
-7
lines changed

CHANGELOG.md

+5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
# Changelog
22

3+
## 21.2 (2011-11-24)
4+
5+
- Fixes CDN URL in BOOTSTRAP5_DEFAULTS setting for javascript dependencies (#208).
6+
- Correct bootstrap_field.addon_[before|after]_class behavior to match documentation (#153).
7+
38
## 21.1 (2021-11-01)
49

510
- Switch to a [CalVer](https://calver.org) YY.MINOR versioning scheme. MINOR is the number of the release in the given year. This is the first release in 2021 using this scheme, so its version is 21.1. The next version this year will be 21.2. The first version in 2022 will be 22.1.

setup.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
setup(
1414
name="django-bootstrap5",
1515
zip_safe=False,
16-
version="21.1",
16+
version="21.2",
1717
description="Bootstrap 5 for Django",
1818
long_description=README,
1919
long_description_content_type="text/markdown",

src/django_bootstrap5/core.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"crossorigin": "anonymous",
1111
},
1212
"javascript_url": {
13-
"url": "https://cdn.jsdelivr.net/npm/[email protected]/dist/js/bootstrap.bundle.min.j",
13+
"url": "https://cdn.jsdelivr.net/npm/[email protected]/dist/js/bootstrap.bundle.min.js",
1414
"integrity": "sha384-ka7Sk0Gln4gmtz2MlQnikT1wXgYsOg+OMhuP+IlRH9sENBO0LRn5q+8nbTov4+1p",
1515
"crossorigin": "anonymous",
1616
},

src/django_bootstrap5/renderers.py

+10-5
Original file line numberDiff line numberDiff line change
@@ -488,12 +488,17 @@ def render(self):
488488
errors = self.get_errors_html()
489489

490490
if self.is_form_control_widget():
491-
addon_before = (
492-
format_html('<span class="input-group-text">{}</span>', self.addon_before) if self.addon_before else ""
493-
)
494-
addon_after = (
495-
format_html('<span class="input-group-text">{}</span>', self.addon_after) if self.addon_after else ""
491+
addon_before_wrapper = self.addon_before or ""
492+
addon_after_wrapper = self.addon_after or ""
493+
if self.addon_before and self.addon_before_class is not None:
494+
addon_before_wrapper = format_html(
495+
f'<span class="{self.addon_before_class}">{self.addon_before}</span>'
496+
)
497+
if self.addon_after and self.addon_after_class is not None:
498+
addon_before_wrapper = format_html(
499+
f'<span class="{self.addon_after_class}">{self.addon_after}</span>'
496500
)
501+
497502
if addon_before or addon_after:
498503
classes = "input-group"
499504
if self.server_side_validation and self.get_server_side_validation_classes():

0 commit comments

Comments
 (0)