Merge branch 'master' into datetimefield-wtforms3

.github/workflows/test.yaml

@@ -33,7 +33,7 @@ jobs:
           --health-timeout 5s
           --health-retries 5
       mongo:
-        image: mongo:3.1
+        image: mongo:5.0.4-focal
         ports:
           - 27017:27017
       azurite:
@@ -59,4 +59,4 @@ jobs:
       - name: Install tox
         run: pip install tox
       - name: Run tests
-        run: tox -e ${{ matrix.tox-version }}
+        run: tox -e ${{ matrix.tox-version }}

flask_admin/model/fields.py

@@ -42,7 +42,7 @@ def display_row_controls(self, field):
 
     def process(self, formdata, data=unset_value, extra_filters=None):
         res = super(InlineFieldList, self).process(
-            formdata, data, extra_filters=extra_filters)
+            formdata, data)
 
         # Postprocess - contribute flag
         if formdata:

flask_admin/model/typefmt.py

@@ -36,8 +36,8 @@ def bool_formatter(view, value):
             Value to check
     """
     glyph = 'ok-circle' if value else 'minus-sign'
-    fa = 'fas fa-check-circle' if value else 'far fa-circle'
-    return Markup('<span class="%s glyphicon glyphicon-%s icon-%s"></span>' % (fa, glyph, glyph))
+    fa = 'fa-check-circle' if value else 'fa-minus-circle'
+    return Markup('<span class="fa %s glyphicon glyphicon-%s icon-%s"></span>' % (fa, glyph, glyph))
 
 
 def list_formatter(view, values):

flask_admin/static/admin/js/bs4_filters.js

@@ -193,5 +193,6 @@ var AdminFilters = function(element, filtersElement, filterGroups, activeFilters
                 JSON.parse($('#active-filters-data').text())
             );
         }
-    })
+    });
+    $(document).trigger('adminFormReady');  // trigger event to allow dynamic filter form to function properly
 })(jQuery);

flask_admin/templates/bootstrap4/admin/layout.html

@@ -80,7 +80,8 @@
     {% set class_name = item.get_class_name() %}
     {% if item.is_accessible() and item.is_visible() %}
       <li{% if class_name %} class="{{ class_name }}"{% endif %}>
-        <a class="nav-link" href="{{ item.get_url() }}">{{ menu_icon(item) }}{{ item.name }}</a>
+        <a class="nav-link" href="{{ item.get_url() }}"{% if item.target %} target="{{ item.target }}"{% endif %}>
+          {{ menu_icon(item) }}{{ item.name }}</a>
       </li>
     {% endif %}
   {% endfor %}

flask_admin/tests/peeweemodel/test_basic.py

@@ -1,9 +1,4 @@
-from unittest import SkipTest
-
-# Skip test on PY3
-from flask_admin._compat import PY2, as_unicode
-if not PY2:
-    raise SkipTest('Peewee is not Python 3 compatible')
+from flask_admin._compat import as_unicode
 
 import peewee
 
@@ -157,7 +152,7 @@ def test_model():
 
     rv = client.get('/admin/model1/')
     assert rv.status_code == 200
-    assert 'test1large' in rv.data
+    assert b'test1large' in rv.data
 
     url = '/admin/model1/edit/?id=%s' % model.id
     rv = client.get(url)
@@ -1028,7 +1023,7 @@ class Model2(BaseModel):
     client = app.test_client()
 
     req = client.get(u'/admin/view/ajax/lookup/?name=model1&query=foo')
-    assert req.data == u'[[%s, "foo"]]' % model2.id
+    assert req.data == b'[[%d, "foo"]]' % model2.id
 
     # Check submitting
     client.post('/admin/view/new/', data={u'model1': as_unicode(model.id)})

requirements-dev.txt

@@ -17,8 +17,7 @@ pytest-cov
 coveralls
 pylint
 sqlalchemy-citext
-sqlalchemy-utils<=0.36.6; python_version < "3.0"
-sqlalchemy-utils>=0.36.6; python_version >= "3.0"
+sqlalchemy-utils>=0.36.6
 azure-storage-blob
 arrow<0.14.0
 colour