Skip to content

Commit

Permalink
Version bump
Browse files Browse the repository at this point in the history
  • Loading branch information
mrjoes committed Oct 26, 2020
1 parent becc783 commit 7165a0a
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 3 deletions.
7 changes: 7 additions & 0 deletions doc/changelog.rst
Original file line number Diff line number Diff line change
@@ -1,6 +1,13 @@
Changelog
=========

1.5.7
-----

* Bootstrap 4 support!
* Added hook for custom SQLAlchemy models initializers
* SQLAlchemy 1.4/2.0 compatibility fix

1.5.6
-----

Expand Down
2 changes: 1 addition & 1 deletion flask_admin/__init__.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
__version__ = '1.5.6'
__version__ = '1.5.7'
__author__ = 'Flask-Admin team'
__email__ = '[email protected]'

Expand Down
4 changes: 2 additions & 2 deletions flask_admin/tests/peeweemodel/test_basic.py
Original file line number Diff line number Diff line change
Expand Up @@ -1028,8 +1028,8 @@ class Model2(BaseModel):
ok_(u'value=""' not in form.model1())

form.model1.data = model
needle = u'data-json="[%s, "first"]"' % as_unicode(model.id)
ok_(needle in form.model1())
ok_(u'data-json="[%s, "first"]"' % as_unicode(model.id) in form.model1() or
u'data-json="[%s, "first"]"' % as_unicode(model.id))
ok_(u'value="%s"' % as_unicode(model.id) in form.model1())

# Check querying
Expand Down

0 comments on commit 7165a0a

Please sign in to comment.