Merge branch 'release/1.5.0b0'

Author: wuyue92tree

adminlteui/__init__.py

@@ -1,2 +1,2 @@
-version = '1.4.0'
+version = '1.5.0b0'
 default_app_config = 'adminlteui.apps.AdminlteUIConfig'

adminlteui/templates/adminlte/widgets/select.html

@@ -0,0 +1,6 @@
+<select name="{{ widget.name }}"{% include "django/forms/widgets/attrs.html" %}>{% for group_name, group_choices, group_index in widget.optgroups %}{% if group_name %}
+<optgroup label="{{ group_name }}">{% endif %}{% for option in group_choices %}
+    {% include option.template_name with widget=option %}{% endfor %}{% if group_name %}
+</optgroup>{% endif %}{% endfor %}
+</select>
+<script>django.jQuery('#id_{{widget.name}}').select2()</script>

adminlteui/widgets.py

@@ -3,6 +3,7 @@
 
 
 class AdminlteSelect(Select):
+    template_name = "adminlte/widgets/select.html"
 
     def _get_media(self):
         return forms.Media(
@@ -17,6 +18,8 @@ def _get_media(self):
 
 
 class AdminlteSelectMultiple(SelectMultiple):
+    template_name = "adminlte/widgets/select.html"
+
     def build_attrs(self, base_attrs, extra_attrs=None):
         extra_attrs['multiple'] = 'multiple'
         return {**base_attrs, **(extra_attrs or {})}

docs/about.md

@@ -1,5 +1,14 @@
 # ChangeLog
 
+## [v1.5.0b0](https://github.com/wuyue92tree/django-adminlte-ui/releases/tag/1.5.0b0)
+
+- add adminlte/widgets/select.html && auto active select2 by select id.
+
+## [v1.4.0](https://github.com/wuyue92tree/django-adminlte-ui/releases/tag/1.4.0)
+
+- feature #6 add `ADMINLTE_SETTINGS`;
+- update menu render logic.
+
 ## [v1.3.3](https://github.com/wuyue92tree/django-adminlte-ui/releases/tag/1.3.3)
 
 - add menu on the top;

docs/guide.md

@@ -54,41 +54,45 @@ before custom option, you should known what adminlte has used.
 
 ### AdminlteSelect
 
+> Since v1.5.0b0, you don't need modify new template to active select2.
+
 example:
 ```
 # adminlte/admin.py
 @admin.register(Menu)
 class MenuAdmin(TreeAdmin):
     ...
-    change_form_template = 'adminlte/menu_change_form.html'
+    # change_form_template = 'adminlte/menu_change_form.html'
     formfield_overrides = {
         models.ForeignKey: {'widget': AdminlteSelect}
     }
 
 # adminlte/menu_change_form.html
 # active the target select
-{% extends 'admin/change_form.html' %}
-
-{% block extrajs %}
-{{ block.super }}
-<script>
-    django.jQuery('#id_content_type').select2();
-</script>
-{% endblock %}
+# {% extends 'admin/change_form.html' %}
+
+# {% block extrajs %}
+# {{ block.super }}
+# <script>
+#     django.jQuery('#id_content_type').select2();
+# </script>
+# {% endblock %}
 ```
 effect:
 
 ![adminlte_select](https://github.com/wuyue92tree/django-adminlte-ui/blob/master/images/adminlte_select.png?raw=true)
 
 ### AdminlteSelectMultiple
 
+> Since v1.5.0b0, you don't need modify new template to active select2.
+
 example:
 ```
 # adminlte/admin.py
 @admin.register(Menu)
 class MenuAdmin(TreeAdmin):
     ...
-    change_form_template = 'adminlte/menu_change_form.html'
+    # change_form_template = 'adminlte/menu_change_form.html'
     formfield_overrides = {
         # multiple for ManayToManyField
         models.ManayToManyField: {'widget': AdminlteSelectMultiple(
@@ -98,14 +102,14 @@ class MenuAdmin(TreeAdmin):
 
 # adminlte/menu_change_form.html
 # active the target select
-{% extends 'admin/change_form.html' %}
-
-{% block extrajs %}
-{{ block.super }}
-<script>
-    django.jQuery('#id_content_type').select2();
-</script>
-{% endblock %}
+# {% extends 'admin/change_form.html' %}
+
+# {% block extrajs %}
+# {{ block.super }}
+# <script>
+#     django.jQuery('#id_content_type').select2();
+# </script>
+# {% endblock %}
 ```
 effect: