Update V2 with bootstrap 4.5.x, bug corrected on horizontal filters, upgrade django version and more

.github/workflows/pythonapp.yml

@@ -0,0 +1,33 @@
+name: django-suit
+
+on: [push]
+
+jobs:
+  test:
+
+    runs-on: ${{ matrix.os }}
+
+    strategy:
+      matrix:
+        os: [ ubuntu-latest ]
+        python-version: [ '3.9', '3.10.13' ]
+        django-version: [ '3.2.10', '4.0.10', '4.1.13', '4.2.9' ]
+        exclude:
+          - os: macos-latest
+            python-version: '3.8'
+          - os: windows-latest
+            python-version: '3.6'
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Python ${{ matrix.python-version }}
+      uses: actions/setup-python@v2
+      with:
+        python-version: ${{ matrix.python-version }}
+    - name: Install dependencies
+      run: |
+        python -m pip install --upgrade pip
+        pip install Django==${{ matrix.django-version }}
+    - name: Run Tests
+      run: |
+        python manage.py test suit --settings=suit.tests.settings

.gitignore

@@ -10,3 +10,5 @@ docs/_build/
 /bower_components/
 /node_modules/
 /env/
+/package-lock.json
+/.pypirc

Procfile

@@ -0,0 +1 @@
+web: mkdir -p demo/demo/static && python demo/manage.py collectstatic && python demo/manage.py runserver 0.0.0.0:$PORT

README.rst

@@ -6,33 +6,36 @@ Django Suit
 
 Django Suit is alternative theme/skin/extension for `Django <http://www.djangoproject.com>`_ administration interface.
 
-* Project home: http://djangosuit.com/
-* Live demo v1: http://djangosuit.com/admin/
-* Live demo v2.0 alpha 1: http://v2.djangosuit.com/admin/
+v2 version is working with Django 3.2 and Django 4.0, it is using Bootstrap 5.1
+
+* Project home: http://djangosuit.com/ (not maintained)
 
 
 License
 =======
-
+ (not maintained)
 * Django Suit is licensed under `Creative Commons Attribution-NonCommercial 3.0 <http://creativecommons.org/licenses/by-nc/3.0/>`_ license.
 * Licence and pricing: http://djangosuit.com/pricing/
 
 
 Docs & Support
 ==============
 
-* Documentation v2: http://django-suit.readthedocs.org/en/v2/
-* Documentation v1: http://django-suit.readthedocs.org/en/latest/
-* Support: http://djangosuit.com/support/
-* Follow `on Twitter <http://twitter.com/DjangoSuit>`_ to get latest news
-
+* Documentation v2: http://django-suit.readthedocs.org/en/v2/ (not maintained)
+* Support: http://djangosuit.com/support/ (not maintained)
 
 Changelog
 =========
 
 **Note:** Django Suit v2.0 is in active development and not yet ready for production use.
 
-Read more here: Todo: Add issue refernce
+Read more here: Todo: Add issue reference
+
+Install
+=========
+Install Django Suit v2 using ``pip`` or ``easy_install``::
+
+    pip install django-suit-v2-pm
 
 
 Contributing
@@ -44,25 +47,4 @@ See `Contributing documentation <http://django-suit.readthedocs.org/en/v2/contri
 Build Status
 ============
 
-Django Suit uses Travis CI to perform tests on different Django and Python versions.
-
-Tested using Python: 2.7-3.4 and PyPy. Django: 1.9+ and Django Suit v2.0 alpha:
-
-.. |v2| image:: https://travis-ci.org/darklow/django-suit.png?branch=v2
-   :alt: Build Status - v2 branch
-   :target: http://travis-ci.org/darklow/django-suit
-
-.. |develop| image:: https://travis-ci.org/darklow/django-suit.png?branch=develop
-   :alt: Build Status - develop branch
-   :target: http://travis-ci.org/darklow/django-suit
-
-|v2| |develop|
-
-
-Preview
-=======
-
-
-.. image:: https://cloud.githubusercontent.com/assets/445304/12699480/3eee898e-c7c5-11e5-931c-ba1b0cabdecb.png
-:alt: Django Suit Preview
-   :target: http://v2.djangosuit.com/admin/
+Tested using Python: 3.8 and PyPy + Django: 3.2 (LTS), Django 4.0, Django 4.1, Django 4.2 (LTS)

demo/demo/admin.py

@@ -1,10 +1,7 @@
-from django.conf import settings
-from django.conf.urls import url
-from django.contrib import admin
 from django.forms import ModelForm, Select, TextInput, NumberInput
-from django.contrib.admin.views.decorators import staff_member_required
 from django.contrib import messages
 from django.shortcuts import redirect
+from django.urls import re_path
 from django_select2.forms import ModelSelect2Widget
 from suit import apps
 
@@ -46,9 +43,9 @@ class Meta:
                                   attrs={'placeholder': 'Country area'}),
             'population': EnclosedInput(
                 prepend='fa-users',
-                append='<button class="btn btn-secondary" type="button" '
-                       'onclick="window.open(\'https://www.google.com/\')">Search</button>',
-                append_class='btn', attrs={'placeholder': 'Human population'}),
+                append='Search',
+                onclick_append="window.open(\'https://www.google.com/\')",
+                append_class='addon', attrs={'placeholder': 'Human population' }),
             'description': AutosizedTextarea,
             'architecture': AutosizedTextarea,
         }
@@ -66,7 +63,7 @@ class PopulationFilter(IsNullFieldListFilter):
 class CountryAdmin(RelatedFieldAdmin):
     form = CountryForm
     search_fields = ('name', 'code')
-    list_display = ('name', 'code', 'link_to_continent', 'independence_day')
+    list_display = ('name', 'code', 'independence_day')
     list_filter = ('continent', 'independence_day', 'code', ('population', PopulationFilter))
     suit_list_filter_horizontal = ('code', 'population')
     list_select_related = True
@@ -314,7 +311,7 @@ def get_urls(self):
         """
         urls = super(ShowcaseAdmin, self).get_urls()
         my_urls = [
-            url(r'^(\d+)/clickme/$', showcase_custom_view_example, name='demo_showcase_clickme')
+            re_path(r'^(\d+)/clickme/$', showcase_custom_view_example, name='demo_showcase_clickme')
         ]
         return my_urls + urls
 
@@ -327,3 +324,23 @@ def showcase_custom_view_example(request, pk):
     messages.success(request, 'Something legendary was done to "%s"' % instance)
 
     return redirect('admin:demo_showcase_change', pk)
+
+#
+# class LargeFilterHorizontalForm(ModelForm):
+#     class Meta:
+#         pass
+#
+#
+# @admin.register(LargeFilterHorizontal)
+# class LargeFilterHorizontalAdmin(RelatedFieldAdmin):
+#     form = LargeFilterHorizontalForm
+#     search_fields = ('title',)
+#     list_display = ('horizontal_choices1', 'horizontal_choices2', 'horizontal_choices3', 'horizontal_choices4',)
+#     list_filter = ('horizontal_choices1', 'horizontal_choices2', 'horizontal_choices3', 'horizontal_choices4',
+#                    'horizontal_choices5', 'horizontal_choices6', 'horizontal_choices7', 'horizontal_choices8')
+#     suit_list_filter_horizontal = list_filter
+#
+#     fieldsets = [
+#         ('Main', {'fields': ['horizontal_choices1', 'horizontal_choices2', 'horizontal_choices3', 'horizontal_choices4',
+#                              'horizontal_choices5', 'horizontal_choices6', 'horizontal_choices7', 'horizontal_choices8']}),
+#     ]

demo/demo/apps.py

@@ -5,7 +5,7 @@
 class SuitConfig(DjangoSuitConfig):
     menu = (
         ParentItem('Content', children=[
-            ChildItem(model='demo.country'),
+            ChildItem(model='demo.country', params={'o': '1.2'}),
             ChildItem(model='demo.continent'),
             ChildItem(model='demo.showcase'),
             ChildItem('Custom view', url='/admin/custom/'),

demo/demo/migrations/0013_auto_20201112_1223.py

@@ -0,0 +1,94 @@
+# Generated by Django 2.1.15 on 2020-11-12 11:23
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('demo', '0012_auto_20170407_1131'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='book',
+            name='rating',
+            field=models.SmallIntegerField(choices=[(1, 'Awesome'), (2, 'Good'), (3, 'Normal'), (4, 'Bad')], help_text='Choose wisely'),
+        ),
+        migrations.AlterField(
+            model_name='country',
+            name='code',
+            field=models.CharField(help_text='ISO 3166-1 alpha-2 - two character country code', max_length=2),
+        ),
+        migrations.AlterField(
+            model_name='country',
+            name='description',
+            field=models.TextField(blank=True, help_text='Try and enter few some more lines'),
+        ),
+        migrations.AlterField(
+            model_name='movie',
+            name='rating',
+            field=models.SmallIntegerField(choices=[(1, 'Awesome'), (2, 'Good'), (3, 'Normal'), (4, 'Bad')], default=2),
+        ),
+        migrations.AlterField(
+            model_name='showcase',
+            name='boolean_with_help',
+            field=models.BooleanField(default=False, help_text='Boolean field with help text'),
+        ),
+        migrations.AlterField(
+            model_name='showcase',
+            name='choices',
+            field=models.SmallIntegerField(choices=[(1, 'Tall'), (2, 'Normal'), (3, 'Short')], default=3, help_text='Help text'),
+        ),
+        migrations.AlterField(
+            model_name='showcase',
+            name='country',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='demo.Country'),
+        ),
+        migrations.AlterField(
+            model_name='showcase',
+            name='country2',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='showcase_country2_set', to='demo.Country', verbose_name='Django Select 2'),
+        ),
+        migrations.AlterField(
+            model_name='showcase',
+            name='help_text',
+            field=models.CharField(help_text='Enter fully qualified name', max_length=64),
+        ),
+        migrations.AlterField(
+            model_name='showcase',
+            name='horizontal_choices',
+            field=models.SmallIntegerField(choices=[(1, 'Awesome'), (2, 'Good'), (3, 'Normal'), (4, 'Bad')], default=1, help_text='Horizontal choices look like this'),
+        ),
+        migrations.AlterField(
+            model_name='showcase',
+            name='multiple_in_row',
+            field=models.CharField(help_text='Help text for multiple', max_length=64),
+        ),
+        migrations.AlterField(
+            model_name='showcase',
+            name='raw_id_field',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='showcase_raw_set', to='demo.Country'),
+        ),
+        migrations.AlterField(
+            model_name='showcase',
+            name='readonly_field',
+            field=models.CharField(default='Some value here', max_length=127),
+        ),
+        migrations.AlterField(
+            model_name='showcase',
+            name='textfield',
+            field=models.TextField(blank=True, help_text='Try and enter few some more lines', verbose_name='Autosized textfield'),
+        ),
+        migrations.AlterField(
+            model_name='showcase',
+            name='time_only',
+            field=models.TimeField(blank=True, null=True, verbose_name='Time'),
+        ),
+        migrations.AlterField(
+            model_name='showcase',
+            name='vertical_choices',
+            field=models.SmallIntegerField(choices=[(1, 'Hot'), (2, 'Normal'), (3, 'Cold')], default=2, help_text='Some help on vertical choices'),
+        ),
+    ]