From 5e3c8bdde1b7ce6cbcb65da7a77942c211576e2e Mon Sep 17 00:00:00 2001 From: Ken Kinder Date: Mon, 25 Mar 2019 15:23:34 -0600 Subject: [PATCH 01/69] Fix (and add example for) using a Python function as a default value. --- examples/peewee/app.py | 6 ++++-- flask_admin/contrib/peewee/view.py | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/examples/peewee/app.py b/examples/peewee/app.py index 3615b97aea..de01135757 100644 --- a/examples/peewee/app.py +++ b/examples/peewee/app.py @@ -1,11 +1,11 @@ -from flask import Flask +import uuid import peewee +from flask import Flask import flask_admin as admin from flask_admin.contrib.peewee import ModelView - app = Flask(__name__) app.config['SECRET_KEY'] = '123456790' @@ -36,6 +36,7 @@ def __unicode__(self): class Post(BaseModel): + id = peewee.UUIDField(primary_key=True, default=uuid.uuid4) title = peewee.CharField(max_length=120) text = peewee.TextField(null=False) date = peewee.DateTimeField() @@ -80,6 +81,7 @@ def index(): if __name__ == '__main__': import logging + logging.basicConfig() logging.getLogger().setLevel(logging.DEBUG) diff --git a/flask_admin/contrib/peewee/view.py b/flask_admin/contrib/peewee/view.py index dc9247f660..ee77873a4a 100644 --- a/flask_admin/contrib/peewee/view.py +++ b/flask_admin/contrib/peewee/view.py @@ -453,7 +453,7 @@ def create_model(self, form): model = self.model() form.populate_obj(model) self._on_model_change(form, model, True) - model.save() + model.save(force_insert=True) # For peewee have to save inline forms after model was saved save_inline(form, model) From 8a7bc2fca728d77eeee59c36a0e903970c13d857 Mon Sep 17 00:00:00 2001 From: Chris Mayo Date: Wed, 25 Mar 2020 19:39:33 +0000 Subject: [PATCH 02/69] Enable testing of MongoEngine backend on Python 3 WTForms2 with Python 3.7 and newer needs MongoEngine 0.16 [1]. [1] https://github.com/MongoEngine/mongoengine/commit/15451ff42b7cc --- flask_admin/tests/mongoengine/__init__.py | 5 --- flask_admin/tests/mongoengine/test_basic.py | 45 ++++++++++++--------- requirements-dev.txt | 4 +- 3 files changed, 28 insertions(+), 26 deletions(-) diff --git a/flask_admin/tests/mongoengine/__init__.py b/flask_admin/tests/mongoengine/__init__.py index 86e94cb03f..8ae4e34bbc 100644 --- a/flask_admin/tests/mongoengine/__init__.py +++ b/flask_admin/tests/mongoengine/__init__.py @@ -1,11 +1,6 @@ from nose.plugins.skip import SkipTest from wtforms import __version__ as wtforms_version -# Skip test on PY3 -from flask_admin._compat import PY2 -if not PY2: - raise SkipTest('MongoEngine is not Python 3 compatible') - if int(wtforms_version[0]) < 2: raise SkipTest('MongoEngine does not support WTForms 1.') diff --git a/flask_admin/tests/mongoengine/test_basic.py b/flask_admin/tests/mongoengine/test_basic.py index a2e7163a25..d6af153c4d 100644 --- a/flask_admin/tests/mongoengine/test_basic.py +++ b/flask_admin/tests/mongoengine/test_basic.py @@ -15,7 +15,7 @@ class CustomModelView(ModelView): def __init__(self, model, name=None, category=None, endpoint=None, url=None, **kwargs): - for k, v in kwargs.iteritems(): + for k, v in kwargs.items(): setattr(self, k, v) super(CustomModelView, self).__init__(model, @@ -49,20 +49,27 @@ class Model2(db.Document): def fill_db(Model1, Model2): - Model1('test1_val_1', 'test2_val_1').save() - Model1('test1_val_2', 'test2_val_2').save() - Model1('test1_val_3', 'test2_val_3').save() - Model1('test1_val_4', 'test2_val_4').save() - Model1(None, 'empty_obj').save() - - Model2('string_field_val_1', None, None, True).save() - Model2('string_field_val_2', None, None, False).save() - Model2('string_field_val_3', 5000, 25.9).save() - Model2('string_field_val_4', 9000, 75.5).save() - Model2('string_field_val_5', 6169453081680413441).save() - - Model1('datetime_obj1', datetime_field=datetime(2014, 4, 3, 1, 9, 0)).save() - Model1('datetime_obj2', datetime_field=datetime(2013, 3, 2, 0, 8, 0)).save() + Model1(test1='test1_val_1', test2='test2_val_1').save() + Model1(test1='test1_val_2', test2='test2_val_2').save() + Model1(test1='test1_val_3', test2='test2_val_3').save() + Model1(test1='test1_val_4', test2='test2_val_4').save() + Model1(test1=None, test2='empty_obj').save() + + Model2(string_field='string_field_val_1', int_field=None, + float_field=None, bool_field=True).save() + Model2(string_field='string_field_val_2', int_field=None, + float_field=None, bool_field=False).save() + Model2(string_field='string_field_val_3', int_field=5000, + float_field=25.9).save() + Model2(string_field='string_field_val_4', int_field=9000, + float_field=75.5).save() + Model2(string_field='string_field_val_5', + int_field=6169453081680413441).save() + + Model1(test1='datetime_obj1', + datetime_field=datetime(2014, 4, 3, 1, 9, 0)).save() + Model1(test1='datetime_obj2', + datetime_field=datetime(2013, 3, 2, 0, 8, 0)).save() def test_model(): @@ -116,7 +123,7 @@ def test_model(): rv = client.get('/admin/model1/') eq_(rv.status_code, 200) - ok_('test1large' in rv.data) + ok_(b'test1large' in rv.data) url = '/admin/model1/edit/?id=%s' % model.id rv = client.get(url) @@ -977,7 +984,7 @@ class Model1(db.Document): rv = client.post('/admin/model1/new/', data={'test1': 'test1large', 'subdoc-0-name': '', 'subdoc-0-value': 'test'}) eq_(rv.status_code, 200) - ok_('This field is required' in rv.data) + ok_(b'This field is required' in rv.data) def test_list_subdocument_validation(): @@ -1002,7 +1009,7 @@ class Model1(db.Document): rv = client.post('/admin/model1/new/', data={'test1': 'test1large', 'subdoc-0-name': '', 'subdoc-0-value': 'test'}) eq_(rv.status_code, 200) - ok_('This field is required' in rv.data) + ok_(b'This field is required' in rv.data) def test_ajax_fk(): @@ -1056,7 +1063,7 @@ def test_ajax_fk(): client = app.test_client() req = client.get(u'/admin/view/ajax/lookup/?name=model1&query=foo') - eq_(req.data, u'[["%s", "foo"]]' % model2.id) + eq_(req.data.decode('utf-8'), u'[["%s", "foo"]]' % model2.id) # Check submitting client.post('/admin/view/new/', data={u'model1': as_unicode(model.id)}) diff --git a/requirements-dev.txt b/requirements-dev.txt index 9999cf0778..ca5987948f 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -3,8 +3,8 @@ Flask>=0.7 Flask-SQLAlchemy>=0.15 peewee wtf-peewee -mongoengine<0.11.0 -pymongo==2.8 +mongoengine +pymongo flask-mongoengine==0.8.2 pillow>=3.3.2 Babel<=1.3 From 3c122e26a9003e8febdc1cdcf52f883d84d3b424 Mon Sep 17 00:00:00 2001 From: Chris Mayo Date: Wed, 25 Mar 2020 19:39:33 +0000 Subject: [PATCH 03/69] Make pymongo backend testing PyMongo 3 compatible Fix deprecation warning that only requires PyMongo 3.0.0 in test_model. --- flask_admin/tests/pymongo/__init__.py | 6 +++--- flask_admin/tests/pymongo/test_basic.py | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/flask_admin/tests/pymongo/__init__.py b/flask_admin/tests/pymongo/__init__.py index 5d1d21df3c..8a9d27b036 100644 --- a/flask_admin/tests/pymongo/__init__.py +++ b/flask_admin/tests/pymongo/__init__.py @@ -1,4 +1,4 @@ -import pymongo +from pymongo import MongoClient from flask import Flask from flask_admin import Admin @@ -9,8 +9,8 @@ def setup(): app.config['SECRET_KEY'] = '1' app.config['CSRF_ENABLED'] = False - conn = pymongo.Connection() - db = conn.tests + client = MongoClient() + db = client.tests admin = Admin(app) diff --git a/flask_admin/tests/pymongo/test_basic.py b/flask_admin/tests/pymongo/test_basic.py index c191895bb3..8316000277 100644 --- a/flask_admin/tests/pymongo/test_basic.py +++ b/flask_admin/tests/pymongo/test_basic.py @@ -26,7 +26,7 @@ def test_model(): admin.add_view(view) # Drop existing data (if any) - db.test.remove() + db.test.delete_many({}) eq_(view.name, 'Test') eq_(view.endpoint, 'testview') From 697271ce6b2fde769bd1d22fa6775cb47fdc4739 Mon Sep 17 00:00:00 2001 From: Chris Mayo Date: Wed, 25 Mar 2020 19:39:33 +0000 Subject: [PATCH 04/69] Don't attempt to collect pymongo test classes --- flask_admin/tests/pymongo/test_basic.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/flask_admin/tests/pymongo/test_basic.py b/flask_admin/tests/pymongo/test_basic.py index 8316000277..a58cde3ecd 100644 --- a/flask_admin/tests/pymongo/test_basic.py +++ b/flask_admin/tests/pymongo/test_basic.py @@ -8,11 +8,13 @@ class TestForm(form.Form): + __test__ = False test1 = fields.StringField('Test1') test2 = fields.StringField('Test2') class TestView(ModelView): + __test__ = False column_list = ('test1', 'test2', 'test3', 'test4') column_sortable_list = ('test1', 'test2') From 51057e15acd88c4a783101bc186802c90a4c3daf Mon Sep 17 00:00:00 2001 From: "Dmitry / skype: dvska-at-skype" Date: Fri, 8 May 2020 22:02:44 +0300 Subject: [PATCH 05/69] typo fix --- doc/introduction.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/introduction.rst b/doc/introduction.rst index e4292b2869..e55092e5ee 100644 --- a/doc/introduction.rst +++ b/doc/introduction.rst @@ -206,7 +206,7 @@ details view** by setting:: can_view_details = True **Removing columns** from the list view is easy, just pass a list of column names for -the *column_excludes_list* parameter:: +the *column_exclude_list* parameter:: column_exclude_list = ['password', ] From 44cfcacaa70c96c14736476c02f766d295b3827e Mon Sep 17 00:00:00 2001 From: Daniel Butler Date: Fri, 3 Jul 2020 14:52:46 -0400 Subject: [PATCH 06/69] fix secret typo --- examples/sqla-custom-inline-forms/app.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/sqla-custom-inline-forms/app.py b/examples/sqla-custom-inline-forms/app.py index b0e9334c55..659d80d74b 100644 --- a/examples/sqla-custom-inline-forms/app.py +++ b/examples/sqla-custom-inline-forms/app.py @@ -19,7 +19,7 @@ # Create application app = Flask(__name__) -# Create dummy secrey key so we can use sessions +# Create dummy secret key so we can use sessions app.config['SECRET_KEY'] = '123456790' # Create in-memory database From 798e798f4a70ad9d69888cafa9935d2c3df36098 Mon Sep 17 00:00:00 2001 From: Daniel Butler Date: Wed, 8 Jul 2020 14:11:25 -0400 Subject: [PATCH 07/69] adding email validator running flask admin raised the following issue `Exception: Install 'email_validator' for email validation support.` --- examples/sqla/requirements.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/examples/sqla/requirements.txt b/examples/sqla/requirements.txt index b965f9bd84..f010af00b6 100644 --- a/examples/sqla/requirements.txt +++ b/examples/sqla/requirements.txt @@ -7,6 +7,7 @@ enum34; python_version < '3.0' sqlalchemy_utils arrow colour +email_validator # note: for local development, replace 'Flask-Admin' above with a reference to # your local copy of the repo e.g. '-e .' if you're installing this from the From 04c3bf75e5518f4c0a3a214ebca2ab170059afab Mon Sep 17 00:00:00 2001 From: provinzkraut <25355197+provinzkraut@users.noreply.github.com> Date: Fri, 14 Aug 2020 15:26:40 +0200 Subject: [PATCH 08/69] Fix sqla.AdminModelConverter.convert_email empty string behavior --- flask_admin/contrib/sqla/form.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/flask_admin/contrib/sqla/form.py b/flask_admin/contrib/sqla/form.py index aa74d4dfc7..93a4e71fc9 100644 --- a/flask_admin/contrib/sqla/form.py +++ b/flask_admin/contrib/sqla/form.py @@ -345,7 +345,11 @@ def convert_arrow_time(self, field_args, **extra): return form.DateTimeField(**field_args) @converts('sqlalchemy_utils.types.email.EmailType') - def convert_email(self, field_args, **extra): + def convert_email(self, field_args, column=None, **extra): + if column.nullable: + filters = field_args.get('filters', []) + filters.append(lambda x: x or None) + field_args['filters'] = filters field_args['validators'].append(validators.Email()) return fields.StringField(**field_args) From e4097eaf6af04c1f88a0ce53d56be9a138d93b31 Mon Sep 17 00:00:00 2001 From: Michael Bukachi Date: Fri, 28 Aug 2020 00:24:24 +0300 Subject: [PATCH 09/69] fix: Correct styling issue in datepicker --- examples/bootstrap4/app.py | 2 + .../daterangepicker-bs4.css | 335 ++++++++++++++++++ .../templates/bootstrap4/admin/lib.html | 2 +- 3 files changed, 338 insertions(+), 1 deletion(-) create mode 100644 flask_admin/static/vendor/bootstrap-daterangepicker/daterangepicker-bs4.css diff --git a/examples/bootstrap4/app.py b/examples/bootstrap4/app.py index 972aa75d4d..bd766c17d7 100644 --- a/examples/bootstrap4/app.py +++ b/examples/bootstrap4/app.py @@ -1,3 +1,4 @@ +import datetime import os import os.path as op from flask import Flask @@ -27,6 +28,7 @@ class User(db.Model): name = db.Column(db.Unicode(64)) email = db.Column(db.Unicode(64)) active = db.Column(db.Boolean, default=True) + created_at = db.Column(db.DateTime, default=datetime.datetime.now) def __unicode__(self): return self.name diff --git a/flask_admin/static/vendor/bootstrap-daterangepicker/daterangepicker-bs4.css b/flask_admin/static/vendor/bootstrap-daterangepicker/daterangepicker-bs4.css new file mode 100644 index 0000000000..a9194f9548 --- /dev/null +++ b/flask_admin/static/vendor/bootstrap-daterangepicker/daterangepicker-bs4.css @@ -0,0 +1,335 @@ +/*! + * Stylesheet for the Date Range Picker, for use with Bootstrap 3.x + * + * Copyright 2013-2015 Dan Grossman ( http://www.dangrossman.info ) + * Licensed under the MIT license. See http://www.opensource.org/licenses/mit-license.php + * + * Built for http://www.improvely.com + */ + + .daterangepicker.dropdown-menu { + max-width: none; + z-index: 3000; +} + +.daterangepicker.opensleft .ranges, .daterangepicker.opensleft .calendar { + float: left; + margin: 4px; +} + +.daterangepicker.opensright .ranges, .daterangepicker.opensright .calendar, +.daterangepicker.openscenter .ranges, .daterangepicker.openscenter .calendar { + float: right; + margin: 4px; +} + +.daterangepicker.single .ranges, .daterangepicker.single .calendar { + float: none; +} + +.daterangepicker .ranges { + width: 160px; + text-align: left; +} + +.daterangepicker .ranges .range_inputs>div { + float: left; +} + +.daterangepicker .ranges .range_inputs>div:nth-child(2) { + padding-left: 11px; +} + +.daterangepicker .calendar { + display: none; + max-width: 270px; +} + +.daterangepicker.show-calendar .calendar { + display: block; +} + +.daterangepicker .calendar.single .calendar-date { + border: none; +} + +.daterangepicker .calendar th, .daterangepicker .calendar td { + font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; + white-space: nowrap; + text-align: center; + min-width: 32px; +} + +.daterangepicker .daterangepicker_start_input label, +.daterangepicker .daterangepicker_end_input label { + color: #333; + display: block; + font-size: 0.6875rem; + font-weight: normal; + height: 20px; + line-height: 20px; + margin-bottom: 2px; + text-shadow: #fff 1px 1px 0px; + text-transform: uppercase; + width: 74px; +} + +.daterangepicker .ranges input { + font-size: 0.6875rem; +} + +.daterangepicker .ranges .input-mini { + border: 1px solid #ccc; + border-radius: 4px; + color: #555; + display: block; + font-size: 11px; + height: 30px; + line-height: 30px; + vertical-align: middle; + margin: 0 0 10px 0; + padding: 0 6px; + width: 74px; +} + +.daterangepicker .ranges ul { + list-style: none; + margin: 0; + padding: 0; +} + +.daterangepicker .ranges li { + font-size: 0.8125rem; + background: #f5f5f5; + border: 1px solid #f5f5f5; + color: #08c; + padding: 3px 12px; + margin-bottom: 8px; + -webkit-border-radius: 5px; + -moz-border-radius: 5px; + border-radius: 5px; + cursor: pointer; +} + +.daterangepicker .ranges li.active, .daterangepicker .ranges li:hover { + background: #08c; + border: 1px solid #08c; + color: #fff; +} + +.daterangepicker .calendar-date { + border: 1px solid #ddd; + padding: 4px; + border-radius: 4px; + background: #fff; +} + +.daterangepicker .calendar-time { + text-align: center; + margin: 8px auto 0 auto; + line-height: 30px; +} + +.daterangepicker { + position: absolute; + background: #fff; + top: 100px; + left: 20px; + padding: 4px; + margin-top: 1px; + -webkit-border-radius: 4px; + -moz-border-radius: 4px; + border-radius: 4px; +} + +.daterangepicker.opensleft:before { + position: absolute; + top: -7px; + right: 9px; + display: inline-block; + border-right: 7px solid transparent; + border-bottom: 7px solid #ccc; + border-left: 7px solid transparent; + border-bottom-color: rgba(0, 0, 0, 0.2); + content: ''; +} + +.daterangepicker.opensleft:after { + position: absolute; + top: -6px; + right: 10px; + display: inline-block; + border-right: 6px solid transparent; + border-bottom: 6px solid #fff; + border-left: 6px solid transparent; + content: ''; +} + +.daterangepicker.openscenter:before { + position: absolute; + top: -7px; + left: 0; + right: 0; + width: 0; + margin-left: auto; + margin-right: auto; + display: inline-block; + border-right: 7px solid transparent; + border-bottom: 7px solid #ccc; + border-left: 7px solid transparent; + border-bottom-color: rgba(0, 0, 0, 0.2); + content: ''; +} + +.daterangepicker.openscenter:after { + position: absolute; + top: -6px; + left: 0; + right: 0; + width: 0; + margin-left: auto; + margin-right: auto; + display: inline-block; + border-right: 6px solid transparent; + border-bottom: 6px solid #fff; + border-left: 6px solid transparent; + content: ''; +} + +.daterangepicker.opensright:before { + position: absolute; + top: -7px; + left: 9px; + display: inline-block; + border-right: 7px solid transparent; + border-bottom: 7px solid #ccc; + border-left: 7px solid transparent; + border-bottom-color: rgba(0, 0, 0, 0.2); + content: ''; +} + +.daterangepicker.opensright:after { + position: absolute; + top: -6px; + left: 10px; + display: inline-block; + border-right: 6px solid transparent; + border-bottom: 6px solid #fff; + border-left: 6px solid transparent; + content: ''; +} + +.daterangepicker.dropup{ + margin-top: -5px; +} +.daterangepicker.dropup:before{ + top: initial; + bottom:-7px; + border-bottom: initial; + border-top: 7px solid #ccc; +} +.daterangepicker.dropup:after{ + top: initial; + bottom:-6px; + border-bottom: initial; + border-top: 6px solid #fff; +} + +.daterangepicker table { + width: 100%; + margin: 0; +} + +.daterangepicker td, .daterangepicker th { + text-align: center; + width: 20px; + height: 20px; + -webkit-border-radius: 4px; + -moz-border-radius: 4px; + border-radius: 4px; + cursor: pointer; + white-space: nowrap; +} + +.daterangepicker td.off { + color: #999; +} + +.daterangepicker td.disabled, .daterangepicker option.disabled { + color: #999; +} + +.daterangepicker td.available:hover, .daterangepicker td.available.today, .daterangepicker th.available:hover { + background: #eee; +} + +.daterangepicker td.in-range { + background: #ebf4f8; + -webkit-border-radius: 0; + -moz-border-radius: 0; + border-radius: 0; +} + +.daterangepicker td.start-date { + -webkit-border-radius: 4px 0 0 4px; + -moz-border-radius: 4px 0 0 4px; + border-radius: 4px 0 0 4px; +} + +.daterangepicker td.end-date { + -webkit-border-radius: 0 4px 4px 0; + -moz-border-radius: 0 4px 4px 0; + border-radius: 0 4px 4px 0; +} + +.daterangepicker td.start-date.end-date { + -webkit-border-radius: 4px; + -moz-border-radius: 4px; + border-radius: 4px; +} + +.daterangepicker td.today.active, .daterangepicker td.active, .daterangepicker td.active:hover { + background-color: #357ebd; + border-color: #3071a9; + color: #fff; +} + +.daterangepicker td.week, .daterangepicker th.week { + font-size: 80%; + color: #ccc; +} + +.daterangepicker select.monthselect, .daterangepicker select.yearselect { + font-size: 0.75rem; + padding: 1px; + height: auto; + margin: 0; + cursor: default; +} + +.daterangepicker select.monthselect { + margin-right: 2%; + width: 56%; +} + +.daterangepicker select.hourselect, .daterangepicker select.minuteselect, .daterangepicker select.secondselect, .daterangepicker select.ampmselect { + margin-bottom: 0; +} + +.daterangepicker_start_input { + float: left; +} + +.daterangepicker_end_input { + float: left; + padding-left: 11px +} + +.daterangepicker th.month { + width: auto; +} + +/*.daterangepicker.dropdown-menu.single.opensright.show-calendar:after {*/ +/* padding: 40px !important;*/ +/* margin: 40px !important;*/ +/*}*/ \ No newline at end of file diff --git a/flask_admin/templates/bootstrap4/admin/lib.html b/flask_admin/templates/bootstrap4/admin/lib.html index 59443773c9..1fde651cfe 100644 --- a/flask_admin/templates/bootstrap4/admin/lib.html +++ b/flask_admin/templates/bootstrap4/admin/lib.html @@ -242,7 +242,7 @@

{{ text }}

{% macro form_css() %} - + {% if config.MAPBOX_MAP_ID %} From 9c31b8890e19b40e724fd2e476d7c62a6954d8b1 Mon Sep 17 00:00:00 2001 From: Titanium Hocker Date: Sun, 30 Aug 2020 21:46:12 +0300 Subject: [PATCH 10/69] Fixed bs4 modal details view markup --- .../bootstrap4/admin/model/modals/details.html | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/flask_admin/templates/bootstrap4/admin/model/modals/details.html b/flask_admin/templates/bootstrap4/admin/model/modals/details.html index 3a684346c2..793b4d00e4 100755 --- a/flask_admin/templates/bootstrap4/admin/model/modals/details.html +++ b/flask_admin/templates/bootstrap4/admin/model/modals/details.html @@ -3,17 +3,17 @@ {% block body %}
- {% block header_text %}

{{ _gettext('View Record') + ' #' + request.args.get('id') }}

{% endblock %} +
{% block details_search %} -
- {{ _gettext('Filter') }} - +
+ +
{% endblock %} @@ -36,5 +36,5 @@

{{ _gettext('View Record') + ' #' + request.args.get('id') }}

{% block tail %} - + {% endblock %} From d7493a864fa486c71dbb386cccb71a66760207f6 Mon Sep 17 00:00:00 2001 From: Michael Bukachi Date: Sun, 30 Aug 2020 22:42:58 +0300 Subject: [PATCH 11/69] fix: Correct styling for 'Cancel' button --- .../static/vendor/bootstrap-daterangepicker/daterangepicker.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flask_admin/static/vendor/bootstrap-daterangepicker/daterangepicker.js b/flask_admin/static/vendor/bootstrap-daterangepicker/daterangepicker.js index 0d1155c772..c9179c1703 100644 --- a/flask_admin/static/vendor/bootstrap-daterangepicker/daterangepicker.js +++ b/flask_admin/static/vendor/bootstrap-daterangepicker/daterangepicker.js @@ -58,7 +58,7 @@ '' + '
' + ' ' + - '' + + '' + '
' + '' + ''; From 7287ed90dfc589bf8d47b89aaa4fb43c7318fcd6 Mon Sep 17 00:00:00 2001 From: Titanium Hocker Date: Mon, 31 Aug 2020 01:19:05 +0300 Subject: [PATCH 12/69] Fix bs4 edit modal --- flask_admin/templates/bootstrap4/admin/model/modals/edit.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flask_admin/templates/bootstrap4/admin/model/modals/edit.html b/flask_admin/templates/bootstrap4/admin/model/modals/edit.html index 7ce2c7d052..dd9e777a49 100644 --- a/flask_admin/templates/bootstrap4/admin/model/modals/edit.html +++ b/flask_admin/templates/bootstrap4/admin/model/modals/edit.html @@ -27,5 +27,5 @@
{{ _gettext('Edit Record') + ' #' + request.args.get('id {% endblock %} {% block tail %} - + {% endblock %} From 0604295c7c129a40c678ccb555a0d5c459f11c26 Mon Sep 17 00:00:00 2001 From: Michael Bukachi Date: Mon, 31 Aug 2020 03:17:45 +0300 Subject: [PATCH 13/69] refactor: replace 'btn-danger' with 'btn-secondary' --- .../static/vendor/bootstrap-daterangepicker/daterangepicker.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flask_admin/static/vendor/bootstrap-daterangepicker/daterangepicker.js b/flask_admin/static/vendor/bootstrap-daterangepicker/daterangepicker.js index c9179c1703..3268c0bae2 100644 --- a/flask_admin/static/vendor/bootstrap-daterangepicker/daterangepicker.js +++ b/flask_admin/static/vendor/bootstrap-daterangepicker/daterangepicker.js @@ -58,7 +58,7 @@ '' + '' + ' ' + - '' + + '' + '' + '' + ''; From 1c2a07eb51972eaf29132ca7b8b6bcff94b76bdc Mon Sep 17 00:00:00 2001 From: Ram Mehta Date: Mon, 31 Aug 2020 23:58:42 -0400 Subject: [PATCH 14/69] Replace bootstrap3 well class with bootstrap4 card See https://stackoverflow.com/a/38622102 --- .../templates/bootstrap4/admin/model/inline_list_base.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/flask_admin/templates/bootstrap4/admin/model/inline_list_base.html b/flask_admin/templates/bootstrap4/admin/model/inline_list_base.html index 73ac483498..3f84c14466 100644 --- a/flask_admin/templates/bootstrap4/admin/model/inline_list_base.html +++ b/flask_admin/templates/bootstrap4/admin/model/inline_list_base.html @@ -3,7 +3,7 @@ {# existing inline form fields #}
{% for subfield in field %} -
+
{%- if not check or check(subfield) %} @@ -28,7 +28,7 @@ {# template for new inline form fields #}
{% filter forceescape %} -
+
{{ _gettext('New') }} {{ field.label.text }}
From 2de714286e8245c11a41d6326c599de2f7a4d745 Mon Sep 17 00:00:00 2001 From: Jason Baker Date: Sun, 20 Sep 2020 12:53:57 -0500 Subject: [PATCH 15/69] Update tools.py Update import location for new SQLAlchemy version. --- flask_admin/contrib/sqla/tools.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flask_admin/contrib/sqla/tools.py b/flask_admin/contrib/sqla/tools.py index f866505d0c..05906bd6e4 100644 --- a/flask_admin/contrib/sqla/tools.py +++ b/flask_admin/contrib/sqla/tools.py @@ -1,7 +1,7 @@ import types from sqlalchemy import tuple_, or_, and_, inspect -from sqlalchemy.ext.declarative.clsregistry import _class_resolver +from sqlalchemy.orm.clsregistry import _class_resolver from sqlalchemy.ext.hybrid import hybrid_property from sqlalchemy.ext.associationproxy import ASSOCIATION_PROXY from sqlalchemy.sql.operators import eq From 5e03c02c9e1b930b420a0b8c59f4180d0fbba95e Mon Sep 17 00:00:00 2001 From: Jason Baker Date: Mon, 21 Sep 2020 20:43:47 -0500 Subject: [PATCH 16/69] Add try/except handler for graceful import handler Add try/except handler for handling imports from different SQLAlchemy project versions. --- flask_admin/contrib/sqla/tools.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/flask_admin/contrib/sqla/tools.py b/flask_admin/contrib/sqla/tools.py index 05906bd6e4..95ae61dd33 100644 --- a/flask_admin/contrib/sqla/tools.py +++ b/flask_admin/contrib/sqla/tools.py @@ -1,7 +1,12 @@ import types from sqlalchemy import tuple_, or_, and_, inspect -from sqlalchemy.orm.clsregistry import _class_resolver +try: + # Attempt _class_resolver import from SQLALchemy 1.4/2.0 module architecture. + from sqlalchemy.orm.clsregistry import _class_resolver +except ImportError: + # If 1.4/2.0 module import fails, fall back to <1.3.x architecture. + from sqlalchemy.ext.declarative.clsregistry import _class_resolver from sqlalchemy.ext.hybrid import hybrid_property from sqlalchemy.ext.associationproxy import ASSOCIATION_PROXY from sqlalchemy.sql.operators import eq From e46719042745ea28f41c944741b317f1f625b113 Mon Sep 17 00:00:00 2001 From: Michael Bukachi Date: Mon, 28 Sep 2020 22:08:56 +0300 Subject: [PATCH 17/69] fix: Fix bs4 popover --- flask_admin/static/admin/js/form.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/flask_admin/static/admin/js/form.js b/flask_admin/static/admin/js/form.js index a562cad9b2..51001c5888 100644 --- a/flask_admin/static/admin/js/form.js +++ b/flask_admin/static/admin/js/form.js @@ -465,8 +465,11 @@ }); return true; case 'x-editable-combodate': + let template = $el.data('template') + el.removeAttribute('data-template') $el.editable({ params: overrideXeditableParams, + template: template, combodate: { // prevent minutes from showing in 5 minute increments minuteStep: 1, From 076b4524e8b3e43284395c38c7e24bc50959c184 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Gmach?= Date: Wed, 7 Oct 2020 10:04:24 +0200 Subject: [PATCH 18/69] The `sudo` keyword is no longer supported --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 635a8543f0..febccf4a1f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,3 @@ -sudo: false language: python matrix: include: From 1638c41754acba60bfe387fe1a78bf86ed42ac6e Mon Sep 17 00:00:00 2001 From: Serge Koval Date: Sun, 25 Oct 2020 21:14:11 -0400 Subject: [PATCH 19/69] Dynamic sqlalchemy-utils version dependency --- requirements-dev.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/requirements-dev.txt b/requirements-dev.txt index c67c3c3fdf..3f4c872ca2 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -16,7 +16,8 @@ nose coveralls pylint sqlalchemy-citext -sqlalchemy_utils +sqlalchemy-utils<=0.36.6; python_version < "3.0" +sqlalchemy-utils>=0.36.6; python_version >= "3.0" azure-storage-blob arrow<0.14.0 colour From becc7834a3fc7e8e5d3bf9a99d7210be07be4da6 Mon Sep 17 00:00:00 2001 From: Serge Koval Date: Sun, 25 Oct 2020 21:54:10 -0400 Subject: [PATCH 20/69] WTForms 2.3.x test fixes --- flask_admin/tests/geoa/test_basic.py | 7 +++++-- flask_admin/tests/mongoengine/test_basic.py | 4 ++-- flask_admin/tests/sqla/test_basic.py | 6 ++++-- flask_admin/tests/sqla/test_postgres.py | 7 +++++-- 4 files changed, 16 insertions(+), 8 deletions(-) diff --git a/flask_admin/tests/geoa/test_basic.py b/flask_admin/tests/geoa/test_basic.py index 4595666afb..70ac5fbcba 100644 --- a/flask_admin/tests/geoa/test_basic.py +++ b/flask_admin/tests/geoa/test_basic.py @@ -98,7 +98,8 @@ def test_model(): rv = client.get(url) eq_(rv.status_code, 200) data = rv.data.decode('utf-8') - ok_(r' name="multi">{"type":"MultiPoint","coordinates":[[100,0],[101,1]]}' in data) + ok_(r'{"type":"MultiPoint","coordinates":[[100,0],[101,1]]}' in data or + r'{"type":"MultiPoint","coordinates":[[100,0],[101,1]]}' in data) # rv = client.post(url, data={ # "name": "edited", @@ -150,4 +151,6 @@ def test_none(): rv = client.get(url) eq_(rv.status_code, 200) data = rv.data.decode('utf-8') - ok_(r' name="point">' in data) + ok_(r' name="point">' in data or + ' name="point">\n' in data or + ' name="point">\r\n' in data) diff --git a/flask_admin/tests/mongoengine/test_basic.py b/flask_admin/tests/mongoengine/test_basic.py index d6af153c4d..d25cfc65a1 100644 --- a/flask_admin/tests/mongoengine/test_basic.py +++ b/flask_admin/tests/mongoengine/test_basic.py @@ -1055,8 +1055,8 @@ def test_ajax_fk(): 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) in form.model1()) ok_(u'value="%s"' % as_unicode(model.id) in form.model1()) # Check querying diff --git a/flask_admin/tests/sqla/test_basic.py b/flask_admin/tests/sqla/test_basic.py index c80e01eac8..fd72443bd2 100644 --- a/flask_admin/tests/sqla/test_basic.py +++ b/flask_admin/tests/sqla/test_basic.py @@ -2273,7 +2273,8 @@ def test_ajax_fk(): ok_(u'value=""' not in form.model1()) form.model1.data = model - ok_(u'data-json="[%s, "first"]"' % model.id in form.model1()) + ok_(u'data-json="[%s, "first"]"' % model.id in form.model1() or + u'data-json="[%s, "first"]"' % model.id in form.model1()) ok_(u'value="1"' in form.model1()) # Check querying @@ -2345,7 +2346,8 @@ class Model2(db.Model): ok_(u'data-json="[]"' in form.model1()) form.model1.data = [model] - ok_(u'data-json="[[1, "first"]]"' in form.model1()) + ok_(u'data-json="[[1, "first"]]"' in form.model1() or + u'data-json="[[1, "first"]]"' in form.model1()) # Check submitting client = app.test_client() diff --git a/flask_admin/tests/sqla/test_postgres.py b/flask_admin/tests/sqla/test_postgres.py index c8085bd043..edc45b9e9e 100644 --- a/flask_admin/tests/sqla/test_postgres.py +++ b/flask_admin/tests/sqla/test_postgres.py @@ -75,7 +75,8 @@ class JSONModel(db.Model): eq_(rv.status_code, 200) data = rv.data.decode('utf-8') ok_('json_test' in data) - ok_('>{"test_key1": "test_value1"}<' in data) + ok_('>{"test_key1": "test_value1"}<' in data or + '{"test_key1": "test_value1"}<' in data) def test_citext(): @@ -111,4 +112,6 @@ class CITextModel(db.Model): eq_(rv.status_code, 200) data = rv.data.decode('utf-8') ok_('name="citext_test"' in data) - ok_('>Foo<' in data) + ok_('>Foo\nFoo\r\nFoo Date: Sun, 25 Oct 2020 22:02:44 -0400 Subject: [PATCH 21/69] Version bump --- doc/changelog.rst | 7 +++++++ flask_admin/__init__.py | 2 +- flask_admin/tests/peeweemodel/test_basic.py | 4 ++-- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/doc/changelog.rst b/doc/changelog.rst index f27fc02935..163a82991f 100644 --- a/doc/changelog.rst +++ b/doc/changelog.rst @@ -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 ----- diff --git a/flask_admin/__init__.py b/flask_admin/__init__.py index 97e5259747..beba3ecec4 100644 --- a/flask_admin/__init__.py +++ b/flask_admin/__init__.py @@ -1,4 +1,4 @@ -__version__ = '1.5.6' +__version__ = '1.5.7' __author__ = 'Flask-Admin team' __email__ = 'serge.koval+github@gmail.com' diff --git a/flask_admin/tests/peeweemodel/test_basic.py b/flask_admin/tests/peeweemodel/test_basic.py index a7a80d03e0..d35148cd06 100644 --- a/flask_admin/tests/peeweemodel/test_basic.py +++ b/flask_admin/tests/peeweemodel/test_basic.py @@ -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 From ff122307c8f41f47aaf60d29c070398b386fd7f8 Mon Sep 17 00:00:00 2001 From: Raghuram Krishnaswami Date: Fri, 6 Nov 2020 16:09:38 +0530 Subject: [PATCH 22/69] Minor fix to docs --- doc/advanced.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/advanced.rst b/doc/advanced.rst index 83208f44e5..777f764d6b 100644 --- a/doc/advanced.rst +++ b/doc/advanced.rst @@ -432,8 +432,8 @@ This is minimal PyMongo view:: On top of that you can add sortable columns, filters, text search, etc. -For more, check the :class:`~flask_admin.contrib.pymongoe` API documentation. Or look at -the Peewee example at https://github.com/flask-admin/flask-admin/tree/master/examples/pymongo. +For more, check the :class:`~flask_admin.contrib.pymongo` API documentation. Or look at +the pymongo example at https://github.com/flask-admin/flask-admin/tree/master/examples/pymongo. Migrating From Django --------------------- From 78b27c492db12ab2ca208e34a342ee86e1a8a307 Mon Sep 17 00:00:00 2001 From: Bastian Kuhn Date: Tue, 10 Nov 2020 11:33:25 +0100 Subject: [PATCH 23/69] Set correct Fileheaders when Uploading to S3 This change add's the content Type Header to the save_file function before uploading to s3. This is needed for example when uploading svg files. --- flask_admin/contrib/fileadmin/s3.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/flask_admin/contrib/fileadmin/s3.py b/flask_admin/contrib/fileadmin/s3.py index aa33485ca2..3abc47c499 100644 --- a/flask_admin/contrib/fileadmin/s3.py +++ b/flask_admin/contrib/fileadmin/s3.py @@ -134,7 +134,10 @@ def send_file(self, file_path): def save_file(self, path, file_data): key = Key(self.bucket, path) - key.set_contents_from_file(file_data.stream) + headers = { + 'Content-Type' : file_data.content_type, + } + key.set_contents_from_file(file_data.stream, headers=headers) def delete_tree(self, directory): self._check_empty_directory(directory) From a70535b932a5695c40c1c880363bda705567c970 Mon Sep 17 00:00:00 2001 From: Maciej Fiedler <54156166+Maciejfiedler@users.noreply.github.com> Date: Wed, 25 Nov 2020 15:09:01 +0100 Subject: [PATCH 24/69] Removed lowering the whole command in the rediscli.py The lower() method sets the whole command to lowercase. This means that also the value of a Redis key gets set to lowercase. This can be fatal in some cases. --- flask_admin/contrib/rediscli.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flask_admin/contrib/rediscli.py b/flask_admin/contrib/rediscli.py index 912d59976f..05b77c7698 100644 --- a/flask_admin/contrib/rediscli.py +++ b/flask_admin/contrib/rediscli.py @@ -196,7 +196,7 @@ def execute_view(self): AJAX API. """ try: - cmd = request.form.get('cmd').lower() + cmd = request.form.get('cmd') if not cmd: return self._error('Cli: Empty command.') From 8638f8bc54912def6c4f9ee24178b849ec421a3a Mon Sep 17 00:00:00 2001 From: Grey Li Date: Sat, 19 Dec 2020 17:46:58 +0800 Subject: [PATCH 25/69] Pin mongoengine version to prevent syntax error on py35 --- requirements-dev.txt | 2 +- setup.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements-dev.txt b/requirements-dev.txt index 3f4c872ca2..ead752fad0 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -3,7 +3,7 @@ Flask>=0.7 Flask-SQLAlchemy>=0.15 peewee wtf-peewee -mongoengine +mongoengine<=0.21.0 pymongo flask-mongoengine==0.8.2 pillow>=3.3.2 diff --git a/setup.py b/setup.py index 582137e891..48599e063f 100644 --- a/setup.py +++ b/setup.py @@ -69,7 +69,7 @@ def grep(attrname): 'pymongo', 'wtf-peewee', 'sqlalchemy', - 'flask-mongoengine', + 'flask-mongoengine<=0.21.0', 'flask-sqlalchemy', 'flask-babelex', 'shapely', From 94dfa6143ab8cb9c7126c0d6e5b07f165bcc85b4 Mon Sep 17 00:00:00 2001 From: TakuyaOkada Date: Tue, 22 Dec 2020 13:49:57 +0900 Subject: [PATCH 26/69] Add add_category method to flask_admin.Admin --- flask_admin/base.py | 23 +++++++++++++++++++++++ flask_admin/tests/test_base.py | 27 +++++++++++++++++++++++++++ 2 files changed, 50 insertions(+) diff --git a/flask_admin/base.py b/flask_admin/base.py index e32e8d0883..e706c916e2 100644 --- a/flask_admin/base.py +++ b/flask_admin/base.py @@ -582,6 +582,29 @@ def add_views(self, *args): for view in args: self.add_view(view) + def add_category(self, name, class_name=None, icon_type=None, icon_value=None): + """ + Add a category of a given name + + :param name: + The name of the new menu category. + :param class_name: + The class name for the new menu category. + :param icon_type: + The icon name for the new menu category. + :param icon_value: + The icon value for the new menu category. + """ + cat_text = as_unicode(name) + + category = self.get_category_menu_item(name) + if category: + return + + category = MenuCategory(name, class_name=class_name, icon_type=icon_type, icon_value=icon_value) + self._menu_categories[cat_text] = category + self._menu.append(category) + def add_sub_category(self, name, parent_name): """ diff --git a/flask_admin/tests/test_base.py b/flask_admin/tests/test_base.py index ab6edbc37a..013b48ecc3 100644 --- a/flask_admin/tests/test_base.py +++ b/flask_admin/tests/test_base.py @@ -225,6 +225,33 @@ def test_add_views(): eq_(len(admin.menu()), 3) +def test_add_category(): + app = Flask(__name__) + admin = base.Admin(app) + + admin.add_category('Category1', 'class-name', 'icon-type', 'icon-value') + admin.add_view(MockView(name='Test 1', endpoint='test1', category='Category1')) + admin.add_view(MockView(name='Test 2', endpoint='test2', category='Category2')) + + eq_(len(admin.menu()), 3) + + # Test 1 should be underneath Category1 + eq_(admin.menu()[1].name, 'Category1') + eq_(admin.menu()[1].get_class_name(), 'class-name') + eq_(admin.menu()[1].get_icon_type(), 'icon-type') + eq_(admin.menu()[1].get_icon_value(), 'icon-value') + eq_(len(admin.menu()[1].get_children()), 1) + eq_(admin.menu()[1].get_children()[0].name, 'Test 1') + + # Test 2 should be underneath Category2 + eq_(admin.menu()[2].name, 'Category2') + eq_(admin.menu()[2].get_class_name(), None) + eq_(admin.menu()[2].get_icon_type(), None) + eq_(admin.menu()[2].get_icon_value(), None) + eq_(len(admin.menu()[2].get_children()), 1) + eq_(admin.menu()[2].get_children()[0].name, 'Test 2') + + @raises(Exception) def test_no_default(): app = Flask(__name__) From 62d35c92f9521427e6f87f23b87b73471fa397e7 Mon Sep 17 00:00:00 2001 From: Justin Vasel Date: Fri, 29 Jan 2021 16:58:00 -0500 Subject: [PATCH 27/69] Fix broken rendering when user specifies an endpoint other than 'admin' The endpoint 'admin' is hard-coded in the url() macros, causing Flask-Admin to fail when trying to resolve static files needed to render the page. This commit replaces the hard-coded value with the `admin_view.admin.endpoint` variable. --- flask_admin/templates/bootstrap2/admin/static.html | 2 +- flask_admin/templates/bootstrap3/admin/static.html | 2 +- flask_admin/templates/bootstrap4/admin/static.html | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/flask_admin/templates/bootstrap2/admin/static.html b/flask_admin/templates/bootstrap2/admin/static.html index 5735fbd405..de632ee144 100644 --- a/flask_admin/templates/bootstrap2/admin/static.html +++ b/flask_admin/templates/bootstrap2/admin/static.html @@ -1,3 +1,3 @@ {% macro url() -%} - {{ get_url('admin.static', *varargs, **kwargs) }} + {{ get_url('{admin_endpoint}.static'.format(admin_endpoint=admin_view.admin.endpoint), *varargs, **kwargs) }} {%- endmacro %} diff --git a/flask_admin/templates/bootstrap3/admin/static.html b/flask_admin/templates/bootstrap3/admin/static.html index 5735fbd405..de632ee144 100644 --- a/flask_admin/templates/bootstrap3/admin/static.html +++ b/flask_admin/templates/bootstrap3/admin/static.html @@ -1,3 +1,3 @@ {% macro url() -%} - {{ get_url('admin.static', *varargs, **kwargs) }} + {{ get_url('{admin_endpoint}.static'.format(admin_endpoint=admin_view.admin.endpoint), *varargs, **kwargs) }} {%- endmacro %} diff --git a/flask_admin/templates/bootstrap4/admin/static.html b/flask_admin/templates/bootstrap4/admin/static.html index 5735fbd405..de632ee144 100644 --- a/flask_admin/templates/bootstrap4/admin/static.html +++ b/flask_admin/templates/bootstrap4/admin/static.html @@ -1,3 +1,3 @@ {% macro url() -%} - {{ get_url('admin.static', *varargs, **kwargs) }} + {{ get_url('{admin_endpoint}.static'.format(admin_endpoint=admin_view.admin.endpoint), *varargs, **kwargs) }} {%- endmacro %} From 39bb6b1f64a56d3e501bc85eb840f27c43ed49db Mon Sep 17 00:00:00 2001 From: Mahantesh R <41316852+MahanteshR@users.noreply.github.com> Date: Tue, 9 Feb 2021 12:56:52 +0530 Subject: [PATCH 28/69] minor changes --- examples/auth-flask-login/app.py | 2 +- .../auth-flask-login/templates/admin/index.html | 6 +++--- examples/auth-flask-login/templates/my_master.html | 13 +++++++------ 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/examples/auth-flask-login/app.py b/examples/auth-flask-login/app.py index 1ef851ea6d..b29803841f 100644 --- a/examples/auth-flask-login/app.py +++ b/examples/auth-flask-login/app.py @@ -164,7 +164,7 @@ def index(): init_login() # Create admin -admin = admin.Admin(app, 'Example: Auth', index_view=MyAdminIndexView(), base_template='my_master.html') +admin = admin.Admin(app, 'Example: Auth', index_view=MyAdminIndexView(), base_template='my_master.html', template_mode='bootstrap4') # Add view admin.add_view(MyModelView(User, db.session)) diff --git a/examples/auth-flask-login/templates/admin/index.html b/examples/auth-flask-login/templates/admin/index.html index 8d2933222e..205ac0d8b8 100644 --- a/examples/auth-flask-login/templates/admin/index.html +++ b/examples/auth-flask-login/templates/admin/index.html @@ -16,8 +16,8 @@

Flask-Admin example

{{ form.hidden_tag() if form.hidden_tag }} {% for f in form if f.type != 'CSRFTokenField' %} -
- {{ f.label }} +
+ {{ f.label }}
{{ f }} {% if f.errors %}
    @@ -28,7 +28,7 @@

    Flask-Admin example

    {% endif %}
{% endfor %} - + {{ link | safe }} {% endif %} diff --git a/examples/auth-flask-login/templates/my_master.html b/examples/auth-flask-login/templates/my_master.html index 9b0ca79e1e..fa4222ddbf 100644 --- a/examples/auth-flask-login/templates/my_master.html +++ b/examples/auth-flask-login/templates/my_master.html @@ -2,13 +2,14 @@ {% block access_control %} {% if current_user.is_authenticated %} -
- +
+ - + + +
+ Log out +
{% endif %} {% endblock %} From 41b84b99e4c418331be35a11be239fd0120beb07 Mon Sep 17 00:00:00 2001 From: Mahantesh R <41316852+MahanteshR@users.noreply.github.com> Date: Sat, 6 Mar 2021 22:48:31 +0530 Subject: [PATCH 29/69] removed whitespace --- flask_admin/contrib/fileadmin/s3.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flask_admin/contrib/fileadmin/s3.py b/flask_admin/contrib/fileadmin/s3.py index 3abc47c499..1c9bdc7193 100644 --- a/flask_admin/contrib/fileadmin/s3.py +++ b/flask_admin/contrib/fileadmin/s3.py @@ -135,7 +135,7 @@ def send_file(self, file_path): def save_file(self, path, file_data): key = Key(self.bucket, path) headers = { - 'Content-Type' : file_data.content_type, + 'Content-Type': file_data.content_type, } key.set_contents_from_file(file_data.stream, headers=headers) From 8bd06d4954f4a197671a6b31096b2ab857df3715 Mon Sep 17 00:00:00 2001 From: Mahantesh R <41316852+MahanteshR@users.noreply.github.com> Date: Sat, 6 Mar 2021 23:38:48 +0530 Subject: [PATCH 30/69] checks --- .vscode/settings.json | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .vscode/settings.json diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 0000000000..4ad59f390c --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,5 @@ +{ + "restructuredtext.preview.sphinx.disabled": true, + "restructuredtext.linter.disabled": true, + "restructuredtext.confPath": "" +} \ No newline at end of file From f4a1a7b39c457ac38281b242074bb3ab299559cc Mon Sep 17 00:00:00 2001 From: Mahantesh R <41316852+MahanteshR@users.noreply.github.com> Date: Sun, 7 Mar 2021 00:00:26 +0530 Subject: [PATCH 31/69] Delete settings.json --- .vscode/settings.json | 5 ----- 1 file changed, 5 deletions(-) delete mode 100644 .vscode/settings.json diff --git a/.vscode/settings.json b/.vscode/settings.json deleted file mode 100644 index 4ad59f390c..0000000000 --- a/.vscode/settings.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "restructuredtext.preview.sphinx.disabled": true, - "restructuredtext.linter.disabled": true, - "restructuredtext.confPath": "" -} \ No newline at end of file From 5dfc30e48ae43ba7b29fea0eca59bb85bd9fffaa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ondr=CC=8Cej=20Zahradni=CC=81k?= Date: Sun, 7 Mar 2021 16:32:31 +0100 Subject: [PATCH 32/69] adding missing dependency on email_validator package --- examples/auth/requirements.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/examples/auth/requirements.txt b/examples/auth/requirements.txt index aab3814fdc..1ca0b38e6c 100644 --- a/examples/auth/requirements.txt +++ b/examples/auth/requirements.txt @@ -2,3 +2,4 @@ Flask Flask-Admin Flask-SQLAlchemy Flask-Security>=1.7.5 +email_validator From f099202fdd0bbb1c28fd12d3f7de77a61a8d932d Mon Sep 17 00:00:00 2001 From: Alexey Vasilyev Date: Fri, 19 Mar 2021 11:43:06 +0100 Subject: [PATCH 33/69] fix hybrid properties on nested models for sqlalchemy14 --- flask_admin/contrib/sqla/tools.py | 4 ++- flask_admin/tests/sqla/test_basic.py | 51 ++++++++++++++++++++++++++++ 2 files changed, 54 insertions(+), 1 deletion(-) diff --git a/flask_admin/contrib/sqla/tools.py b/flask_admin/contrib/sqla/tools.py index 95ae61dd33..28390d479d 100644 --- a/flask_admin/contrib/sqla/tools.py +++ b/flask_admin/contrib/sqla/tools.py @@ -206,7 +206,9 @@ def is_hybrid_property(model, attr_name): if is_association_proxy(attr): attr = attr.remote_attr last_model = attr.property.argument - if isinstance(last_model, _class_resolver): + if isinstance(last_model, string_types): + last_model = attr.property._clsregistry_resolve_name(last_model)() + elif isinstance(last_model, _class_resolver): last_model = model._decl_class_registry[last_model.arg] elif isinstance(last_model, (types.FunctionType, types.MethodType)): last_model = last_model() diff --git a/flask_admin/tests/sqla/test_basic.py b/flask_admin/tests/sqla/test_basic.py index fd72443bd2..69a38cd806 100644 --- a/flask_admin/tests/sqla/test_basic.py +++ b/flask_admin/tests/sqla/test_basic.py @@ -1611,6 +1611,11 @@ def number_of_pixels_str(cls): db.create_all() + ok_(tools.is_hybrid_property(Model1, 'number_of_pixels')) + ok_(tools.is_hybrid_property(Model1, 'number_of_pixels_str')) + ok_(not tools.is_hybrid_property(Model1, 'height')) + ok_(not tools.is_hybrid_property(Model1, 'width')) + db.session.add(Model1(id=1, name="test_row_1", width=25, height=25)) db.session.add(Model1(id=2, name="test_row_2", width=10, height=10)) db.session.commit() @@ -1651,6 +1656,52 @@ def number_of_pixels_str(cls): ok_('test_row_1' not in data) +def test_hybrid_property_nested(): + app, db, admin = setup() + + class Model1(db.Model): + id = db.Column(db.Integer, primary_key=True) + firstname = db.Column(db.String) + lastname = db.Column(db.String) + + @hybrid_property + def fullname(self): + return f'{self.firstname} {self.lastname}' + + class Model2(db.Model): + id = db.Column(db.Integer, primary_key=True) + name = db.Column(db.String) + owner_id = db.Column(db.Integer, db.ForeignKey('model1.id', ondelete='CASCADE')) + owner = db.relationship('Model1', backref=db.backref("tiles"), uselist=False) + + db.create_all() + + ok_(tools.is_hybrid_property(Model2, 'owner.fullname')) + ok_(not tools.is_hybrid_property(Model2, 'owner.firstname')) + + db.session.add(Model1(id=1, firstname="John", lastname="Dow")) + db.session.add(Model1(id=2, firstname="Jim", lastname="Smith")) + db.session.add(Model2(id=1, name="pencil", owner_id=1)) + db.session.add(Model2(id=2, name="key", owner_id=1)) + db.session.add(Model2(id=3, name="map", owner_id=2)) + db.session.commit() + + client = app.test_client() + + view = CustomModelView( + Model2, db.session, + column_list=('id', 'name', 'owner.fullname'), + column_default_sort='id', + ) + admin.add_view(view) + + rv = client.get('/admin/model2/') + eq_(rv.status_code, 200) + data = rv.data.decode('utf-8') + ok_('John Dow' in data) + ok_('Jim Smith' in data) + + def test_url_args(): app, db, admin = setup() From 0a2689524ada050e2e4c46d961f651bbfa0e2558 Mon Sep 17 00:00:00 2001 From: Alexey Vasilyev Date: Fri, 19 Mar 2021 11:50:30 +0100 Subject: [PATCH 34/69] fix test_advanced_joins unit-test --- flask_admin/tests/sqla/test_basic.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/flask_admin/tests/sqla/test_basic.py b/flask_admin/tests/sqla/test_basic.py index 69a38cd806..0e9a918522 100644 --- a/flask_admin/tests/sqla/test_basic.py +++ b/flask_admin/tests/sqla/test_basic.py @@ -2535,8 +2535,10 @@ class Model3(db.Model): q2, joins, alias = view2._apply_path_joins(query, joins, path) eq_(len(joins), 2) - for p in q2._join_entities: - ok_(p in q1._join_entities) + + if hasattr(q2, '_join_entities'): + for p in q2._join_entities: + ok_(p in q1._join_entities) ok_(alias is not None) From 6e7460ca5595ee9da4e142dfd5849b4db2d96f95 Mon Sep 17 00:00:00 2001 From: kanhebei <59640496+kanhebei@users.noreply.github.com> Date: Wed, 7 Apr 2021 21:08:50 +0800 Subject: [PATCH 35/69] Update list.html MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 修复faForm丢失的错误 --- flask_admin/templates/bootstrap4/admin/model/list.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/flask_admin/templates/bootstrap4/admin/model/list.html b/flask_admin/templates/bootstrap4/admin/model/list.html index b5d9dedbfa..d65362ec03 100755 --- a/flask_admin/templates/bootstrap4/admin/model/list.html +++ b/flask_admin/templates/bootstrap4/admin/model/list.html @@ -185,10 +185,10 @@ {% endif %} - + {{ lib.form_js() }} - {{ lib.form_js() }} + {{ actionlib.script(_gettext('Please select at least one record.'), actions, From 57fe9057a4c67c111134ebdc097c2cc886d1d5d7 Mon Sep 17 00:00:00 2001 From: kanhebei <59640496+kanhebei@users.noreply.github.com> Date: Mon, 12 Apr 2021 16:10:33 +0800 Subject: [PATCH 36/69] Update list.html Fix the missing CSRF error in bootstrap 4 line editing --- flask_admin/templates/bootstrap4/admin/model/list.html | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/flask_admin/templates/bootstrap4/admin/model/list.html b/flask_admin/templates/bootstrap4/admin/model/list.html index d65362ec03..b58a7e2249 100755 --- a/flask_admin/templates/bootstrap4/admin/model/list.html +++ b/flask_admin/templates/bootstrap4/admin/model/list.html @@ -137,6 +137,8 @@ {% set form = list_forms[get_pk_value(row)] %} {% if form.csrf_token %} {{ form[c](pk=get_pk_value(row), display_value=get_value(row, c), csrf=form.csrf_token._value()) }} + {% elif csrf_token %} + {{ form[c](pk=get_pk_value(row), display_value=get_value(row, c), csrf=csrf_token()) }} {% else %} {{ form[c](pk=get_pk_value(row), display_value=get_value(row, c)) }} {% endif %} @@ -185,7 +187,7 @@ {% endif %} - {{ lib.form_js() }} + {{ lib.form_js() }} From 0d4e65b83dca8419f4336a22394998b7d31d001e Mon Sep 17 00:00:00 2001 From: Julien Garcia Date: Tue, 13 Apr 2021 21:58:42 +0200 Subject: [PATCH 37/69] Update bs4_filters.js Adding event listener on bs4_filters.js to catch adminForm creation --- flask_admin/static/admin/js/bs4_filters.js | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/flask_admin/static/admin/js/bs4_filters.js b/flask_admin/static/admin/js/bs4_filters.js index 5d0543d17c..c636d4c5fb 100644 --- a/flask_admin/static/admin/js/bs4_filters.js +++ b/flask_admin/static/admin/js/bs4_filters.js @@ -185,11 +185,13 @@ var AdminFilters = function(element, filtersElement, filterGroups, activeFilters html: true, placement: 'bottom' }); - if ($('#filter-groups-data').length == 1) { - var filter = new AdminFilters( - '#filter_form', '.field-filters', - JSON.parse($('#filter-groups-data').text()), - JSON.parse($('#active-filters-data').text()) - ); - } + $(document).on('adminFormReady', function(evt){ + if ($('#filter-groups-data').length == 1) { + var filter = new AdminFilters( + '#filter_form', '.field-filters', + JSON.parse($('#filter-groups-data').text()), + JSON.parse($('#active-filters-data').text()) + ); + } + }) })(jQuery); From 903b3d30284d686d1d66a46d8d4fb77e55af87be Mon Sep 17 00:00:00 2001 From: Julien Garcia Date: Tue, 13 Apr 2021 22:00:22 +0200 Subject: [PATCH 38/69] Update form.js Trigger event to inform bs4_filter that adminFrom is ready --- flask_admin/static/admin/js/form.js | 1 + 1 file changed, 1 insertion(+) diff --git a/flask_admin/static/admin/js/form.js b/flask_admin/static/admin/js/form.js index 51001c5888..c0053c0801 100644 --- a/flask_admin/static/admin/js/form.js +++ b/flask_admin/static/admin/js/form.js @@ -632,6 +632,7 @@ // Expose faForm globally var faForm = window.faForm = new AdminForm(); + $(document).trigger('adminFormReady') // Apply global styles for current page after page loaded $(function() { From c8877df933ed4842e4bb8f2c8e9301c5507a42b4 Mon Sep 17 00:00:00 2001 From: Serge Koval Date: Sat, 17 Apr 2021 08:22:27 -0400 Subject: [PATCH 39/69] Version bump --- doc/changelog.rst | 6 ++++++ flask_admin/__init__.py | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/doc/changelog.rst b/doc/changelog.rst index 163a82991f..09de4d03d4 100644 --- a/doc/changelog.rst +++ b/doc/changelog.rst @@ -1,6 +1,12 @@ Changelog ========= +1.5.8 +----- + +* SQLAlchemy 1.4.5+ compatibility fixes +* Redis CLI fixes + 1.5.7 ----- diff --git a/flask_admin/__init__.py b/flask_admin/__init__.py index beba3ecec4..710b39ecbf 100644 --- a/flask_admin/__init__.py +++ b/flask_admin/__init__.py @@ -1,4 +1,4 @@ -__version__ = '1.5.7' +__version__ = '1.5.8' __author__ = 'Flask-Admin team' __email__ = 'serge.koval+github@gmail.com' From 1fa727d31bb6a6e6b1d314b98d7a41e3057a2da3 Mon Sep 17 00:00:00 2001 From: a-was Date: Fri, 14 May 2021 12:48:13 +0200 Subject: [PATCH 40/69] Add importing pass_context --- flask_admin/_compat.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/flask_admin/_compat.py b/flask_admin/_compat.py index 7cf9ce88d2..610d293016 100644 --- a/flask_admin/_compat.py +++ b/flask_admin/_compat.py @@ -90,3 +90,8 @@ def __new__(cls, name, this_bases, d): from collections import OrderedDict except ImportError: from ordereddict import OrderedDict + +try: + from jinja2 import pass_context +except ImportError: + from jinja2 import contextfunction as pass_context From 89a7eaa022e89217a59c21f03cbb843f4822d4d0 Mon Sep 17 00:00:00 2001 From: a-was Date: Fri, 14 May 2021 12:51:07 +0200 Subject: [PATCH 41/69] Change contextfunction to pass_compat Import pass_context from _compat.py instead of contextfunction direct from jinja2 package --- flask_admin/helpers.py | 5 ++--- flask_admin/model/base.py | 7 +++---- flask_admin/model/template.py | 6 ++---- 3 files changed, 7 insertions(+), 11 deletions(-) diff --git a/flask_admin/helpers.py b/flask_admin/helpers.py index 964b5df818..da6033715d 100644 --- a/flask_admin/helpers.py +++ b/flask_admin/helpers.py @@ -1,9 +1,8 @@ from re import sub, compile -from jinja2 import contextfunction from flask import g, request, url_for, flash from wtforms.validators import DataRequired, InputRequired -from flask_admin._compat import urljoin, urlparse, iteritems +from flask_admin._compat import iteritems, pass_context, urljoin, urlparse from ._compat import string_types @@ -109,7 +108,7 @@ def flash_errors(form, message): flash(gettext(message, error=str(errors)), 'error') -@contextfunction +@pass_context def resolve_ctx(context): """ Resolve current Jinja2 context and store it for general consumption. diff --git a/flask_admin/model/base.py b/flask_admin/model/base.py index 51504fd673..65cde80daa 100755 --- a/flask_admin/model/base.py +++ b/flask_admin/model/base.py @@ -9,7 +9,6 @@ from flask import (current_app, request, redirect, flash, abort, json, Response, get_flashed_messages, stream_with_context) -from jinja2 import contextfunction try: import tablib except ImportError: @@ -29,7 +28,7 @@ from flask_admin.tools import rec_getattr from flask_admin._backwards import ObsoleteAttr from flask_admin._compat import (iteritems, itervalues, OrderedDict, - as_unicode, csv_encode, text_type) + as_unicode, csv_encode, text_type, pass_context) from .helpers import prettify_name, get_mdict_item_or_list from .ajax import AjaxModelLoader @@ -1851,7 +1850,7 @@ def _get_list_value(self, context, model, name, column_formatters, return value - @contextfunction + @pass_context def get_list_value(self, context, model, name): """ Returns the value to be displayed in the list view @@ -1871,7 +1870,7 @@ def get_list_value(self, context, model, name): self.column_type_formatters, ) - @contextfunction + @pass_context def get_detail_value(self, context, model, name): """ Returns the value to be displayed in the detail view diff --git a/flask_admin/model/template.py b/flask_admin/model/template.py index cd6cd98086..495e4199a4 100644 --- a/flask_admin/model/template.py +++ b/flask_admin/model/template.py @@ -1,6 +1,4 @@ -from jinja2 import contextfunction - -from flask_admin._compat import string_types, reduce +from flask_admin._compat import pass_context, string_types, reduce from flask_admin.babel import gettext @@ -11,7 +9,7 @@ def __init__(self, title=None): def render(self, context, row_id, row): raise NotImplementedError() - @contextfunction + @pass_context def render_ctx(self, context, row_id, row): return self.render(context, row_id, row) From 83b8d0e22fb92fac6619718db671de4dcd30eb36 Mon Sep 17 00:00:00 2001 From: a-was Date: Sat, 15 May 2021 10:17:05 +0200 Subject: [PATCH 42/69] Change Markup import --- flask_admin/contrib/geoa/typefmt.py | 2 +- flask_admin/contrib/mongoengine/typefmt.py | 3 ++- flask_admin/contrib/rediscli.py | 2 +- flask_admin/form/rules.py | 2 +- flask_admin/model/typefmt.py | 2 +- 5 files changed, 6 insertions(+), 5 deletions(-) diff --git a/flask_admin/contrib/geoa/typefmt.py b/flask_admin/contrib/geoa/typefmt.py index e304072692..4e19022474 100644 --- a/flask_admin/contrib/geoa/typefmt.py +++ b/flask_admin/contrib/geoa/typefmt.py @@ -1,5 +1,5 @@ from flask_admin.contrib.sqla.typefmt import DEFAULT_FORMATTERS as BASE_FORMATTERS -from jinja2 import Markup +from markupsafe import Markup from wtforms.widgets import html_params from geoalchemy2.shape import to_shape from geoalchemy2.elements import WKBElement diff --git a/flask_admin/contrib/mongoengine/typefmt.py b/flask_admin/contrib/mongoengine/typefmt.py index b4533025e0..2e541e8c19 100644 --- a/flask_admin/contrib/mongoengine/typefmt.py +++ b/flask_admin/contrib/mongoengine/typefmt.py @@ -1,4 +1,5 @@ -from jinja2 import Markup, escape +from jinja2 import escape +from markupsafe import Markup from mongoengine.base import BaseList from mongoengine.fields import GridFSProxy, ImageGridFsProxy diff --git a/flask_admin/contrib/rediscli.py b/flask_admin/contrib/rediscli.py index 05b77c7698..735bdd3889 100644 --- a/flask_admin/contrib/rediscli.py +++ b/flask_admin/contrib/rediscli.py @@ -4,7 +4,7 @@ from flask import request -from jinja2 import Markup +from markupsafe import Markup from flask_admin.base import BaseView, expose from flask_admin.babel import gettext diff --git a/flask_admin/form/rules.py b/flask_admin/form/rules.py index 24614edea1..4651a66323 100644 --- a/flask_admin/form/rules.py +++ b/flask_admin/form/rules.py @@ -1,4 +1,4 @@ -from jinja2 import Markup +from markupsafe import Markup from flask_admin._compat import string_types from flask_admin import helpers diff --git a/flask_admin/model/typefmt.py b/flask_admin/model/typefmt.py index aeaa288230..c941749d85 100755 --- a/flask_admin/model/typefmt.py +++ b/flask_admin/model/typefmt.py @@ -1,6 +1,6 @@ import json -from jinja2 import Markup +from markupsafe import Markup from flask_admin._compat import text_type try: from enum import Enum From b5f894d95aff30d09d7981cec0efdd02c609fd27 Mon Sep 17 00:00:00 2001 From: a-was Date: Sat, 15 May 2021 10:17:43 +0200 Subject: [PATCH 43/69] Change escape import --- flask_admin/contrib/mongoengine/typefmt.py | 3 +-- flask_admin/contrib/mongoengine/widgets.py | 2 +- flask_admin/model/widgets.py | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/flask_admin/contrib/mongoengine/typefmt.py b/flask_admin/contrib/mongoengine/typefmt.py index 2e541e8c19..840526de37 100644 --- a/flask_admin/contrib/mongoengine/typefmt.py +++ b/flask_admin/contrib/mongoengine/typefmt.py @@ -1,5 +1,4 @@ -from jinja2 import escape -from markupsafe import Markup +from markupsafe import Markup, escape from mongoengine.base import BaseList from mongoengine.fields import GridFSProxy, ImageGridFsProxy diff --git a/flask_admin/contrib/mongoengine/widgets.py b/flask_admin/contrib/mongoengine/widgets.py index 4177ceea89..55a503c817 100644 --- a/flask_admin/contrib/mongoengine/widgets.py +++ b/flask_admin/contrib/mongoengine/widgets.py @@ -1,6 +1,6 @@ from wtforms.widgets import html_params -from jinja2 import escape +from markupsafe import escape from mongoengine.fields import GridFSProxy, ImageGridFsProxy diff --git a/flask_admin/model/widgets.py b/flask_admin/model/widgets.py index 18b5e1de18..075092d36c 100644 --- a/flask_admin/model/widgets.py +++ b/flask_admin/model/widgets.py @@ -1,5 +1,5 @@ from flask import json -from jinja2 import escape +from markupsafe import escape from wtforms.widgets import html_params from flask_admin._backwards import Markup From b4ebb11c0cda5f59b0b256264641984bea42f03d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C4=9Bj=20Cepl?= Date: Tue, 1 Jun 2021 09:43:46 +0200 Subject: [PATCH 44/69] Remove dependency on nose (port to pytest) I am a maintainer of Python packages in openSUSE, and I am on my crusade of eliminating nose1 from our distribution. When I look at its repository on https://github.com/nose-devs/nose, the last release 1.3.7 was on 2 Jun 2015, and even the last commit on the master branch was on 4 Mar 2016. --- README.rst | 4 +- flask_admin/tests/fileadmin/test_fileadmin.py | 106 +- .../tests/fileadmin/test_fileadmin_azure.py | 2 +- flask_admin/tests/geoa/test_basic.py | 93 +- flask_admin/tests/mongoengine/__init__.py | 2 +- flask_admin/tests/mongoengine/test_basic.py | 551 ++++---- flask_admin/tests/peeweemodel/test_basic.py | 622 +++++---- flask_admin/tests/pymongo/test_basic.py | 44 +- flask_admin/tests/sqla/test_basic.py | 1170 ++++++++--------- flask_admin/tests/sqla/test_form_rules.py | 46 +- flask_admin/tests/sqla/test_inlineform.py | 78 +- flask_admin/tests/sqla/test_multi_pk.py | 56 +- flask_admin/tests/sqla/test_postgres.py | 56 +- flask_admin/tests/sqla/test_translation.py | 5 +- flask_admin/tests/test_base.py | 186 +-- flask_admin/tests/test_form_upload.py | 103 +- flask_admin/tests/test_model.py | 316 +++-- flask_admin/tests/test_tools.py | 16 +- setup.cfg | 6 - setup.py | 4 +- 20 files changed, 1702 insertions(+), 1764 deletions(-) diff --git a/README.rst b/README.rst index 801e53f136..7f3e3c8a8b 100644 --- a/README.rst +++ b/README.rst @@ -88,12 +88,12 @@ Or alternatively, you can download the repository and install manually by doing: Tests ----- -Test are run with *nose*. If you are not familiar with this package you can get some more info from `their website `_. +Test are run with *pytest*. If you are not familiar with this package you can get some more info from `their website `_. To run the tests, from the project directory, simply:: pip install -r requirements-dev.txt - nosetests + pytest You should see output similar to:: diff --git a/flask_admin/tests/fileadmin/test_fileadmin.py b/flask_admin/tests/fileadmin/test_fileadmin.py index 2e27c33db5..8442d8cbcb 100644 --- a/flask_admin/tests/fileadmin/test_fileadmin.py +++ b/flask_admin/tests/fileadmin/test_fileadmin.py @@ -2,8 +2,6 @@ import os.path as op import unittest -from nose.tools import eq_, ok_ - from flask_admin.contrib import fileadmin from flask_admin import Admin from flask import Flask @@ -45,98 +43,98 @@ class MyFileAdmin(fileadmin_class): # index rv = client.get('/admin/myfileadmin/') - eq_(rv.status_code, 200) - ok_('path=dummy.txt' in rv.data.decode('utf-8')) + assert rv.status_code == 200 + assert 'path=dummy.txt' in rv.data.decode('utf-8') # edit rv = client.get('/admin/myfileadmin/edit/?path=dummy.txt') - eq_(rv.status_code, 200) - ok_('dummy.txt' in rv.data.decode('utf-8')) + assert rv.status_code == 200 + assert 'dummy.txt' in rv.data.decode('utf-8') rv = client.post('/admin/myfileadmin/edit/?path=dummy.txt', data=dict(content='new_string')) - eq_(rv.status_code, 302) + assert rv.status_code == 302 rv = client.get('/admin/myfileadmin/edit/?path=dummy.txt') - eq_(rv.status_code, 200) - ok_('dummy.txt' in rv.data.decode('utf-8')) - ok_('new_string' in rv.data.decode('utf-8')) + assert rv.status_code == 200 + assert 'dummy.txt' in rv.data.decode('utf-8') + assert 'new_string' in rv.data.decode('utf-8') # rename rv = client.get('/admin/myfileadmin/rename/?path=dummy.txt') - eq_(rv.status_code, 200) - ok_('dummy.txt' in rv.data.decode('utf-8')) + assert rv.status_code == 200 + assert 'dummy.txt' in rv.data.decode('utf-8') rv = client.post('/admin/myfileadmin/rename/?path=dummy.txt', data=dict(name='dummy_renamed.txt', path='dummy.txt')) - eq_(rv.status_code, 302) + assert rv.status_code == 302 rv = client.get('/admin/myfileadmin/') - eq_(rv.status_code, 200) - ok_('path=dummy_renamed.txt' in rv.data.decode('utf-8')) - ok_('path=dummy.txt' not in rv.data.decode('utf-8')) + assert rv.status_code == 200 + assert 'path=dummy_renamed.txt' in rv.data.decode('utf-8') + assert 'path=dummy.txt' not in rv.data.decode('utf-8') # upload rv = client.get('/admin/myfileadmin/upload/') - eq_(rv.status_code, 200) + assert rv.status_code == 200 rv = client.post('/admin/myfileadmin/upload/', data=dict(upload=(StringIO(""), 'dummy.txt'))) - eq_(rv.status_code, 302) + assert rv.status_code == 302 rv = client.get('/admin/myfileadmin/') - eq_(rv.status_code, 200) - ok_('path=dummy.txt' in rv.data.decode('utf-8')) - ok_('path=dummy_renamed.txt' in rv.data.decode('utf-8')) + assert rv.status_code == 200 + assert 'path=dummy.txt' in rv.data.decode('utf-8') + assert 'path=dummy_renamed.txt' in rv.data.decode('utf-8') # delete rv = client.post('/admin/myfileadmin/delete/', data=dict(path='dummy_renamed.txt')) - eq_(rv.status_code, 302) + assert rv.status_code == 302 rv = client.get('/admin/myfileadmin/') - eq_(rv.status_code, 200) - ok_('path=dummy_renamed.txt' not in rv.data.decode('utf-8')) - ok_('path=dummy.txt' in rv.data.decode('utf-8')) + assert rv.status_code == 200 + assert 'path=dummy_renamed.txt' not in rv.data.decode('utf-8') + assert 'path=dummy.txt' in rv.data.decode('utf-8') # mkdir rv = client.get('/admin/myfileadmin/mkdir/') - eq_(rv.status_code, 200) + assert rv.status_code == 200 rv = client.post('/admin/myfileadmin/mkdir/', data=dict(name='dummy_dir')) - eq_(rv.status_code, 302) + assert rv.status_code == 302 rv = client.get('/admin/myfileadmin/') - eq_(rv.status_code, 200) - ok_('path=dummy.txt' in rv.data.decode('utf-8')) - ok_('path=dummy_dir' in rv.data.decode('utf-8')) + assert rv.status_code == 200 + assert 'path=dummy.txt' in rv.data.decode('utf-8') + assert 'path=dummy_dir' in rv.data.decode('utf-8') # rename - directory rv = client.get('/admin/myfileadmin/rename/?path=dummy_dir') - eq_(rv.status_code, 200) - ok_('dummy_dir' in rv.data.decode('utf-8')) + assert rv.status_code == 200 + assert 'dummy_dir' in rv.data.decode('utf-8') rv = client.post('/admin/myfileadmin/rename/?path=dummy_dir', data=dict(name='dummy_renamed_dir', path='dummy_dir')) - eq_(rv.status_code, 302) + assert rv.status_code == 302 rv = client.get('/admin/myfileadmin/') - eq_(rv.status_code, 200) - ok_('path=dummy_renamed_dir' in rv.data.decode('utf-8')) - ok_('path=dummy_dir' not in rv.data.decode('utf-8')) + assert rv.status_code == 200 + assert 'path=dummy_renamed_dir' in rv.data.decode('utf-8') + assert 'path=dummy_dir' not in rv.data.decode('utf-8') # delete - directory rv = client.post('/admin/myfileadmin/delete/', data=dict(path='dummy_renamed_dir')) - eq_(rv.status_code, 302) + assert rv.status_code == 302 rv = client.get('/admin/myfileadmin/') - eq_(rv.status_code, 200) - ok_('path=dummy_renamed_dir' not in rv.data.decode('utf-8')) - ok_('path=dummy.txt' in rv.data.decode('utf-8')) + assert rv.status_code == 200 + assert 'path=dummy_renamed_dir' not in rv.data.decode('utf-8') + assert 'path=dummy.txt' in rv.data.decode('utf-8') def test_modal_edit(self): # bootstrap 2 - test edit_modal @@ -170,15 +168,15 @@ class EditModalOff(fileadmin_class): # bootstrap 2 - ensure modal window is added when edit_modal is # enabled rv = client_bs2.get('/admin/edit_modal_on/') - eq_(rv.status_code, 200) + assert rv.status_code == 200 data = rv.data.decode('utf-8') - ok_('fa_modal_window' in data) + assert 'fa_modal_window' in data # bootstrap 2 - test edit modal disabled rv = client_bs2.get('/admin/edit_modal_off/') - eq_(rv.status_code, 200) + assert rv.status_code == 200 data = rv.data.decode('utf-8') - ok_('fa_modal_window' not in data) + assert 'fa_modal_window' not in data # bootstrap 3 app_bs3 = Flask(__name__) @@ -192,15 +190,15 @@ class EditModalOff(fileadmin_class): # bootstrap 3 - ensure modal window is added when edit_modal is # enabled rv = client_bs3.get('/admin/edit_modal_on/') - eq_(rv.status_code, 200) + assert rv.status_code == 200 data = rv.data.decode('utf-8') - ok_('fa_modal_window' in data) + assert 'fa_modal_window' in data # bootstrap 3 - test modal disabled rv = client_bs3.get('/admin/edit_modal_off/') - eq_(rv.status_code, 200) + assert rv.status_code == 200 data = rv.data.decode('utf-8') - ok_('fa_modal_window' not in data) + assert 'fa_modal_window' not in data class LocalFileAdminTests(Base.FileAdminTests): @@ -230,14 +228,14 @@ class MyFileAdmin(fileadmin_class): fp.write('test') rv = client.get('/admin/myfileadmin/?sort=bogus') - eq_(rv.status_code, 200) - ok_(rv.data.decode('utf-8').find('path=dummy2.txt') < - rv.data.decode('utf-8').find('path=dummy.txt')) + assert rv.status_code == 200 + assert rv.data.decode('utf-8').find('path=dummy2.txt') < \ + rv.data.decode('utf-8').find('path=dummy.txt') rv = client.get('/admin/myfileadmin/?sort=name') - eq_(rv.status_code, 200) - ok_(rv.data.decode('utf-8').find('path=dummy.txt') < - rv.data.decode('utf-8').find('path=dummy2.txt')) + assert rv.status_code == 200 + assert rv.data.decode('utf-8').find('path=dummy.txt') < \ + rv.data.decode('utf-8').find('path=dummy2.txt') try: # clean up os.remove(op.join(self._test_files_root, 'dummy2.txt')) diff --git a/flask_admin/tests/fileadmin/test_fileadmin_azure.py b/flask_admin/tests/fileadmin/test_fileadmin_azure.py index 8fa87d3795..31a5be0662 100644 --- a/flask_admin/tests/fileadmin/test_fileadmin_azure.py +++ b/flask_admin/tests/fileadmin/test_fileadmin_azure.py @@ -2,7 +2,7 @@ from os import getenv from uuid import uuid4 -from nose import SkipTest +from unittest import SkipTest from flask_admin.contrib.fileadmin import azure diff --git a/flask_admin/tests/geoa/test_basic.py b/flask_admin/tests/geoa/test_basic.py index 70ac5fbcba..3243cc7c80 100644 --- a/flask_admin/tests/geoa/test_basic.py +++ b/flask_admin/tests/geoa/test_basic.py @@ -6,7 +6,6 @@ from flask_admin.contrib.geoa.fields import GeoJSONField from geoalchemy2 import Geometry from geoalchemy2.shape import to_shape -from nose.tools import eq_, ok_ from . import setup @@ -38,27 +37,27 @@ def test_model(): view = ModelView(GeoModel, db.session) admin.add_view(view) - eq_(view.model, GeoModel) - eq_(view._primary_key, 'id') + assert view.model == GeoModel + assert view._primary_key == 'id' # Verify form - eq_(view._create_form_class.point.field_class, GeoJSONField) - eq_(view._create_form_class.point.kwargs['geometry_type'], "POINT") - eq_(view._create_form_class.line.field_class, GeoJSONField) - eq_(view._create_form_class.line.kwargs['geometry_type'], "LINESTRING") - eq_(view._create_form_class.polygon.field_class, GeoJSONField) - eq_(view._create_form_class.polygon.kwargs['geometry_type'], "POLYGON") - eq_(view._create_form_class.multi.field_class, GeoJSONField) - eq_(view._create_form_class.multi.kwargs['geometry_type'], "MULTIPOINT") + assert view._create_form_class.point.field_class == GeoJSONField + assert view._create_form_class.point.kwargs['geometry_type'] == "POINT" + assert view._create_form_class.line.field_class == GeoJSONField + assert view._create_form_class.line.kwargs['geometry_type'] == "LINESTRING" + assert view._create_form_class.polygon.field_class == GeoJSONField + assert view._create_form_class.polygon.kwargs['geometry_type'] == "POLYGON" + assert view._create_form_class.multi.field_class == GeoJSONField + assert view._create_form_class.multi.kwargs['geometry_type'] == "MULTIPOINT" # Make some test clients client = app.test_client() rv = client.get('/admin/geomodel/') - eq_(rv.status_code, 200) + assert rv.status_code == 200 rv = client.get('/admin/geomodel/new/') - eq_(rv.status_code, 200) + assert rv.status_code == 200 rv = client.post('/admin/geomodel/new/', data={ "name": "test1", @@ -68,63 +67,63 @@ def test_model(): ' [101.0, 1.0], [100.0, 1.0], [100.0, 0.0]]]}'), "multi": '{"type": "MultiPoint", "coordinates": [[100.0, 0.0], [101.0, 1.0]]}', }) - eq_(rv.status_code, 302) + assert rv.status_code == 302 model = db.session.query(GeoModel).first() - eq_(model.name, "test1") - eq_(to_shape(model.point).geom_type, "Point") - eq_(list(to_shape(model.point).coords), [(125.8, 10.0)]) - eq_(to_shape(model.line).geom_type, "LineString") - eq_(list(to_shape(model.line).coords), [(50.2345, 94.2), (50.21, 94.87)]) - eq_(to_shape(model.polygon).geom_type, "Polygon") + assert model.name == "test1" + assert to_shape(model.point).geom_type == "Point" + assert list(to_shape(model.point).coords) == [(125.8, 10.0]) + assert to_shape(model.line).geom_type == "LineString" + assert list(to_shape(model.line).coords) == [(50.2345, 94.2, (50.21, 94.87)]) + assert to_shape(model.polygon).geom_type == "Polygon" eq_(list(to_shape(model.polygon).exterior.coords), [(100.0, 0.0), (101.0, 0.0), (101.0, 1.0), (100.0, 1.0), (100.0, 0.0)]) - eq_(to_shape(model.multi).geom_type, "MultiPoint") - eq_(len(to_shape(model.multi).geoms), 2) - eq_(list(to_shape(model.multi).geoms[0].coords), [(100.0, 0.0)]) - eq_(list(to_shape(model.multi).geoms[1].coords), [(101.0, 1.0)]) + assert to_shape(model.multi).geom_type == "MultiPoint" + assert len(to_shape(model.multi).geoms) == 2 + assert list(to_shape(model.multi).geoms[0].coords) == [(100.0, 0.0]) + assert list(to_shape(model.multi).geoms[1].coords) == [(101.0, 1.0]) rv = client.get('/admin/geomodel/') - eq_(rv.status_code, 200) + assert rv.status_code == 200 html = rv.data.decode('utf-8') pattern = r'(.|\n)+({.*"type": ?"Point".*})(.|\n)+' group = re.match(pattern, html).group(2) p = json.loads(group) - eq_(p['coordinates'][0], 125.8) - eq_(p['coordinates'][1], 10.0) + assert p['coordinates'][0] == 125.8 + assert p['coordinates'][1] == 10.0 url = '/admin/geomodel/edit/?id=%s' % model.id rv = client.get(url) - eq_(rv.status_code, 200) + assert rv.status_code == 200 data = rv.data.decode('utf-8') - ok_(r'{"type":"MultiPoint","coordinates":[[100,0],[101,1]]}' in data or - r'{"type":"MultiPoint","coordinates":[[100,0],[101,1]]}' in data) + assert (r'{"type":"MultiPoint","coordinates":[[100,0],[101,1]]}' in data or + r'{"type":"MultiPoint","coordinates":[[100,0],[101,1]]}' in data) # rv = client.post(url, data={ # "name": "edited", # "point": '{"type": "Point", "coordinates": [99.9, 10.5]}', # "line": '', # set to NULL in the database # }) - # eq_(rv.status_code, 302) + # assert rv.status_code == 302 # # model = db.session.query(GeoModel).first() - # eq_(model.name, "edited") - # eq_(to_shape(model.point).geom_type, "Point") - # eq_(list(to_shape(model.point).coords), [(99.9, 10.5)]) - # eq_(to_shape(model.line), None) - # eq_(to_shape(model.polygon).geom_type, "Polygon") + # assert model.name == "edited" + # assert to_shape(model.point).geom_type == "Point" + # assert list(to_shape(model.point).coords) == [(99.9, 10.5]) + # assert to_shape(model.line) == None + # assert to_shape(model.polygon).geom_type == "Polygon" # eq_(list(to_shape(model.polygon).exterior.coords), # [(100.0, 0.0), (101.0, 0.0), (101.0, 1.0), (100.0, 1.0), (100.0, 0.0)]) - # eq_(to_shape(model.multi).geom_type, "MultiPoint") - # eq_(len(to_shape(model.multi).geoms), 2) - # eq_(list(to_shape(model.multi).geoms[0].coords), [(100.0, 0.0)]) - # eq_(list(to_shape(model.multi).geoms[1].coords), [(101.0, 1.0)]) + # assert to_shape(model.multi).geom_type == "MultiPoint" + # assert len(to_shape(model.multi).geoms) == 2 + # assert list(to_shape(model.multi).geoms[0].coords) == [(100.0, 0.0]) + # assert list(to_shape(model.multi).geoms[1].coords) == [(101.0, 1.0]) url = '/admin/geomodel/delete/?id=%s' % model.id rv = client.post(url) - eq_(rv.status_code, 302) - eq_(db.session.query(GeoModel).count(), 0) + assert rv.status_code == 302 + assert db.session.query(GeoModel).count() == 0 def test_none(): @@ -143,14 +142,14 @@ def test_none(): rv = client.post('/admin/geomodel/new/', data={ "name": "test1", }) - eq_(rv.status_code, 302) + assert rv.status_code == 302 model = db.session.query(GeoModel).first() url = '/admin/geomodel/edit/?id=%s' % model.id rv = client.get(url) - eq_(rv.status_code, 200) + assert rv.status_code == 200 data = rv.data.decode('utf-8') - ok_(r' name="point">' in data or - ' name="point">\n' in data or - ' name="point">\r\n' in data) + assert (r' name="point">' in data or + ' name="point">\n' in data or + ' name="point">\r\n' in data) diff --git a/flask_admin/tests/mongoengine/__init__.py b/flask_admin/tests/mongoengine/__init__.py index 8ae4e34bbc..843b3d58b4 100644 --- a/flask_admin/tests/mongoengine/__init__.py +++ b/flask_admin/tests/mongoengine/__init__.py @@ -1,4 +1,4 @@ -from nose.plugins.skip import SkipTest +from unittest import SkipTest from wtforms import __version__ as wtforms_version if int(wtforms_version[0]) < 2: diff --git a/flask_admin/tests/mongoengine/test_basic.py b/flask_admin/tests/mongoengine/test_basic.py index d25cfc65a1..b977d23b56 100644 --- a/flask_admin/tests/mongoengine/test_basic.py +++ b/flask_admin/tests/mongoengine/test_basic.py @@ -1,5 +1,3 @@ -from nose.tools import eq_, ok_ - from wtforms import fields, validators from flask_admin import form @@ -80,69 +78,69 @@ def test_model(): view = CustomModelView(Model1) admin.add_view(view) - eq_(view.model, Model1) - eq_(view.name, 'Model1') - eq_(view.endpoint, 'model1') + assert view.model == Model1 + assert view.name == 'Model1' + assert view.endpoint == 'model1' - eq_(view._primary_key, 'id') + assert view._primary_key == 'id' - ok_('test1' in view._sortable_columns) - ok_('test2' in view._sortable_columns) - ok_('test3' in view._sortable_columns) - ok_('test4' in view._sortable_columns) + assert 'test1' in view._sortable_columns + assert 'test2' in view._sortable_columns + assert 'test3' in view._sortable_columns + assert 'test4' in view._sortable_columns - ok_(view._create_form_class is not None) - ok_(view._edit_form_class is not None) - eq_(view._search_supported, False) - eq_(view._filters, None) + assert view._create_form_class is not None + assert view._edit_form_class is not None + assert not view._search_supported + assert view._filters is None - eq_(view._create_form_class.test1.field_class, fields.StringField) - eq_(view._create_form_class.test2.field_class, fields.StringField) + assert view._create_form_class.test1.field_class == fields.StringField + assert view._create_form_class.test2.field_class == fields.StringField - eq_(view._create_form_class.test3.field_class, fields.TextAreaField) - eq_(view._create_form_class.test4.field_class, fields.TextAreaField) + assert view._create_form_class.test3.field_class == fields.TextAreaField + assert view._create_form_class.test4.field_class == fields.TextAreaField # Make some test clients client = app.test_client() rv = client.get('/admin/model1/') - eq_(rv.status_code, 200) + assert rv.status_code == 200 rv = client.get('/admin/model1/new/') - eq_(rv.status_code, 200) + assert rv.status_code == 200 rv = client.post('/admin/model1/new/', data=dict(test1='test1large', test2='test2')) - eq_(rv.status_code, 302) + assert rv.status_code == 302 model = Model1.objects.first() - eq_(model.test1, 'test1large') - eq_(model.test2, 'test2') - eq_(model.test3, '') - eq_(model.test4, '') + assert model.test1 == 'test1large' + assert model.test2 == 'test2' + assert model.test3 == '' + assert model.test4 == '' rv = client.get('/admin/model1/') - eq_(rv.status_code, 200) - ok_(b'test1large' in rv.data) + assert rv.status_code == 200 + assert b'test1large' in rv.data url = '/admin/model1/edit/?id=%s' % model.id rv = client.get(url) - eq_(rv.status_code, 200) + assert rv.status_code == 200 rv = client.post(url, data=dict(test1='test1small', test2='test2large')) - eq_(rv.status_code, 302) + assert rv.status_code == 302 model = Model1.objects.first() - eq_(model.test1, 'test1small') - eq_(model.test2, 'test2large') - eq_(model.test3, '') - eq_(model.test4, '') + assert model.test1 == 'test1small' + assert model.test2 == 'test2large' + assert model.test3 == '' + assert model.test4 == '' url = '/admin/model1/delete/?id=%s' % model.id rv = client.post(url) - eq_(rv.status_code, 302) - eq_(Model1.objects.count(), 0) + assert rv.status_code == 302 + assert Model1.objects.count() == 0 def test_column_editable_list(): @@ -161,7 +159,7 @@ def test_column_editable_list(): # Test in-line edit field rendering rv = client.get('/admin/model1/') data = rv.data.decode('utf-8') - ok_('data-role="x-editable"' in data) + assert 'data-role="x-editable"' in data # Form - Test basic in-line edit functionality obj1 = Model1.objects.get(test1='test1_val_3') @@ -170,12 +168,12 @@ def test_column_editable_list(): 'test1': 'change-success-1', }) data = rv.data.decode('utf-8') - ok_('Record was successfully saved.' == data) + assert 'Record was successfully saved.' == data # confirm the value has changed rv = client.get('/admin/model1/') data = rv.data.decode('utf-8') - ok_('change-success-1' in data) + assert 'change-success-1' in data # Test validation error obj2 = Model1.objects.get(test1='datetime_obj1') @@ -183,7 +181,7 @@ def test_column_editable_list(): 'list_form_pk': str(obj2.id), 'datetime_field': 'problematic-input', }) - eq_(rv.status_code, 500) + assert rv.status_code == 500 # Test invalid primary key rv = client.post('/admin/model1/ajax/update/', data={ @@ -191,7 +189,7 @@ def test_column_editable_list(): 'test1': 'problematic-input', }) data = rv.data.decode('utf-8') - eq_(rv.status_code, 500) + assert rv.status_code == 500 # Test editing column not in column_editable_list rv = client.post('/admin/model1/ajax/update/', data={ @@ -199,7 +197,7 @@ def test_column_editable_list(): 'test2': 'problematic-input', }) data = rv.data.decode('utf-8') - ok_('problematic-input' not in data) + assert 'problematic-input' not in data # Test in-line editing for relations view = CustomModelView(Model2, column_editable_list=['model1']) @@ -211,12 +209,12 @@ def test_column_editable_list(): 'model1': str(obj1.id), }) data = rv.data.decode('utf-8') - ok_('Record was successfully saved.' == data) + assert 'Record was successfully saved.' == data # confirm the value has changed rv = client.get('/admin/model2/') data = rv.data.decode('utf-8') - ok_('test1_val_1' in data) + assert 'test1_val_1' in data def test_details_view(): @@ -247,33 +245,33 @@ def test_details_view(): # ensure link to details is hidden when can_view_details is disabled rv = client.get('/admin/model1/') data = rv.data.decode('utf-8') - ok_('/admin/model1/details/' not in data) + assert '/admin/model1/details/' not in data # ensure link to details view appears rv = client.get('/admin/model2/') data = rv.data.decode('utf-8') - ok_('/admin/model2/details/' in data) + assert '/admin/model2/details/' in data # test redirection when details are disabled url = '/admin/model1/details/?url=%2Fadmin%2Fmodel1%2F&id=' + str(m1_id) rv = client.get(url) - eq_(rv.status_code, 302) + assert rv.status_code == 302 # test if correct data appears in details view when enabled url = '/admin/model2/details/?url=%2Fadmin%2Fmodel2%2F&id=' + str(m2_id) rv = client.get(url) data = rv.data.decode('utf-8') - ok_('String Field' in data) - ok_('string_field_val_1' in data) - ok_('Int Field' in data) + assert 'String Field' in data + assert 'string_field_val_1' in data + assert 'Int Field' in data # test column_details_list url = '/admin/sf_view/details/?url=%2Fadmin%2Fsf_view%2F&id=' + str(m2_id) rv = client.get(url) data = rv.data.decode('utf-8') - ok_('String Field' in data) - ok_('string_field_val_1' in data) - ok_('Int Field' not in data) + assert 'String Field' in data + assert 'string_field_val_1' in data + assert 'Int Field' not in data def test_column_filters(): @@ -288,10 +286,10 @@ def test_column_filters(): view = CustomModelView(Model1, column_filters=['test1']) admin.add_view(view) - eq_(len(view._filters), 7) + assert len(view._filters) == 7 - eq_( - [(f['index'], f['operation']) for f in view._filter_groups[u'Test1']], + assert \ + [(f['index'], f['operation']) for f in view._filter_groups[u'Test1']] == \ [ (0, 'contains'), (1, 'not contains'), @@ -301,79 +299,78 @@ def test_column_filters(): (5, 'in list'), (6, 'not in list'), ] - ) # Make some test clients client = app.test_client() # string - equals rv = client.get('/admin/model1/?flt0_0=test1_val_1') - eq_(rv.status_code, 200) + assert rv.status_code == 200 data = rv.data.decode('utf-8') - ok_('test2_val_1' in data) - ok_('test1_val_2' not in data) + assert 'test2_val_1' in data + assert 'test1_val_2' not in data # string - not equal rv = client.get('/admin/model1/?flt0_1=test1_val_1') - eq_(rv.status_code, 200) + assert rv.status_code == 200 data = rv.data.decode('utf-8') - ok_('test2_val_1' not in data) - ok_('test1_val_2' in data) + assert 'test2_val_1' not in data + assert 'test1_val_2' in data # string - contains rv = client.get('/admin/model1/?flt0_2=test1_val_1') - eq_(rv.status_code, 200) + assert rv.status_code == 200 data = rv.data.decode('utf-8') - ok_('test2_val_1' in data) - ok_('test1_val_2' not in data) + assert 'test2_val_1' in data + assert 'test1_val_2' not in data # string - not contains rv = client.get('/admin/model1/?flt0_3=test1_val_1') - eq_(rv.status_code, 200) + assert rv.status_code == 200 data = rv.data.decode('utf-8') - ok_('test2_val_1' not in data) - ok_('test1_val_2' in data) + assert 'test2_val_1' not in data + assert 'test1_val_2' in data # string - empty rv = client.get('/admin/model1/?flt0_4=1') - eq_(rv.status_code, 200) + assert rv.status_code == 200 data = rv.data.decode('utf-8') - ok_('empty_obj' in data) - ok_('test1_val_1' not in data) - ok_('test1_val_2' not in data) + assert 'empty_obj' in data + assert 'test1_val_1' not in data + assert 'test1_val_2' not in data # string - not empty rv = client.get('/admin/model1/?flt0_4=0') - eq_(rv.status_code, 200) + assert rv.status_code == 200 data = rv.data.decode('utf-8') - ok_('empty_obj' not in data) - ok_('test1_val_1' in data) - ok_('test1_val_2' in data) + assert 'empty_obj' not in data + assert 'test1_val_1' in data + assert 'test1_val_2' in data # string - in list rv = client.get('/admin/model1/?flt0_5=test1_val_1%2Ctest1_val_2') - eq_(rv.status_code, 200) + assert rv.status_code == 200 data = rv.data.decode('utf-8') - ok_('test2_val_1' in data) - ok_('test2_val_2' in data) - ok_('test1_val_3' not in data) - ok_('test1_val_4' not in data) + assert 'test2_val_1' in data + assert 'test2_val_2' in data + assert 'test1_val_3' not in data + assert 'test1_val_4' not in data # string - not in list rv = client.get('/admin/model1/?flt0_6=test1_val_1%2Ctest1_val_2') - eq_(rv.status_code, 200) + assert rv.status_code == 200 data = rv.data.decode('utf-8') - ok_('test2_val_1' not in data) - ok_('test2_val_2' not in data) - ok_('test1_val_3' in data) - ok_('test1_val_4' in data) + assert 'test2_val_1' not in data + assert 'test2_val_2' not in data + assert 'test1_val_3' in data + assert 'test1_val_4' in data # Test numeric filter view = CustomModelView(Model2, column_filters=['int_field']) admin.add_view(view) - eq_( - [(f['index'], f['operation']) for f in view._filter_groups[u'Int Field']], + assert \ + [(f['index'], f['operation']) for f in view._filter_groups[u'Int Field']] == \ [ (0, 'equals'), (1, 'not equal'), @@ -383,146 +380,144 @@ def test_column_filters(): (5, 'in list'), (6, 'not in list'), ] - ) # integer - equals rv = client.get('/admin/model2/?flt0_0=5000') - eq_(rv.status_code, 200) + assert rv.status_code == 200 data = rv.data.decode('utf-8') - ok_('string_field_val_3' in data) - ok_('string_field_val_4' not in data) + assert 'string_field_val_3' in data + assert 'string_field_val_4' not in data # integer - equals (huge number) rv = client.get('/admin/model2/?flt0_0=6169453081680413441') - eq_(rv.status_code, 200) + assert rv.status_code == 200 data = rv.data.decode('utf-8') - ok_('string_field_val_5' in data) - ok_('string_field_val_4' not in data) + assert 'string_field_val_5' in data + assert 'string_field_val_4' not in data # integer - equals - test validation rv = client.get('/admin/model2/?flt0_0=badval') - eq_(rv.status_code, 200) + assert rv.status_code == 200 data = rv.data.decode('utf-8') - ok_('Invalid Filter Value' in data) + assert 'Invalid Filter Value' in data # integer - not equal rv = client.get('/admin/model2/?flt0_1=5000') - eq_(rv.status_code, 200) + assert rv.status_code == 200 data = rv.data.decode('utf-8') - ok_('string_field_val_3' not in data) - ok_('string_field_val_4' in data) + assert 'string_field_val_3' not in data + assert 'string_field_val_4' in data # integer - greater rv = client.get('/admin/model2/?flt0_2=6000') - eq_(rv.status_code, 200) + assert rv.status_code == 200 data = rv.data.decode('utf-8') - ok_('string_field_val_3' not in data) - ok_('string_field_val_4' in data) + assert 'string_field_val_3' not in data + assert 'string_field_val_4' in data # integer - smaller rv = client.get('/admin/model2/?flt0_3=6000') - eq_(rv.status_code, 200) + assert rv.status_code == 200 data = rv.data.decode('utf-8') - ok_('string_field_val_3' in data) - ok_('string_field_val_4' not in data) + assert 'string_field_val_3' in data + assert 'string_field_val_4' not in data # integer - empty rv = client.get('/admin/model2/?flt0_4=1') - eq_(rv.status_code, 200) + assert rv.status_code == 200 data = rv.data.decode('utf-8') - ok_('string_field_val_1' in data) - ok_('string_field_val_2' in data) - ok_('string_field_val_3' not in data) - ok_('string_field_val_4' not in data) + assert 'string_field_val_1' in data + assert 'string_field_val_2' in data + assert 'string_field_val_3' not in data + assert 'string_field_val_4' not in data # integer - not empty rv = client.get('/admin/model2/?flt0_4=0') - eq_(rv.status_code, 200) + assert rv.status_code == 200 data = rv.data.decode('utf-8') - ok_('string_field_val_1' not in data) - ok_('string_field_val_2' not in data) - ok_('string_field_val_3' in data) - ok_('string_field_val_4' in data) + assert 'string_field_val_1' not in data + assert 'string_field_val_2' not in data + assert 'string_field_val_3' in data + assert 'string_field_val_4' in data # integer - in list rv = client.get('/admin/model2/?flt0_5=5000%2C9000') - eq_(rv.status_code, 200) + assert rv.status_code == 200 data = rv.data.decode('utf-8') - ok_('string_field_val_1' not in data) - ok_('string_field_val_2' not in data) - ok_('string_field_val_3' in data) - ok_('string_field_val_4' in data) + assert 'string_field_val_1' not in data + assert 'string_field_val_2' not in data + assert 'string_field_val_3' in data + assert 'string_field_val_4' in data # integer - in list (huge number) rv = client.get('/admin/model2/?flt0_5=6169453081680413441') - eq_(rv.status_code, 200) + assert rv.status_code == 200 data = rv.data.decode('utf-8') - ok_('string_field_val_1' not in data) - ok_('string_field_val_5' in data) + assert 'string_field_val_1' not in data + assert 'string_field_val_5' in data # integer - in list - test validation rv = client.get('/admin/model2/?flt0_5=5000%2Cbadval') - eq_(rv.status_code, 200) + assert rv.status_code == 200 data = rv.data.decode('utf-8') - ok_('Invalid Filter Value' in data) + assert 'Invalid Filter Value' in data # integer - not in list rv = client.get('/admin/model2/?flt0_6=5000%2C9000') - eq_(rv.status_code, 200) + assert rv.status_code == 200 data = rv.data.decode('utf-8') - ok_('string_field_val_1' in data) - ok_('string_field_val_2' in data) - ok_('string_field_val_3' not in data) - ok_('string_field_val_4' not in data) + assert 'string_field_val_1' in data + assert 'string_field_val_2' in data + assert 'string_field_val_3' not in data + assert 'string_field_val_4' not in data # Test boolean filter view = CustomModelView(Model2, column_filters=['bool_field'], endpoint="_bools") admin.add_view(view) - eq_( - [(f['index'], f['operation']) for f in view._filter_groups[u'Bool Field']], + assert \ + [(f['index'], f['operation']) for f in view._filter_groups[u'Bool Field']] == \ [ (0, 'equals'), (1, 'not equal'), ] - ) # boolean - equals - Yes rv = client.get('/admin/_bools/?flt0_0=1') - eq_(rv.status_code, 200) + assert rv.status_code == 200 data = rv.data.decode('utf-8') - ok_('string_field_val_1' in data) - ok_('string_field_val_2' not in data) + assert 'string_field_val_1' in data + assert 'string_field_val_2' not in data # boolean - equals - No rv = client.get('/admin/_bools/?flt0_0=0') - eq_(rv.status_code, 200) + assert rv.status_code == 200 data = rv.data.decode('utf-8') - ok_('string_field_val_1' not in data) - ok_('string_field_val_2' in data) + assert 'string_field_val_1' not in data + assert 'string_field_val_2' in data # boolean - not equals - Yes rv = client.get('/admin/_bools/?flt0_1=1') - eq_(rv.status_code, 200) + assert rv.status_code == 200 data = rv.data.decode('utf-8') - ok_('string_field_val_1' not in data) - ok_('string_field_val_2' in data) + assert 'string_field_val_1' not in data + assert 'string_field_val_2' in data # boolean - not equals - No rv = client.get('/admin/_bools/?flt0_1=0') - eq_(rv.status_code, 200) + assert rv.status_code == 200 data = rv.data.decode('utf-8') - ok_('string_field_val_1' in data) - ok_('string_field_val_2' not in data) + assert 'string_field_val_1' in data + assert 'string_field_val_2' not in data # Test float filter view = CustomModelView(Model2, column_filters=['float_field'], endpoint="_float") admin.add_view(view) - eq_( - [(f['index'], f['operation']) for f in view._filter_groups[u'Float Field']], + assert \ + [(f['index'], f['operation']) for f in view._filter_groups[u'Float Field']] == \ [ (0, 'equals'), (1, 'not equal'), @@ -532,83 +527,82 @@ def test_column_filters(): (5, 'in list'), (6, 'not in list'), ] - ) # float - equals rv = client.get('/admin/_float/?flt0_0=25.9') - eq_(rv.status_code, 200) + assert rv.status_code == 200 data = rv.data.decode('utf-8') - ok_('string_field_val_3' in data) - ok_('string_field_val_4' not in data) + assert 'string_field_val_3' in data + assert 'string_field_val_4' not in data # float - equals - test validation rv = client.get('/admin/_float/?flt0_0=badval') - eq_(rv.status_code, 200) + assert rv.status_code == 200 data = rv.data.decode('utf-8') - ok_('Invalid Filter Value' in data) + assert 'Invalid Filter Value' in data # float - not equal rv = client.get('/admin/_float/?flt0_1=25.9') - eq_(rv.status_code, 200) + assert rv.status_code == 200 data = rv.data.decode('utf-8') - ok_('string_field_val_3' not in data) - ok_('string_field_val_4' in data) + assert 'string_field_val_3' not in data + assert 'string_field_val_4' in data # float - greater rv = client.get('/admin/_float/?flt0_2=60.5') - eq_(rv.status_code, 200) + assert rv.status_code == 200 data = rv.data.decode('utf-8') - ok_('string_field_val_3' not in data) - ok_('string_field_val_4' in data) + assert 'string_field_val_3' not in data + assert 'string_field_val_4' in data # float - smaller rv = client.get('/admin/_float/?flt0_3=60.5') - eq_(rv.status_code, 200) + assert rv.status_code == 200 data = rv.data.decode('utf-8') - ok_('string_field_val_3' in data) - ok_('string_field_val_4' not in data) + assert 'string_field_val_3' in data + assert 'string_field_val_4' not in data # float - empty rv = client.get('/admin/_float/?flt0_4=1') - eq_(rv.status_code, 200) + assert rv.status_code == 200 data = rv.data.decode('utf-8') - ok_('string_field_val_1' in data) - ok_('string_field_val_2' in data) - ok_('string_field_val_3' not in data) - ok_('string_field_val_4' not in data) + assert 'string_field_val_1' in data + assert 'string_field_val_2' in data + assert 'string_field_val_3' not in data + assert 'string_field_val_4' not in data # float - not empty rv = client.get('/admin/_float/?flt0_4=0') - eq_(rv.status_code, 200) + assert rv.status_code == 200 data = rv.data.decode('utf-8') - ok_('string_field_val_1' not in data) - ok_('string_field_val_2' not in data) - ok_('string_field_val_3' in data) - ok_('string_field_val_4' in data) + assert 'string_field_val_1' not in data + assert 'string_field_val_2' not in data + assert 'string_field_val_3' in data + assert 'string_field_val_4' in data # float - in list rv = client.get('/admin/_float/?flt0_5=25.9%2C75.5') - eq_(rv.status_code, 200) + assert rv.status_code == 200 data = rv.data.decode('utf-8') - ok_('string_field_val_1' not in data) - ok_('string_field_val_2' not in data) - ok_('string_field_val_3' in data) - ok_('string_field_val_4' in data) + assert 'string_field_val_1' not in data + assert 'string_field_val_2' not in data + assert 'string_field_val_3' in data + assert 'string_field_val_4' in data # float - in list - test validation rv = client.get('/admin/_float/?flt0_5=25.9%2Cbadval') - eq_(rv.status_code, 200) + assert rv.status_code == 200 data = rv.data.decode('utf-8') - ok_('Invalid Filter Value' in data) + assert 'Invalid Filter Value' in data # float - not in list rv = client.get('/admin/_float/?flt0_6=25.9%2C75.5') - eq_(rv.status_code, 200) + assert rv.status_code == 200 data = rv.data.decode('utf-8') - ok_('string_field_val_1' in data) - ok_('string_field_val_2' in data) - ok_('string_field_val_3' not in data) - ok_('string_field_val_4' not in data) + assert 'string_field_val_1' in data + assert 'string_field_val_2' in data + assert 'string_field_val_3' not in data + assert 'string_field_val_4' not in data # Test datetime filter view = CustomModelView(Model1, @@ -616,8 +610,8 @@ def test_column_filters(): endpoint="_datetime") admin.add_view(view) - eq_( - [(f['index'], f['operation']) for f in view._filter_groups[u'Datetime Field']], + assert \ + [(f['index'], f['operation']) for f in view._filter_groups[u'Datetime Field']] == \ [ (0, 'equals'), (1, 'not equal'), @@ -627,65 +621,64 @@ def test_column_filters(): (5, 'not between'), (6, 'empty'), ] - ) # datetime - equals rv = client.get('/admin/_datetime/?flt0_0=2014-04-03+01%3A09%3A00') - eq_(rv.status_code, 200) + assert rv.status_code == 200 data = rv.data.decode('utf-8') - ok_('datetime_obj1' in data) - ok_('datetime_obj2' not in data) + assert 'datetime_obj1' in data + assert 'datetime_obj2' not in data # datetime - not equal rv = client.get('/admin/_datetime/?flt0_1=2014-04-03+01%3A09%3A00') - eq_(rv.status_code, 200) + assert rv.status_code == 200 data = rv.data.decode('utf-8') - ok_('datetime_obj1' not in data) - ok_('datetime_obj2' in data) + assert 'datetime_obj1' not in data + assert 'datetime_obj2' in data # datetime - greater rv = client.get('/admin/_datetime/?flt0_2=2014-04-03+01%3A08%3A00') - eq_(rv.status_code, 200) + assert rv.status_code == 200 data = rv.data.decode('utf-8') - ok_('datetime_obj1' in data) - ok_('datetime_obj2' not in data) + assert 'datetime_obj1' in data + assert 'datetime_obj2' not in data # datetime - smaller rv = client.get('/admin/_datetime/?flt0_3=2014-04-03+01%3A08%3A00') - eq_(rv.status_code, 200) + assert rv.status_code == 200 data = rv.data.decode('utf-8') - ok_('datetime_obj1' not in data) - ok_('datetime_obj2' in data) + assert 'datetime_obj1' not in data + assert 'datetime_obj2' in data # datetime - between rv = client.get('/admin/_datetime/?flt0_4=2014-04-02+00%3A00%3A00+to+2014-11-20+23%3A59%3A59') - eq_(rv.status_code, 200) + assert rv.status_code == 200 data = rv.data.decode('utf-8') - ok_('datetime_obj1' in data) - ok_('datetime_obj2' not in data) + assert 'datetime_obj1' in data + assert 'datetime_obj2' not in data # datetime - not between rv = client.get('/admin/_datetime/?flt0_5=2014-04-02+00%3A00%3A00+to+2014-11-20+23%3A59%3A59') - eq_(rv.status_code, 200) + assert rv.status_code == 200 data = rv.data.decode('utf-8') - ok_('datetime_obj1' not in data) - ok_('datetime_obj2' in data) + assert 'datetime_obj1' not in data + assert 'datetime_obj2' in data # datetime - empty rv = client.get('/admin/_datetime/?flt0_6=1') - eq_(rv.status_code, 200) + assert rv.status_code == 200 data = rv.data.decode('utf-8') - ok_('test1_val_1' in data) - ok_('datetime_obj1' not in data) - ok_('datetime_obj2' not in data) + assert 'test1_val_1' in data + assert 'datetime_obj1' not in data + assert 'datetime_obj2' not in data # datetime - not empty rv = client.get('/admin/_datetime/?flt0_6=0') - eq_(rv.status_code, 200) + assert rv.status_code == 200 data = rv.data.decode('utf-8') - ok_('test1_val_1' not in data) - ok_('datetime_obj1' in data) - ok_('datetime_obj2' in data) + assert 'test1_val_1' not in data + assert 'datetime_obj1' in data + assert 'datetime_obj2' in data def test_default_sort(): @@ -696,16 +689,16 @@ def test_default_sort(): M1(test1='b', test2='x').save() M1(test1='a', test2='y').save() - eq_(M1.objects.count(), 3) + assert M1.objects.count() == 3 view = CustomModelView(M1, column_default_sort='test1') admin.add_view(view) _, data = view.get_list(0, None, None, None, None) - eq_(data[0].test1, 'a') - eq_(data[1].test1, 'b') - eq_(data[2].test1, 'c') + assert data[0].test1 == 'a' + assert data[1].test1 == 'b' + assert data[2].test1 == 'c' # test default sort with multiple columns order = [('test2', False), ('test1', False)] @@ -714,10 +707,10 @@ def test_default_sort(): _, data = view2.get_list(0, None, None, None, None) - eq_(len(data), 3) - eq_(data[0].test1, 'b') - eq_(data[1].test1, 'c') - eq_(data[2].test1, 'a') + assert len(data) == 3 + assert data[0].test1 == 'b' + assert data[1].test1 == 'c' + assert data[2].test1 == 'a' def test_extra_fields(): @@ -736,14 +729,14 @@ def test_extra_fields(): client = app.test_client() rv = client.get('/admin/model1/new/') - eq_(rv.status_code, 200) + assert rv.status_code == 200 # Check presence and order data = rv.data.decode('utf-8') - ok_('Extra Field' in data) + assert 'Extra Field' in data pos1 = data.find('Extra Field') pos2 = data.find('Test1') - ok_(pos2 < pos1) + assert pos2 < pos1 def test_extra_field_order(): @@ -762,14 +755,14 @@ def test_extra_field_order(): client = app.test_client() rv = client.get('/admin/model1/new/') - eq_(rv.status_code, 200) + assert rv.status_code == 200 # Check presence and order data = rv.data.decode('utf-8') - ok_('Extra Field' in data) + assert 'Extra Field' in data pos1 = data.find('Extra Field') pos2 = data.find('Test1') - ok_(pos2 < pos1) + assert pos2 < pos1 def test_custom_form_base(): @@ -786,10 +779,10 @@ class TestForm(form.BaseForm): ) admin.add_view(view) - ok_(hasattr(view._create_form_class, 'test1')) + assert hasattr(view._create_form_class, 'test1') create_form = view.create_form() - ok_(isinstance(create_form, TestForm)) + assert isinstance(create_form, TestForm) def test_subdocument_config(): @@ -813,11 +806,11 @@ class Model1(db.Document): } ) - ok_(hasattr(view1._create_form_class, 'subdoc')) + assert hasattr(view1._create_form_class, 'subdoc') form = view1.create_form() - ok_('name' in dir(form.subdoc.form)) - ok_('value' not in dir(form.subdoc.form)) + assert 'name' in dir(form.subdoc.form) + assert 'value' not in dir(form.subdoc.form) # Check exclude view2 = CustomModelView( @@ -830,8 +823,8 @@ class Model1(db.Document): ) form = view2.create_form() - ok_('name' in dir(form.subdoc.form)) - ok_('value' not in dir(form.subdoc.form)) + assert 'name' in dir(form.subdoc.form) + assert 'value' not in dir(form.subdoc.form) def test_subdocument_class_config(): @@ -859,8 +852,8 @@ class EmbeddedConfig(EmbeddedForm): ) form = view1.create_form() - ok_('name' in dir(form.subdoc.form)) - ok_('value' not in dir(form.subdoc.form)) + assert 'name' in dir(form.subdoc.form) + assert 'value' not in dir(form.subdoc.form) def test_nested_subdocument_config(): @@ -893,8 +886,8 @@ class Model1(db.Document): ) form = view1.create_form() - ok_('name' in dir(form.nested.form.comment.form)) - ok_('value' not in dir(form.nested.form.comment.form)) + assert 'name' in dir(form.nested.form.comment.form) + assert 'value' not in dir(form.nested.form.comment.form) def test_nested_list_subdocument(): @@ -926,8 +919,8 @@ class Model1(db.Document): form = view1.create_form() inline_form = form.subdoc.unbound_field.args[2] - ok_('name' in dir(inline_form)) - ok_('value' not in dir(inline_form)) + assert 'name' in dir(inline_form) + assert 'value' not in dir(inline_form) def test_nested_sortedlist_subdocument(): @@ -958,8 +951,8 @@ class Model1(db.Document): form = view1.create_form() inline_form = form.subdoc.unbound_field.args[2] - ok_('name' in dir(inline_form)) - ok_('value' not in dir(inline_form)) + assert 'name' in dir(inline_form) + assert 'value' not in dir(inline_form) def test_sortedlist_subdocument_validation(): @@ -979,12 +972,12 @@ class Model1(db.Document): rv = client.post('/admin/model1/new/', data={'test1': 'test1large', 'subdoc-0-name': 'comment', 'subdoc-0-value': 'test'}) - eq_(rv.status_code, 302) + assert rv.status_code == 302 rv = client.post('/admin/model1/new/', data={'test1': 'test1large', 'subdoc-0-name': '', 'subdoc-0-value': 'test'}) - eq_(rv.status_code, 200) - ok_(b'This field is required' in rv.data) + assert rv.status_code == 200 + assert b'This field is required' in rv.data def test_list_subdocument_validation(): @@ -1004,12 +997,12 @@ class Model1(db.Document): rv = client.post('/admin/model1/new/', data={'test1': 'test1large', 'subdoc-0-name': 'comment', 'subdoc-0-value': 'test'}) - eq_(rv.status_code, 302) + assert rv.status_code == 302 rv = client.post('/admin/model1/new/', data={'test1': 'test1large', 'subdoc-0-name': '', 'subdoc-0-value': 'test'}) - eq_(rv.status_code, 200) - ok_(b'This field is required' in rv.data) + assert rv.status_code == 200 + assert b'This field is required' in rv.data def test_ajax_fk(): @@ -1028,7 +1021,7 @@ def test_ajax_fk(): ) admin.add_view(view) - ok_(u'model1' in view._form_ajax_refs) + assert u'model1' in view._form_ajax_refs model = Model1(test1=u'first') model.save() @@ -1037,42 +1030,42 @@ def test_ajax_fk(): # Check loader loader = view._form_ajax_refs[u'model1'] mdl = loader.get_one(model.id) - eq_(mdl.test1, model.test1) + assert mdl.test1 == model.test1 items = loader.get_list(u'fir') - eq_(len(items), 1) - eq_(items[0].id, model.id) + assert len(items) == 1 + assert items[0].id == model.id items = loader.get_list(u'bar') - eq_(len(items), 1) - eq_(items[0].test1, u'foo') + assert len(items) == 1 + assert items[0].test1 == u'foo' # Check form generation form = view.create_form() - eq_(form.model1.__class__.__name__, u'AjaxSelectField') + assert form.model1.__class__.__name__ == u'AjaxSelectField' with app.test_request_context('/admin/view/'): - ok_(u'value=""' not in form.model1()) + assert u'value=""' not in form.model1() form.model1.data = model - ok_(u'data-json="["%s", "first"]"' % as_unicode(model.id) in form.model1() or - u'data-json="["%s", "first"]"' % as_unicode(model.id) in form.model1()) - ok_(u'value="%s"' % as_unicode(model.id) in form.model1()) + assert (u'data-json="["%s", "first"]"' % as_unicode(model.id) in form.model1() or + u'data-json="["%s", "first"]"' % as_unicode(model.id) in form.model1()) + assert u'value="%s"' % as_unicode(model.id) in form.model1() # Check querying client = app.test_client() req = client.get(u'/admin/view/ajax/lookup/?name=model1&query=foo') - eq_(req.data.decode('utf-8'), u'[["%s", "foo"]]' % model2.id) + assert req.data.decode('utf-8') == u'[["%s", "foo"]]' % model2.id # Check submitting client.post('/admin/view/new/', data={u'model1': as_unicode(model.id)}) mdl = Model2.objects.first() - ok_(mdl is not None) - ok_(mdl.model1 is not None) - eq_(mdl.model1.id, model.id) - eq_(mdl.model1.test1, u'first') + assert mdl is not None + assert mdl.model1 is not None + assert mdl.model1.id == model.id + assert mdl.model1.test1 == u'first' def test_nested_ajax_refs(): @@ -1105,8 +1098,8 @@ class Model1(db.Document): ) form = view1.create_form() - eq_(type(form.nested.form.comment).__name__, 'AjaxSelectField') - ok_('nested-comment' in view1._form_ajax_refs) + assert type(form.nested.form.comment).__name__ == 'AjaxSelectField' + assert 'nested-comment' in view1._form_ajax_refs def test_form_flat_choices(): @@ -1119,7 +1112,7 @@ class Model(db.Document): admin.add_view(view) form = view.create_form() - eq_(form.name.choices, [('a', 'a'), ('b', 'b'), ('c', 'c')]) + assert form.name.choices == [('a', 'a'), ('b', 'b'), ('c', 'c')] def test_form_args(): @@ -1135,10 +1128,10 @@ class Model(db.Document): # ensure shared field_args don't create duplicate validators create_form = view.create_form() - eq_(len(create_form.test.validators), 2) + assert len(create_form.test.validators) == 2 edit_form = view.edit_form() - eq_(len(edit_form.test.validators), 2) + assert len(edit_form.test.validators) == 2 def test_form_args_embeddeddoc(): @@ -1161,9 +1154,9 @@ class Model(db.Document): ) admin.add_view(view) form = view.create_form() - eq_(form.timestamp.label.text, 'Last Updated Time') + assert form.timestamp.label.text == 'Last Updated Time' # This is the failure - eq_(form.info.label.text, 'Information') + assert form.info.label.text == 'Information' def test_simple_list_pager(): @@ -1180,7 +1173,7 @@ def get_count_query(self): admin.add_view(view) count, data = view.get_list(0, None, None, None, None) - ok_(count is None) + assert count is None def test_export_csv(): @@ -1200,10 +1193,10 @@ def test_export_csv(): # test export_max_rows rv = client.get('/admin/row_limit_2/export/csv/') data = rv.data.decode('utf-8') - eq_(rv.status_code, 200) - ok_("Test1,Test2\r\n" - "test1_val_1,test2_val_1\r\n" - "test1_val_2,test2_val_2\r\n" == data) + assert rv.status_code == 200 + assert "Test1,Test2\r\n" + \ + "test1_val_1,test2_val_1\r\n" + \ + "test1_val_2,test2_val_2\r\n" == data view = CustomModelView(Model1, can_export=True, column_list=['test1', 'test2'], @@ -1213,5 +1206,5 @@ def test_export_csv(): # test row limit without export_max_rows rv = client.get('/admin/no_row_limit/export/csv/') data = rv.data.decode('utf-8') - eq_(rv.status_code, 200) - ok_(len(data.splitlines()) > 21) + assert rv.status_code == 200 + assert len(data.splitlines()) > 21 diff --git a/flask_admin/tests/peeweemodel/test_basic.py b/flask_admin/tests/peeweemodel/test_basic.py index d35148cd06..49686be2ef 100644 --- a/flask_admin/tests/peeweemodel/test_basic.py +++ b/flask_admin/tests/peeweemodel/test_basic.py @@ -1,5 +1,4 @@ -from nose.tools import eq_, ok_ -from nose.plugins.skip import SkipTest +from unittest import SkipTest # Skip test on PY3 from flask_admin._compat import PY2, as_unicode @@ -115,69 +114,69 @@ def test_model(): view = CustomModelView(Model1) admin.add_view(view) - eq_(view.model, Model1) - eq_(view.name, 'Model1') - eq_(view.endpoint, 'model1') + assert view.model == Model1 + assert view.name == 'Model1' + assert view.endpoint == 'model1' - eq_(view._primary_key, 'id') + assert view._primary_key == 'id' - ok_('test1' in view._sortable_columns) - ok_('test2' in view._sortable_columns) - ok_('test3' in view._sortable_columns) - ok_('test4' in view._sortable_columns) + assert 'test1' in view._sortable_columns + assert 'test2' in view._sortable_columns + assert 'test3' in view._sortable_columns + assert 'test4' in view._sortable_columns - ok_(view._create_form_class is not None) - ok_(view._edit_form_class is not None) - eq_(view._search_supported, False) - eq_(view._filters, None) + assert view._create_form_class is not None + assert view._edit_form_class is not None + assert not view._search_supported + assert view._filters is None # Verify form - eq_(view._create_form_class.test1.field_class, fields.StringField) - eq_(view._create_form_class.test2.field_class, fields.StringField) - eq_(view._create_form_class.test3.field_class, fields.TextAreaField) - eq_(view._create_form_class.test4.field_class, fields.TextAreaField) + assert view._create_form_class.test1.field_class == fields.StringField + assert view._create_form_class.test2.field_class == fields.StringField + assert view._create_form_class.test3.field_class == fields.TextAreaField + assert view._create_form_class.test4.field_class == fields.TextAreaField # Make some test clients client = app.test_client() rv = client.get('/admin/model1/') - eq_(rv.status_code, 200) + assert rv.status_code == 200 rv = client.get('/admin/model1/new/') - eq_(rv.status_code, 200) + assert rv.status_code == 200 rv = client.post('/admin/model1/new/', data=dict(test1='test1large', test2='test2')) - eq_(rv.status_code, 302) + assert rv.status_code == 302 model = Model1.select().get() - eq_(model.test1, 'test1large') - eq_(model.test2, 'test2') - ok_(model.test3 is None or model.test3 == '') - ok_(model.test4 is None or model.test4 == '') + assert model.test1 == 'test1large' + assert model.test2 == 'test2' + assert model.test3 is None or model.test3 == '' + assert model.test4 is None or model.test4 == '' rv = client.get('/admin/model1/') - eq_(rv.status_code, 200) - ok_('test1large' in rv.data) + assert rv.status_code == 200 + assert 'test1large' in rv.data url = '/admin/model1/edit/?id=%s' % model.id rv = client.get(url) - eq_(rv.status_code, 200) + assert rv.status_code == 200 rv = client.post(url, data=dict(test1='test1small', test2='test2large')) - eq_(rv.status_code, 302) + assert rv.status_code == 302 model = Model1.select().get() - eq_(model.test1, 'test1small') - eq_(model.test2, 'test2large') - ok_(model.test3 is None or model.test3 == '') - ok_(model.test4 is None or model.test4 == '') + assert model.test1 == 'test1small' + assert model.test2 == 'test2large' + assert model.test3 is None or model.test3 == '' + assert model.test4 is None or model.test4 == '' url = '/admin/model1/delete/?id=%s' % model.id rv = client.post(url) - eq_(rv.status_code, 302) - eq_(Model1.select().count(), 0) + assert rv.status_code == 302 + assert Model1.select().count() == 0 def test_column_editable_list(): @@ -198,7 +197,7 @@ def test_column_editable_list(): # Test in-line edit field rendering rv = client.get('/admin/model1/') data = rv.data.decode('utf-8') - ok_('data-role="x-editable"' in data) + assert 'data-role="x-editable"' in data # Form - Test basic in-line edit functionality rv = client.post('/admin/model1/ajax/update/', data={ @@ -206,12 +205,12 @@ def test_column_editable_list(): 'test1': 'change-success-1', }) data = rv.data.decode('utf-8') - ok_('Record was successfully saved.' == data) + assert 'Record was successfully saved.' == data # ensure the value has changed rv = client.get('/admin/model1/') data = rv.data.decode('utf-8') - ok_('change-success-1' in data) + assert 'change-success-1' in data # Test validation error rv = client.post('/admin/model1/ajax/update/', data={ @@ -220,7 +219,7 @@ def test_column_editable_list(): 'thantwentycharacterslongerthantwentycharacters'), }) data = rv.data.decode('utf-8') - eq_(rv.status_code, 500) + assert rv.status_code == 500 # Test invalid primary key rv = client.post('/admin/model1/ajax/update/', data={ @@ -228,7 +227,7 @@ def test_column_editable_list(): 'test1': 'problematic-input', }) data = rv.data.decode('utf-8') - eq_(rv.status_code, 500) + assert rv.status_code == 500 # Test editing column not in column_editable_list rv = client.post('/admin/model1/ajax/update/', data={ @@ -236,7 +235,7 @@ def test_column_editable_list(): 'test2': 'problematic-input', }) data = rv.data.decode('utf-8') - ok_('problematic-input' not in data) + assert 'problematic-input' not in data # Test in-line editing for relations view = CustomModelView(Model2, column_editable_list=['model1']) @@ -247,12 +246,12 @@ def test_column_editable_list(): 'model1': '3', }) data = rv.data.decode('utf-8') - ok_('Record was successfully saved.' == data) + assert 'Record was successfully saved.' == data # confirm the value has changed rv = client.get('/admin/model2/') data = rv.data.decode('utf-8') - ok_('test1_val_3' in data) + assert 'test1_val_3' in data def test_details_view(): @@ -280,32 +279,32 @@ def test_details_view(): # ensure link to details is hidden when can_view_details is disabled rv = client.get('/admin/model1/') data = rv.data.decode('utf-8') - ok_('/admin/model1/details/' not in data) + assert '/admin/model1/details/' not in data # ensure link to details view appears rv = client.get('/admin/model2/') data = rv.data.decode('utf-8') - ok_('/admin/model2/details/' in data) + assert '/admin/model2/details/' in data # test redirection when details are disabled rv = client.get('/admin/model1/details/?url=%2Fadmin%2Fmodel1%2F&id=3') - eq_(rv.status_code, 302) + assert rv.status_code == 302 # test if correct data appears in details view when enabled rv = client.get('/admin/model2/details/?url=%2Fadmin%2Fmodel2%2F&id=3') data = rv.data.decode('utf-8') - ok_('Char Field' in data) - ok_('char_field_val_3' in data) - ok_('Int Field' in data) - ok_('5000' in data) + assert 'Char Field' in data + assert 'char_field_val_3' in data + assert 'Int Field' in data + assert '5000' in data # test column_details_list rv = client.get('/admin/cf_view/details/?url=%2Fadmin%2Fcf_view%2F&id=3') data = rv.data.decode('utf-8') - ok_('Char Field' in data) - ok_('char_field_val_3' in data) - ok_('Int Field' not in data) - ok_('5000' not in data) + assert 'Char Field' in data + assert 'char_field_val_3' in data + assert 'Int Field' not in data + assert '5000' not in data def test_column_filters(): @@ -319,10 +318,10 @@ def test_column_filters(): view = CustomModelView(Model1, column_filters=['test1']) admin.add_view(view) - eq_(len(view._filters), 7) + assert len(view._filters) == 7 - eq_( - [(f['index'], f['operation']) for f in view._filter_groups[u'Test1']], + assert \ + [(f['index'], f['operation']) for f in view._filter_groups[u'Test1']] == \ [ (0, 'contains'), (1, 'not contains'), @@ -332,79 +331,78 @@ def test_column_filters(): (5, 'in list'), (6, 'not in list'), ] - ) # Make some test clients client = app.test_client() # string - equals rv = client.get('/admin/model1/?flt0_0=test1_val_1') - eq_(rv.status_code, 200) + assert rv.status_code == 200 data = rv.data.decode('utf-8') - ok_('test2_val_1' in data) - ok_('test1_val_2' not in data) + assert 'test2_val_1' in data + assert 'test1_val_2' not in data # string - not equal rv = client.get('/admin/model1/?flt0_1=test1_val_1') - eq_(rv.status_code, 200) + assert rv.status_code == 200 data = rv.data.decode('utf-8') - ok_('test2_val_1' not in data) - ok_('test1_val_2' in data) + assert 'test2_val_1' not in data + assert 'test1_val_2' in data # string - contains rv = client.get('/admin/model1/?flt0_2=test1_val_1') - eq_(rv.status_code, 200) + assert rv.status_code == 200 data = rv.data.decode('utf-8') - ok_('test2_val_1' in data) - ok_('test1_val_2' not in data) + assert 'test2_val_1' in data + assert 'test1_val_2' not in data # string - not contains rv = client.get('/admin/model1/?flt0_3=test1_val_1') - eq_(rv.status_code, 200) + assert rv.status_code == 200 data = rv.data.decode('utf-8') - ok_('test2_val_1' not in data) - ok_('test1_val_2' in data) + assert 'test2_val_1' not in data + assert 'test1_val_2' in data # string - empty rv = client.get('/admin/model1/?flt0_4=1') - eq_(rv.status_code, 200) + assert rv.status_code == 200 data = rv.data.decode('utf-8') - ok_('empty_obj' in data) - ok_('test1_val_1' not in data) - ok_('test1_val_2' not in data) + assert 'empty_obj' in data + assert 'test1_val_1' not in data + assert 'test1_val_2' not in data # string - not empty rv = client.get('/admin/model1/?flt0_4=0') - eq_(rv.status_code, 200) + assert rv.status_code == 200 data = rv.data.decode('utf-8') - ok_('empty_obj' not in data) - ok_('test1_val_1' in data) - ok_('test1_val_2' in data) + assert 'empty_obj' not in data + assert 'test1_val_1' in data + assert 'test1_val_2' in data # string - in list rv = client.get('/admin/model1/?flt0_5=test1_val_1%2Ctest1_val_2') - eq_(rv.status_code, 200) + assert rv.status_code == 200 data = rv.data.decode('utf-8') - ok_('test2_val_1' in data) - ok_('test2_val_2' in data) - ok_('test1_val_3' not in data) - ok_('test1_val_4' not in data) + assert 'test2_val_1' in data + assert 'test2_val_2' in data + assert 'test1_val_3' not in data + assert 'test1_val_4' not in data # string - not in list rv = client.get('/admin/model1/?flt0_6=test1_val_1%2Ctest1_val_2') - eq_(rv.status_code, 200) + assert rv.status_code == 200 data = rv.data.decode('utf-8') - ok_('test2_val_1' not in data) - ok_('test2_val_2' not in data) - ok_('test1_val_3' in data) - ok_('test1_val_4' in data) + assert 'test2_val_1' not in data + assert 'test2_val_2' not in data + assert 'test1_val_3' in data + assert 'test1_val_4' in data # Test int filter view = CustomModelView(Model2, column_filters=['int_field']) admin.add_view(view) - eq_( - [(f['index'], f['operation']) for f in view._filter_groups[u'Int Field']], + assert \ + [(f['index'], f['operation']) for f in view._filter_groups[u'Int Field']] == \ [ (0, 'equals'), (1, 'not equal'), @@ -414,150 +412,148 @@ def test_column_filters(): (5, 'in list'), (6, 'not in list'), ] - ) # integer - equals rv = client.get('/admin/model2/?flt0_0=5000') - eq_(rv.status_code, 200) + assert rv.status_code == 200 data = rv.data.decode('utf-8') - ok_('char_field_val_3' in data) - ok_('char_field_val_4' not in data) + assert 'char_field_val_3' in data + assert 'char_field_val_4' not in data # integer - equals (huge number) rv = client.get('/admin/model2/?flt0_0=6169453081680413441') - eq_(rv.status_code, 200) + assert rv.status_code == 200 data = rv.data.decode('utf-8') - ok_('char_field_val_5' in data) - ok_('char_field_val_4' not in data) + assert 'char_field_val_5' in data + assert 'char_field_val_4' not in data # integer - equals - test validation rv = client.get('/admin/model2/?flt0_0=badval') - eq_(rv.status_code, 200) + assert rv.status_code == 200 data = rv.data.decode('utf-8') - ok_('Invalid Filter Value' in data) + assert 'Invalid Filter Value' in data # integer - not equal rv = client.get('/admin/model2/?flt0_1=5000') - eq_(rv.status_code, 200) + assert rv.status_code == 200 data = rv.data.decode('utf-8') - ok_('char_field_val_3' not in data) - ok_('char_field_val_4' in data) + assert 'char_field_val_3' not in data + assert 'char_field_val_4' in data # integer - greater rv = client.get('/admin/model2/?flt0_2=6000') - eq_(rv.status_code, 200) + assert rv.status_code == 200 data = rv.data.decode('utf-8') - ok_('char_field_val_3' not in data) - ok_('char_field_val_4' in data) + assert 'char_field_val_3' not in data + assert 'char_field_val_4' in data # integer - smaller rv = client.get('/admin/model2/?flt0_3=6000') - eq_(rv.status_code, 200) + assert rv.status_code == 200 data = rv.data.decode('utf-8') - ok_('char_field_val_3' in data) - ok_('char_field_val_4' not in data) + assert 'char_field_val_3' in data + assert 'char_field_val_4' not in data # integer - empty rv = client.get('/admin/model2/?flt0_4=1') - eq_(rv.status_code, 200) + assert rv.status_code == 200 data = rv.data.decode('utf-8') - ok_('char_field_val_1' in data) - ok_('char_field_val_2' in data) - ok_('char_field_val_3' not in data) - ok_('char_field_val_4' not in data) + assert 'char_field_val_1' in data + assert 'char_field_val_2' in data + assert 'char_field_val_3' not in data + assert 'char_field_val_4' not in data # integer - not empty rv = client.get('/admin/model2/?flt0_4=0') - eq_(rv.status_code, 200) + assert rv.status_code == 200 data = rv.data.decode('utf-8') - ok_('char_field_val_1' not in data) - ok_('char_field_val_2' not in data) - ok_('char_field_val_3' in data) - ok_('char_field_val_4' in data) + assert 'char_field_val_1' not in data + assert 'char_field_val_2' not in data + assert 'char_field_val_3' in data + assert 'char_field_val_4' in data # integer - in list rv = client.get('/admin/model2/?flt0_5=5000%2C9000') - eq_(rv.status_code, 200) + assert rv.status_code == 200 data = rv.data.decode('utf-8') - ok_('char_field_val_1' not in data) - ok_('char_field_val_2' not in data) - ok_('char_field_val_3' in data) - ok_('char_field_val_4' in data) + assert 'char_field_val_1' not in data + assert 'char_field_val_2' not in data + assert 'char_field_val_3' in data + assert 'char_field_val_4' in data # integer - in list (huge number) rv = client.get('/admin/model2/?flt0_5=6169453081680413441') - eq_(rv.status_code, 200) + assert rv.status_code == 200 data = rv.data.decode('utf-8') - ok_('char_field_val_1' not in data) - ok_('char_field_val_5' in data) + assert 'char_field_val_1' not in data + assert 'char_field_val_5' in data # integer - in list - test validation rv = client.get('/admin/model2/?flt0_5=5000%2Cbadval') - eq_(rv.status_code, 200) + assert rv.status_code == 200 data = rv.data.decode('utf-8') - ok_('Invalid Filter Value' in data) + assert 'Invalid Filter Value' in data # integer - not in list rv = client.get('/admin/model2/?flt0_6=5000%2C9000') - eq_(rv.status_code, 200) + assert rv.status_code == 200 data = rv.data.decode('utf-8') - ok_('char_field_val_1' in data) - ok_('char_field_val_2' in data) - ok_('char_field_val_3' not in data) - ok_('char_field_val_4' not in data) + assert 'char_field_val_1' in data + assert 'char_field_val_2' in data + assert 'char_field_val_3' not in data + assert 'char_field_val_4' not in data # Test boolean filter view = CustomModelView(Model2, column_filters=['bool_field'], endpoint="_bools") admin.add_view(view) - eq_( - [(f['index'], f['operation']) for f in view._filter_groups[u'Bool Field']], + assert \ + [(f['index'], f['operation']) for f in view._filter_groups[u'Bool Field']] == \ [ (0, 'equals'), (1, 'not equal'), ] - ) # boolean - equals - Yes rv = client.get('/admin/_bools/?flt0_0=1') - eq_(rv.status_code, 200) + assert rv.status_code == 200 data = rv.data.decode('utf-8') - ok_('char_field_val_1' in data) - ok_('char_field_val_2' not in data) - ok_('char_field_val_3' not in data) + assert 'char_field_val_1' in data + assert 'char_field_val_2' not in data + assert 'char_field_val_3' not in data # boolean - equals - No rv = client.get('/admin/_bools/?flt0_0=0') - eq_(rv.status_code, 200) + assert rv.status_code == 200 data = rv.data.decode('utf-8') - ok_('char_field_val_1' not in data) - ok_('char_field_val_2' in data) - ok_('char_field_val_3' in data) + assert 'char_field_val_1' not in data + assert 'char_field_val_2' in data + assert 'char_field_val_3' in data # boolean - not equals - Yes rv = client.get('/admin/_bools/?flt0_1=1') - eq_(rv.status_code, 200) + assert rv.status_code == 200 data = rv.data.decode('utf-8') - ok_('char_field_val_1' not in data) - ok_('char_field_val_2' in data) - ok_('char_field_val_3' in data) + assert 'char_field_val_1' not in data + assert 'char_field_val_2' in data + assert 'char_field_val_3' in data # boolean - not equals - No rv = client.get('/admin/_bools/?flt0_1=0') - eq_(rv.status_code, 200) + assert rv.status_code == 200 data = rv.data.decode('utf-8') - ok_('char_field_val_1' in data) - ok_('char_field_val_2' not in data) - ok_('char_field_val_3' not in data) + assert 'char_field_val_1' in data + assert 'char_field_val_2' not in data + assert 'char_field_val_3' not in data # Test float filter view = CustomModelView(Model2, column_filters=['float_field'], endpoint="_float") admin.add_view(view) - eq_( - [(f['index'], f['operation']) for f in view._filter_groups[u'Float Field']], + assert \ + [(f['index'], f['operation']) for f in view._filter_groups[u'Float Field']] == \ [ (0, 'equals'), (1, 'not equal'), @@ -567,83 +563,82 @@ def test_column_filters(): (5, 'in list'), (6, 'not in list'), ] - ) # float - equals rv = client.get('/admin/_float/?flt0_0=25.9') - eq_(rv.status_code, 200) + assert rv.status_code == 200 data = rv.data.decode('utf-8') - ok_('char_field_val_3' in data) - ok_('char_field_val_4' not in data) + assert 'char_field_val_3' in data + assert 'char_field_val_4' not in data # float - equals - test validation rv = client.get('/admin/_float/?flt0_0=badval') - eq_(rv.status_code, 200) + assert rv.status_code == 200 data = rv.data.decode('utf-8') - ok_('Invalid Filter Value' in data) + assert 'Invalid Filter Value' in data # float - not equal rv = client.get('/admin/_float/?flt0_1=25.9') - eq_(rv.status_code, 200) + assert rv.status_code == 200 data = rv.data.decode('utf-8') - ok_('char_field_val_3' not in data) - ok_('char_field_val_4' in data) + assert 'char_field_val_3' not in data + assert 'char_field_val_4' in data # float - greater rv = client.get('/admin/_float/?flt0_2=60.5') - eq_(rv.status_code, 200) + assert rv.status_code == 200 data = rv.data.decode('utf-8') - ok_('char_field_val_3' not in data) - ok_('char_field_val_4' in data) + assert 'char_field_val_3' not in data + assert 'char_field_val_4' in data # float - smaller rv = client.get('/admin/_float/?flt0_3=60.5') - eq_(rv.status_code, 200) + assert rv.status_code == 200 data = rv.data.decode('utf-8') - ok_('char_field_val_3' in data) - ok_('char_field_val_4' not in data) + assert 'char_field_val_3' in data + assert 'char_field_val_4' not in data # float - empty rv = client.get('/admin/_float/?flt0_4=1') - eq_(rv.status_code, 200) + assert rv.status_code == 200 data = rv.data.decode('utf-8') - ok_('char_field_val_1' in data) - ok_('char_field_val_2' in data) - ok_('char_field_val_3' not in data) - ok_('char_field_val_4' not in data) + assert 'char_field_val_1' in data + assert 'char_field_val_2' in data + assert 'char_field_val_3' not in data + assert 'char_field_val_4' not in data # float - not empty rv = client.get('/admin/_float/?flt0_4=0') - eq_(rv.status_code, 200) + assert rv.status_code == 200 data = rv.data.decode('utf-8') - ok_('char_field_val_1' not in data) - ok_('char_field_val_2' not in data) - ok_('char_field_val_3' in data) - ok_('char_field_val_4' in data) + assert 'char_field_val_1' not in data + assert 'char_field_val_2' not in data + assert 'char_field_val_3' in data + assert 'char_field_val_4' in data # float - in list rv = client.get('/admin/_float/?flt0_5=25.9%2C75.5') - eq_(rv.status_code, 200) + assert rv.status_code == 200 data = rv.data.decode('utf-8') - ok_('char_field_val_1' not in data) - ok_('char_field_val_2' not in data) - ok_('char_field_val_3' in data) - ok_('char_field_val_4' in data) + assert 'char_field_val_1' not in data + assert 'char_field_val_2' not in data + assert 'char_field_val_3' in data + assert 'char_field_val_4' in data # float - in list - test validation rv = client.get('/admin/_float/?flt0_5=25.9%2Cbadval') - eq_(rv.status_code, 200) + assert rv.status_code == 200 data = rv.data.decode('utf-8') - ok_('Invalid Filter Value' in data) + assert 'Invalid Filter Value' in data # float - not in list rv = client.get('/admin/_float/?flt0_6=25.9%2C75.5') - eq_(rv.status_code, 200) + assert rv.status_code == 200 data = rv.data.decode('utf-8') - ok_('char_field_val_1' in data) - ok_('char_field_val_2' in data) - ok_('char_field_val_3' not in data) - ok_('char_field_val_4' not in data) + assert 'char_field_val_1' in data + assert 'char_field_val_2' in data + assert 'char_field_val_3' not in data + assert 'char_field_val_4' not in data # Test date, time, and datetime filters view = CustomModelView(Model1, @@ -651,8 +646,8 @@ def test_column_filters(): endpoint="_datetime") admin.add_view(view) - eq_( - [(f['index'], f['operation']) for f in view._filter_groups[u'Date Field']], + assert \ + [(f['index'], f['operation']) for f in view._filter_groups[u'Date Field']] == \ [ (0, 'equals'), (1, 'not equal'), @@ -662,10 +657,9 @@ def test_column_filters(): (5, 'not between'), (6, 'empty'), ] - ) - eq_( - [(f['index'], f['operation']) for f in view._filter_groups[u'Datetime Field']], + assert \ + [(f['index'], f['operation']) for f in view._filter_groups[u'Datetime Field']] == \ [ (7, 'equals'), (8, 'not equal'), @@ -675,10 +669,9 @@ def test_column_filters(): (12, 'not between'), (13, 'empty'), ] - ) - eq_( - [(f['index'], f['operation']) for f in view._filter_groups[u'Timeonly Field']], + assert \ + [(f['index'], f['operation']) for f in view._filter_groups[u'Timeonly Field']] == \ [ (14, 'equals'), (15, 'not equal'), @@ -688,181 +681,180 @@ def test_column_filters(): (19, 'not between'), (20, 'empty'), ] - ) # date - equals rv = client.get('/admin/_datetime/?flt0_0=2014-11-17') - eq_(rv.status_code, 200) + assert rv.status_code == 200 data = rv.data.decode('utf-8') - ok_('date_obj1' in data) - ok_('date_obj2' not in data) + assert 'date_obj1' in data + assert 'date_obj2' not in data # date - not equal rv = client.get('/admin/_datetime/?flt0_1=2014-11-17') - eq_(rv.status_code, 200) + assert rv.status_code == 200 data = rv.data.decode('utf-8') - ok_('date_obj1' not in data) - ok_('date_obj2' in data) + assert 'date_obj1' not in data + assert 'date_obj2' in data # date - greater rv = client.get('/admin/_datetime/?flt0_2=2014-11-16') - eq_(rv.status_code, 200) + assert rv.status_code == 200 data = rv.data.decode('utf-8') - ok_('date_obj1' in data) - ok_('date_obj2' not in data) + assert 'date_obj1' in data + assert 'date_obj2' not in data # date - smaller rv = client.get('/admin/_datetime/?flt0_3=2014-11-16') - eq_(rv.status_code, 200) + assert rv.status_code == 200 data = rv.data.decode('utf-8') - ok_('date_obj1' not in data) - ok_('date_obj2' in data) + assert 'date_obj1' not in data + assert 'date_obj2' in data # date - between rv = client.get('/admin/_datetime/?flt0_4=2014-11-13+to+2014-11-20') - eq_(rv.status_code, 200) + assert rv.status_code == 200 data = rv.data.decode('utf-8') - ok_('date_obj1' in data) - ok_('date_obj2' not in data) + assert 'date_obj1' in data + assert 'date_obj2' not in data # date - not between rv = client.get('/admin/_datetime/?flt0_5=2014-11-13+to+2014-11-20') - eq_(rv.status_code, 200) + assert rv.status_code == 200 data = rv.data.decode('utf-8') - ok_('date_obj1' not in data) - ok_('date_obj2' in data) + assert 'date_obj1' not in data + assert 'date_obj2' in data # date - empty rv = client.get('/admin/_datetime/?flt0_6=1') - eq_(rv.status_code, 200) + assert rv.status_code == 200 data = rv.data.decode('utf-8') - ok_('test1_val_1' in data) - ok_('date_obj1' not in data) - ok_('date_obj2' not in data) + assert 'test1_val_1' in data + assert 'date_obj1' not in data + assert 'date_obj2' not in data # date - empty rv = client.get('/admin/_datetime/?flt0_6=0') - eq_(rv.status_code, 200) + assert rv.status_code == 200 data = rv.data.decode('utf-8') - ok_('test1_val_1' not in data) - ok_('date_obj1' in data) - ok_('date_obj2' in data) + assert 'test1_val_1' not in data + assert 'date_obj1' in data + assert 'date_obj2' in data # datetime - equals rv = client.get('/admin/_datetime/?flt0_7=2014-04-03+01%3A09%3A00') - eq_(rv.status_code, 200) + assert rv.status_code == 200 data = rv.data.decode('utf-8') - ok_('datetime_obj1' in data) - ok_('datetime_obj2' not in data) + assert 'datetime_obj1' in data + assert 'datetime_obj2' not in data # datetime - not equal rv = client.get('/admin/_datetime/?flt0_8=2014-04-03+01%3A09%3A00') - eq_(rv.status_code, 200) + assert rv.status_code == 200 data = rv.data.decode('utf-8') - ok_('datetime_obj1' not in data) - ok_('datetime_obj2' in data) + assert 'datetime_obj1' not in data + assert 'datetime_obj2' in data # datetime - greater rv = client.get('/admin/_datetime/?flt0_9=2014-04-03+01%3A08%3A00') - eq_(rv.status_code, 200) + assert rv.status_code == 200 data = rv.data.decode('utf-8') - ok_('datetime_obj1' in data) - ok_('datetime_obj2' not in data) + assert 'datetime_obj1' in data + assert 'datetime_obj2' not in data # datetime - smaller rv = client.get('/admin/_datetime/?flt0_10=2014-04-03+01%3A08%3A00') - eq_(rv.status_code, 200) + assert rv.status_code == 200 data = rv.data.decode('utf-8') - ok_('datetime_obj1' not in data) - ok_('datetime_obj2' in data) + assert 'datetime_obj1' not in data + assert 'datetime_obj2' in data # datetime - between rv = client.get('/admin/_datetime/?flt0_11=2014-04-02+00%3A00%3A00+to+2014-11-20+23%3A59%3A59') - eq_(rv.status_code, 200) + assert rv.status_code == 200 data = rv.data.decode('utf-8') - ok_('datetime_obj1' in data) - ok_('datetime_obj2' not in data) + assert 'datetime_obj1' in data + assert 'datetime_obj2' not in data # datetime - not between rv = client.get('/admin/_datetime/?flt0_12=2014-04-02+00%3A00%3A00+to+2014-11-20+23%3A59%3A59') - eq_(rv.status_code, 200) + assert rv.status_code == 200 data = rv.data.decode('utf-8') - ok_('datetime_obj1' not in data) - ok_('datetime_obj2' in data) + assert 'datetime_obj1' not in data + assert 'datetime_obj2' in data # datetime - empty rv = client.get('/admin/_datetime/?flt0_13=1') - eq_(rv.status_code, 200) + assert rv.status_code == 200 data = rv.data.decode('utf-8') - ok_('test1_val_1' in data) - ok_('datetime_obj1' not in data) - ok_('datetime_obj2' not in data) + assert 'test1_val_1' in data + assert 'datetime_obj1' not in data + assert 'datetime_obj2' not in data # datetime - not empty rv = client.get('/admin/_datetime/?flt0_13=0') - eq_(rv.status_code, 200) + assert rv.status_code == 200 data = rv.data.decode('utf-8') - ok_('test1_val_1' not in data) - ok_('datetime_obj1' in data) - ok_('datetime_obj2' in data) + assert 'test1_val_1' not in data + assert 'datetime_obj1' in data + assert 'datetime_obj2' in data # time - equals rv = client.get('/admin/_datetime/?flt0_14=11%3A10%3A09') - eq_(rv.status_code, 200) + assert rv.status_code == 200 data = rv.data.decode('utf-8') - ok_('timeonly_obj1' in data) - ok_('timeonly_obj2' not in data) + assert 'timeonly_obj1' in data + assert 'timeonly_obj2' not in data # time - not equal rv = client.get('/admin/_datetime/?flt0_15=11%3A10%3A09') - eq_(rv.status_code, 200) + assert rv.status_code == 200 data = rv.data.decode('utf-8') - ok_('timeonly_obj1' not in data) - ok_('timeonly_obj2' in data) + assert 'timeonly_obj1' not in data + assert 'timeonly_obj2' in data # time - greater rv = client.get('/admin/_datetime/?flt0_16=11%3A09%3A09') - eq_(rv.status_code, 200) + assert rv.status_code == 200 data = rv.data.decode('utf-8') - ok_('timeonly_obj1' in data) - ok_('timeonly_obj2' not in data) + assert 'timeonly_obj1' in data + assert 'timeonly_obj2' not in data # time - smaller rv = client.get('/admin/_datetime/?flt0_17=11%3A09%3A09') - eq_(rv.status_code, 200) + assert rv.status_code == 200 data = rv.data.decode('utf-8') - ok_('timeonly_obj1' not in data) - ok_('timeonly_obj2' in data) + assert 'timeonly_obj1' not in data + assert 'timeonly_obj2' in data # time - between rv = client.get('/admin/_datetime/?flt0_18=10%3A40%3A00+to+11%3A50%3A59') - eq_(rv.status_code, 200) + assert rv.status_code == 200 data = rv.data.decode('utf-8') - ok_('timeonly_obj1' in data) - ok_('timeonly_obj2' not in data) + assert 'timeonly_obj1' in data + assert 'timeonly_obj2' not in data # time - not between rv = client.get('/admin/_datetime/?flt0_19=10%3A40%3A00+to+11%3A50%3A59') - eq_(rv.status_code, 200) + assert rv.status_code == 200 data = rv.data.decode('utf-8') - ok_('timeonly_obj1' not in data) - ok_('timeonly_obj2' in data) + assert 'timeonly_obj1' not in data + assert 'timeonly_obj2' in data # time - empty rv = client.get('/admin/_datetime/?flt0_20=1') - eq_(rv.status_code, 200) + assert rv.status_code == 200 data = rv.data.decode('utf-8') - ok_('test1_val_1' in data) - ok_('timeonly_obj1' not in data) - ok_('timeonly_obj2' not in data) + assert 'test1_val_1' in data + assert 'timeonly_obj1' not in data + assert 'timeonly_obj2' not in data # time - not empty rv = client.get('/admin/_datetime/?flt0_20=0') - eq_(rv.status_code, 200) + assert rv.status_code == 200 data = rv.data.decode('utf-8') - ok_('test1_val_1' not in data) - ok_('timeonly_obj1' in data) - ok_('timeonly_obj2' in data) + assert 'test1_val_1' not in data + assert 'timeonly_obj1' in data + assert 'timeonly_obj2' in data def test_default_sort(): @@ -873,16 +865,16 @@ def test_default_sort(): M1('b', 1).save() M1('a', 2).save() - eq_(M1.select().count(), 3) + assert M1.select().count() == 3 view = CustomModelView(M1, column_default_sort='test1') admin.add_view(view) _, data = view.get_list(0, None, None, None, None) - eq_(data[0].test1, 'a') - eq_(data[1].test1, 'b') - eq_(data[2].test1, 'c') + assert data[0].test1 == 'a' + assert data[1].test1 == 'b' + assert data[2].test1 == 'c' # test default sort with multiple columns order = [('test2', False), ('test1', False)] @@ -891,10 +883,10 @@ def test_default_sort(): _, data = view2.get_list(0, None, None, None, None) - eq_(len(data), 3) - eq_(data[0].test1, 'b') - eq_(data[1].test1, 'c') - eq_(data[2].test1, 'a') + assert len(data) == 3 + assert data[0].test1 == 'b' + assert data[1].test1 == 'c' + assert data[2].test1 == 'a' def test_extra_fields(): @@ -913,14 +905,14 @@ def test_extra_fields(): client = app.test_client() rv = client.get('/admin/model1/new/') - eq_(rv.status_code, 200) + assert rv.status_code == 200 # Check presence and order data = rv.data.decode('utf-8') - ok_('Extra Field' in data) + assert 'Extra Field' in data pos1 = data.find('Extra Field') pos2 = data.find('Test1') - ok_(pos2 < pos1) + assert pos2 < pos1 def test_custom_form_base(): @@ -937,10 +929,10 @@ class TestForm(form.BaseForm): ) admin.add_view(view) - ok_(hasattr(view._create_form_class, 'test1')) + assert hasattr(view._create_form_class, 'test1') create_form = view.create_form() - ok_(isinstance(create_form, TestForm)) + assert isinstance(create_form, TestForm) def test_form_args(): @@ -963,10 +955,10 @@ class Model(BaseModel): # ensure shared field_args don't create duplicate validators create_form = view.create_form() - eq_(len(create_form.test.validators), 2) + assert len(create_form.test.validators) == 2 edit_form = view.edit_form() - eq_(len(edit_form.test.validators), 2) + assert len(edit_form.test.validators) == 2 def test_ajax_fk(): @@ -1000,7 +992,7 @@ class Model2(BaseModel): ) admin.add_view(view) - ok_(u'model1' in view._form_ajax_refs) + assert u'model1' in view._form_ajax_refs model = Model1(test1=u'first', test2=u'') model.save() @@ -1010,42 +1002,42 @@ class Model2(BaseModel): # Check loader loader = view._form_ajax_refs[u'model1'] mdl = loader.get_one(model.id) - eq_(mdl.test1, model.test1) + assert mdl.test1 == model.test1 items = loader.get_list(u'fir') - eq_(len(items), 1) - eq_(items[0].id, model.id) + assert len(items) == 1 + assert items[0].id == model.id items = loader.get_list(u'bar') - eq_(len(items), 1) - eq_(items[0].test1, u'foo') + assert len(items) == 1 + assert items[0].test1 == u'foo' # Check form generation form = view.create_form() - eq_(form.model1.__class__.__name__, u'AjaxSelectField') + assert form.model1.__class__.__name__ == u'AjaxSelectField' with app.test_request_context('/admin/view/'): - ok_(u'value=""' not in form.model1()) + assert u'value=""' not in form.model1() form.model1.data = model - 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()) + assert (u'data-json="[%s, "first"]"' % as_unicode(model.id) in form.model1() or + u'data-json="[%s, "first"]"' % as_unicode(model.id)) + assert u'value="%s"' % as_unicode(model.id) in form.model1() # Check querying client = app.test_client() req = client.get(u'/admin/view/ajax/lookup/?name=model1&query=foo') - eq_(req.data, u'[[%s, "foo"]]' % model2.id) + assert req.data == u'[[%s, "foo"]]' % model2.id # Check submitting client.post('/admin/view/new/', data={u'model1': as_unicode(model.id)}) mdl = Model2.select().first() - ok_(mdl is not None) - ok_(mdl.model1 is not None) - eq_(mdl.model1.id, model.id) - eq_(mdl.model1.test1, u'first') + assert mdl is not None + assert mdl.model1 is not None + assert mdl.model1.id == model.id + assert mdl.model1.test1 == u'first' def test_export_csv(): @@ -1066,10 +1058,10 @@ def test_export_csv(): # test export_max_rows rv = client.get('/admin/row_limit_2/export/csv/') data = rv.data.decode('utf-8') - eq_(rv.status_code, 200) - ok_("Test1,Test2\r\n" - "test1_val_1,test2_val_1\r\n" - "test1_val_2,test2_val_2\r\n" == data) + assert rv.status_code == 200 + assert "Test1,Test2\r\n" + \ + "test1_val_1,test2_val_1\r\n" + \ + "test1_val_2,test2_val_2\r\n" == data view = CustomModelView(Model1, can_export=True, column_list=['test1', 'test2'], @@ -1079,5 +1071,5 @@ def test_export_csv(): # test row limit without export_max_rows rv = client.get('/admin/no_row_limit/export/csv/') data = rv.data.decode('utf-8') - eq_(rv.status_code, 200) - ok_(len(data.splitlines()) > 21) + assert rv.status_code == 200 + assert len(data.splitlines()) > 21 diff --git a/flask_admin/tests/pymongo/test_basic.py b/flask_admin/tests/pymongo/test_basic.py index a58cde3ecd..c7d598607c 100644 --- a/flask_admin/tests/pymongo/test_basic.py +++ b/flask_admin/tests/pymongo/test_basic.py @@ -1,5 +1,3 @@ -from nose.tools import eq_, ok_ - from wtforms import form, fields from flask_admin.contrib.pymongo import ModelView @@ -30,54 +28,54 @@ def test_model(): # Drop existing data (if any) db.test.delete_many({}) - eq_(view.name, 'Test') - eq_(view.endpoint, 'testview') + assert view.name == 'Test' + assert view.endpoint == 'testview' - ok_('test1' in view._sortable_columns) - ok_('test2' in view._sortable_columns) + assert 'test1' in view._sortable_columns + assert 'test2' in view._sortable_columns - ok_(view._create_form_class is not None) - ok_(view._edit_form_class is not None) - eq_(view._search_supported, False) - eq_(view._filters, None) + assert view._create_form_class is not None + assert view._edit_form_class is not None + assert not view._search_supported + assert view._filters is None # Make some test clients client = app.test_client() rv = client.get('/admin/testview/') - eq_(rv.status_code, 200) + assert rv.status_code == 200 rv = client.get('/admin/testview/new/') - eq_(rv.status_code, 200) + assert rv.status_code == 200 rv = client.post('/admin/testview/new/', data=dict(test1='test1large', test2='test2')) - eq_(rv.status_code, 302) + assert rv.status_code == 302 model = db.test.find()[0] print(model) - eq_(model['test1'], 'test1large') - eq_(model['test2'], 'test2') + assert model['test1'] == 'test1large' + assert model['test2'] == 'test2' rv = client.get('/admin/testview/') - eq_(rv.status_code, 200) - ok_('test1large' in rv.data.decode('utf-8')) + assert rv.status_code == 200 + assert 'test1large' in rv.data.decode('utf-8') url = '/admin/testview/edit/?id=%s' % model['_id'] rv = client.get(url) - eq_(rv.status_code, 200) + assert rv.status_code == 200 rv = client.post(url, data=dict(test1='test1small', test2='test2large')) - eq_(rv.status_code, 302) + assert rv.status_code == 302 print(db.test.find()[0]) model = db.test.find()[0] - eq_(model['test1'], 'test1small') - eq_(model['test2'], 'test2large') + assert model['test1'] == 'test1small' + assert model['test2'] == 'test2large' url = '/admin/testview/delete/?id=%s' % model['_id'] rv = client.post(url) - eq_(rv.status_code, 302) - eq_(db.test.count(), 0) + assert rv.status_code == 302 + assert db.test.count() == 0 diff --git a/flask_admin/tests/sqla/test_basic.py b/flask_admin/tests/sqla/test_basic.py index 0e9a918522..a2b31699c0 100644 --- a/flask_admin/tests/sqla/test_basic.py +++ b/flask_admin/tests/sqla/test_basic.py @@ -1,4 +1,5 @@ -from nose.tools import eq_, ok_, raises, assert_true +import re +import pytest from wtforms import fields, validators @@ -163,49 +164,49 @@ def test_model(): admin.add_view(view) - eq_(view.model, Model1) - eq_(view.name, 'Model1') - eq_(view.endpoint, 'model1') + assert view.model == Model1 + assert view.name == 'Model1' + assert view.endpoint == 'model1' - eq_(view._primary_key, 'id') + assert view._primary_key == 'id' - ok_('test1' in view._sortable_columns) - ok_('test2' in view._sortable_columns) - ok_('test3' in view._sortable_columns) - ok_('test4' in view._sortable_columns) + assert 'test1' in view._sortable_columns + assert 'test2' in view._sortable_columns + assert 'test3' in view._sortable_columns + assert 'test4' in view._sortable_columns - ok_(view._create_form_class is not None) - ok_(view._edit_form_class is not None) - eq_(view._search_supported, False) - eq_(view._filters, None) + assert view._create_form_class is not None + assert view._edit_form_class is not None + assert not view._search_supported + assert view._filters is None # Verify form - eq_(view._create_form_class.test1.field_class, fields.StringField) - eq_(view._create_form_class.test2.field_class, fields.StringField) - eq_(view._create_form_class.test3.field_class, fields.TextAreaField) - eq_(view._create_form_class.test4.field_class, fields.TextAreaField) - eq_(view._create_form_class.email_field.field_class, fields.StringField) - eq_(view._create_form_class.choice_field.field_class, Select2Field) - eq_(view._create_form_class.enum_field.field_class, Select2Field) - eq_(view._create_form_class.sqla_utils_choice.field_class, Select2Field) - eq_(view._create_form_class.sqla_utils_enum.field_class, Select2Field) - eq_(view._create_form_class.sqla_utils_arrow.field_class, DateTimeField) - eq_(view._create_form_class.sqla_utils_uuid.field_class, fields.StringField) - eq_(view._create_form_class.sqla_utils_url.field_class, fields.StringField) - eq_(view._create_form_class.sqla_utils_ip_address.field_class, fields.StringField) - eq_(view._create_form_class.sqla_utils_currency.field_class, fields.StringField) - eq_(view._create_form_class.sqla_utils_color.field_class, fields.StringField) + assert view._create_form_class.test1.field_class == fields.StringField + assert view._create_form_class.test2.field_class == fields.StringField + assert view._create_form_class.test3.field_class == fields.TextAreaField + assert view._create_form_class.test4.field_class == fields.TextAreaField + assert view._create_form_class.email_field.field_class == fields.StringField + assert view._create_form_class.choice_field.field_class == Select2Field + assert view._create_form_class.enum_field.field_class == Select2Field + assert view._create_form_class.sqla_utils_choice.field_class == Select2Field + assert view._create_form_class.sqla_utils_enum.field_class == Select2Field + assert view._create_form_class.sqla_utils_arrow.field_class == DateTimeField + assert view._create_form_class.sqla_utils_uuid.field_class == fields.StringField + assert view._create_form_class.sqla_utils_url.field_class == fields.StringField + assert view._create_form_class.sqla_utils_ip_address.field_class == fields.StringField + assert view._create_form_class.sqla_utils_currency.field_class == fields.StringField + assert view._create_form_class.sqla_utils_color.field_class == fields.StringField # Make some test clients client = app.test_client() # check that we can retrieve a list view rv = client.get('/admin/model1/') - eq_(rv.status_code, 200) + assert rv.status_code == 200 # check that we can retrieve a 'create' view rv = client.get('/admin/model1/new/') - eq_(rv.status_code, 200) + assert rv.status_code == 200 # create a new record uuid_obj = uuid.uuid4() @@ -228,38 +229,38 @@ def test_model(): sqla_utils_color='#f0f0f0', ) ) - eq_(rv.status_code, 302) + assert rv.status_code == 302 # check that the new record was persisted model = db.session.query(Model1).first() - eq_(model.test1, u'test1large') - eq_(model.test2, u'test2') - eq_(model.test3, u'') - eq_(model.test4, u'') - eq_(model.email_field, u'test@test.com') - eq_(model.choice_field, u'choice-1') - eq_(model.enum_field, u'model1_v1') - eq_(model.sqla_utils_choice, u'choice-1') - eq_(model.sqla_utils_enum.value, 1) - eq_(model.sqla_utils_arrow, arrow.get('2018-10-27 14:17:00')) - eq_(model.sqla_utils_uuid, uuid_obj) - eq_(model.sqla_utils_url, "http://www.example.com") - eq_(str(model.sqla_utils_ip_address), '127.0.0.1') - eq_(str(model.sqla_utils_currency), 'USD') - eq_(model.sqla_utils_color.hex, '#f0f0f0') + assert model.test1 == u'test1large' + assert model.test2 == u'test2' + assert model.test3 == u'' + assert model.test4 == u'' + assert model.email_field == u'test@test.com' + assert model.choice_field == u'choice-1' + assert model.enum_field == u'model1_v1' + assert model.sqla_utils_choice == u'choice-1' + assert model.sqla_utils_enum.value == 1 + assert model.sqla_utils_arrow == arrow.get('2018-10-27 14:17:00') + assert model.sqla_utils_uuid == uuid_obj + assert model.sqla_utils_url == "http://www.example.com" + assert str(model.sqla_utils_ip_address) == '127.0.0.1' + assert str(model.sqla_utils_currency) == 'USD' + assert model.sqla_utils_color.hex == '#f0f0f0' # check that the new record shows up on the list view rv = client.get('/admin/model1/') - eq_(rv.status_code, 200) - ok_(u'test1large' in rv.data.decode('utf-8')) + assert rv.status_code == 200 + assert u'test1large' in rv.data.decode('utf-8') # check that we can retrieve an edit view url = '/admin/model1/edit/?id=%s' % model.id rv = client.get(url) - eq_(rv.status_code, 200) + assert rv.status_code == 200 # verify that midnight does not show as blank - ok_(u'00:00:00' in rv.data.decode('utf-8')) + assert u'00:00:00' in rv.data.decode('utf-8') # edit the record new_uuid_obj = uuid.uuid4() @@ -278,34 +279,34 @@ def test_model(): sqla_utils_currency='', sqla_utils_color='', )) - eq_(rv.status_code, 302) + assert rv.status_code == 302 # check that the changes were persisted model = db.session.query(Model1).first() - eq_(model.test1, 'test1small') - eq_(model.test2, 'test2large') - eq_(model.test3, '') - eq_(model.test4, '') - eq_(model.email_field, u'test2@test.com') - eq_(model.choice_field, None) - eq_(model.enum_field, None) - eq_(model.sqla_utils_choice, None) - eq_(model.sqla_utils_enum, None) - eq_(model.sqla_utils_arrow, None) - eq_(model.sqla_utils_uuid, new_uuid_obj) - eq_(model.sqla_utils_url, None) - eq_(model.sqla_utils_ip_address, None) - eq_(model.sqla_utils_currency, None) - eq_(model.sqla_utils_color, None) + assert model.test1 == 'test1small' + assert model.test2 == 'test2large' + assert model.test3 == '' + assert model.test4 == '' + assert model.email_field == u'test2@test.com' + assert model.choice_field is None + assert model.enum_field is None + assert model.sqla_utils_choice is None + assert model.sqla_utils_enum is None + assert model.sqla_utils_arrow is None + assert model.sqla_utils_uuid == new_uuid_obj + assert model.sqla_utils_url is None + assert model.sqla_utils_ip_address is None + assert model.sqla_utils_currency is None + assert model.sqla_utils_color is None # check that the model can be deleted url = '/admin/model1/delete/?id=%s' % model.id rv = client.post(url) - eq_(rv.status_code, 302) - eq_(db.session.query(Model1).count(), 0) + assert rv.status_code == 302 + assert db.session.query(Model1).count() == 0 -@raises(Exception) +@pytest.mark.xfail(raises=Exception) def test_no_pk(): app, db, admin = setup() @@ -327,15 +328,15 @@ def test_list_columns(): column_labels=dict(test1='Column1')) admin.add_view(view) - eq_(len(view._list_columns), 2) - eq_(view._list_columns, [('test1', 'Column1'), ('test3', 'Test3')]) + assert len(view._list_columns) == 2 + assert view._list_columns == [('test1', 'Column1'), ('test3', 'Test3')] client = app.test_client() rv = client.get('/admin/model1/') data = rv.data.decode('utf-8') - ok_('Column1' in data) - ok_('Test2' not in data) + assert 'Column1' in data + assert 'Test2' not in data # test column_list with a list of SQLAlchemy columns view2 = CustomModelView(Model1, db.session, endpoint='model1_2', @@ -343,13 +344,13 @@ def test_list_columns(): column_labels=dict(test1='Column1')) admin.add_view(view2) - eq_(len(view2._list_columns), 2) - eq_(view2._list_columns, [('test1', 'Column1'), ('test3', 'Test3')]) + assert len(view2._list_columns) == 2 + assert view2._list_columns == [('test1', 'Column1'), ('test3', 'Test3')] rv = client.get('/admin/model1_2/') data = rv.data.decode('utf-8') - ok_('Column1' in data) - ok_('Test2' not in data) + assert 'Column1' in data + assert 'Test2' not in data def test_complex_list_columns(): @@ -370,9 +371,9 @@ def test_complex_list_columns(): client = app.test_client() rv = client.get('/admin/model2/') - eq_(rv.status_code, 200) + assert rv.status_code == 200 data = rv.data.decode('utf-8') - ok_('model1_val1' in data) + assert 'model1_val1' in data def test_exclude_columns(): @@ -388,18 +389,17 @@ def test_exclude_columns(): ) admin.add_view(view) - eq_( - view._list_columns, + assert \ + view._list_columns == \ [('test1', 'Test1'), ('test3', 'Test3'), ('bool_field', 'Bool Field'), ('email_field', 'Email Field'), ('choice_field', 'Choice Field')] - ) client = app.test_client() rv = client.get('/admin/model1/') data = rv.data.decode('utf-8') - ok_('Test1' in data) - ok_('Test2' not in data) + assert 'Test1' in data + assert 'Test2' not in data def test_column_searchable_list(): @@ -411,13 +411,13 @@ def test_column_searchable_list(): column_searchable_list=['string_field', 'int_field']) admin.add_view(view) - eq_(view._search_supported, True) - eq_(len(view._search_fields), 2) + assert view._search_supported + assert len(view._search_fields) == 2 - ok_(isinstance(view._search_fields[0][0], db.Column)) - ok_(isinstance(view._search_fields[1][0], db.Column)) - eq_(view._search_fields[0][0].name, 'string_field') - eq_(view._search_fields[1][0].name, 'int_field') + assert isinstance(view._search_fields[0][0], db.Column) + assert isinstance(view._search_fields[1][0], db.Column) + assert view._search_fields[0][0].name == 'string_field' + assert view._search_fields[1][0].name == 'int_field' db.session.add(Model2('model1-test', 5000)) db.session.add(Model2('model2-test', 9000)) @@ -427,13 +427,13 @@ def test_column_searchable_list(): rv = client.get('/admin/model2/?search=model1') data = rv.data.decode('utf-8') - ok_('model1-test' in data) - ok_('model2-test' not in data) + assert 'model1-test' in data + assert 'model2-test' not in data rv = client.get('/admin/model2/?search=9000') data = rv.data.decode('utf-8') - ok_('model1-test' not in data) - ok_('model2-test' in data) + assert 'model1-test' not in data + assert 'model2-test' in data def test_extra_args_search(): @@ -454,7 +454,7 @@ def test_extra_args_search(): # check that extra args in the url are propagated as hidden fields in the search form rv = client.get('/admin/model1/?search=model1&foo=bar') data = rv.data.decode('utf-8') - ok_('' in data) + assert '' in data def test_extra_args_filter(): @@ -474,7 +474,7 @@ def test_extra_args_filter(): # check that extra args in the url are propagated as hidden fields in the form rv = client.get('/admin/model2/?flt1_0=5000&foo=bar') data = rv.data.decode('utf-8') - ok_('' in data) + assert '' in data def test_complex_searchable_list(): @@ -499,8 +499,8 @@ def test_complex_searchable_list(): # test relation string - 'model1.test1' rv = client.get('/admin/model2/?search=model1-test1') data = rv.data.decode('utf-8') - ok_('model2-test1-val' in data) - ok_('model2-test2-val' not in data) + assert 'model2-test1-val' in data + assert 'model2-test2-val' not in data view2 = CustomModelView(Model1, db.session, column_searchable_list=[Model2.string_field]) @@ -509,8 +509,8 @@ def test_complex_searchable_list(): # test relation object - Model2.string_field rv = client.get('/admin/model1/?search=model2-test1') data = rv.data.decode('utf-8') - ok_('model1-test1-val' in data) - ok_('model1-test2-val' not in data) + assert 'model1-test1-val' in data + assert 'model1-test2-val' not in data def test_complex_searchable_list_missing_children(): @@ -530,7 +530,7 @@ def test_complex_searchable_list_missing_children(): rv = client.get('/admin/model1/?search=magic') data = rv.data.decode('utf-8') - ok_('magic string' in data) + assert 'magic string' in data def test_column_editable_list(): @@ -549,7 +549,7 @@ def test_column_editable_list(): # Test in-line edit field rendering rv = client.get('/admin/model1/') data = rv.data.decode('utf-8') - ok_('data-role="x-editable"' in data) + assert 'data-role="x-editable"' in data # Form - Test basic in-line edit functionality rv = client.post('/admin/model1/ajax/update/', data={ @@ -557,19 +557,19 @@ def test_column_editable_list(): 'test1': 'change-success-1', }) data = rv.data.decode('utf-8') - ok_('Record was successfully saved.' == data) + assert 'Record was successfully saved.' == data # ensure the value has changed rv = client.get('/admin/model1/') data = rv.data.decode('utf-8') - ok_('change-success-1' in data) + assert 'change-success-1' in data # Test validation error rv = client.post('/admin/model1/ajax/update/', data={ 'list_form_pk': '1', 'enum_field': 'problematic-input', }) - eq_(rv.status_code, 500) + assert rv.status_code == 500 # Test invalid primary key rv = client.post('/admin/model1/ajax/update/', data={ @@ -577,7 +577,7 @@ def test_column_editable_list(): 'test1': 'problematic-input', }) data = rv.data.decode('utf-8') - eq_(rv.status_code, 500) + assert rv.status_code == 500 # Test editing column not in column_editable_list rv = client.post('/admin/model1/ajax/update/', data={ @@ -585,7 +585,7 @@ def test_column_editable_list(): 'test2': 'problematic-input', }) data = rv.data.decode('utf-8') - ok_('problematic-input' not in data) + assert 'problematic-input' not in data # Test in-line editing for relations view = CustomModelView(Model2, db.session, column_editable_list=['model1']) @@ -596,12 +596,12 @@ def test_column_editable_list(): 'model1': '3', }) data = rv.data.decode('utf-8') - ok_('Record was successfully saved.' == data) + assert 'Record was successfully saved.' == data # confirm the value has changed rv = client.get('/admin/model2/') data = rv.data.decode('utf-8') - ok_('test1_val_3' in data) + assert 'test1_val_3' in data def test_details_view(): @@ -630,30 +630,30 @@ def test_details_view(): # ensure link to details is hidden when can_view_details is disabled rv = client.get('/admin/model1/') data = rv.data.decode('utf-8') - ok_('/admin/model1/details/' not in data) + assert '/admin/model1/details/' not in data # ensure link to details view appears rv = client.get('/admin/model2/') data = rv.data.decode('utf-8') - ok_('/admin/model2/details/' in data) + assert '/admin/model2/details/' in data # test redirection when details are disabled rv = client.get('/admin/model1/details/?url=%2Fadmin%2Fmodel1%2F&id=1') - eq_(rv.status_code, 302) + assert rv.status_code == 302 # test if correct data appears in details view when enabled rv = client.get('/admin/model2/details/?url=%2Fadmin%2Fmodel2%2F&id=1') data = rv.data.decode('utf-8') - ok_('String Field' in data) - ok_('test2_val_1' in data) - ok_('test1_val_1' in data) + assert 'String Field' in data + assert 'test2_val_1' in data + assert 'test1_val_1' in data # test column_details_list rv = client.get('/admin/sf_view/details/?url=%2Fadmin%2Fsf_view%2F&id=1') data = rv.data.decode('utf-8') - ok_('String Field' in data) - ok_('test2_val_1' in data) - ok_('test1_val_1' not in data) + assert 'String Field' in data + assert 'test2_val_1' in data + assert 'test1_val_1' not in data def test_editable_list_special_pks(): @@ -686,12 +686,12 @@ def __init__(self, id=None, val1=None): 'val1': 'change-success-1', }) data = rv.data.decode('utf-8') - ok_('Record was successfully saved.' == data) + assert 'Record was successfully saved.' == data # ensure the value has changed rv = client.get('/admin/model1/') data = rv.data.decode('utf-8') - ok_('change-success-1' in data) + assert 'change-success-1' in data def test_column_filters(): @@ -707,10 +707,10 @@ def test_column_filters(): client = app.test_client() - eq_(len(view._filters), 7) + assert len(view._filters) == 7 - eq_( - [(f['index'], f['operation']) for f in view._filter_groups[u'Test1']], + assert \ + [(f['index'], f['operation']) for f in view._filter_groups[u'Test1']] == \ [ (0, u'contains'), (1, u'not contains'), @@ -720,14 +720,13 @@ def test_column_filters(): (5, u'in list'), (6, u'not in list'), ] - ) # Test filter that references property view = CustomModelView(Model2, db.session, column_filters=['model1']) - eq_( - [(f['index'], f['operation']) for f in view._filter_groups[u'Model1 / Test1']], + assert \ + [(f['index'], f['operation']) for f in view._filter_groups[u'Model1 / Test1']] == \ [ (0, u'contains'), (1, u'not contains'), @@ -737,10 +736,9 @@ def test_column_filters(): (5, u'in list'), (6, u'not in list'), ] - ) - eq_( - [(f['index'], f['operation']) for f in view._filter_groups[u'Model1 / Test2']], + assert \ + [(f['index'], f['operation']) for f in view._filter_groups[u'Model1 / Test2']] == \ [ (7, u'contains'), (8, u'not contains'), @@ -750,10 +748,9 @@ def test_column_filters(): (12, u'in list'), (13, u'not in list'), ] - ) - eq_( - [(f['index'], f['operation']) for f in view._filter_groups[u'Model1 / Test3']], + assert \ + [(f['index'], f['operation']) for f in view._filter_groups[u'Model1 / Test3']] == \ [ (14, u'contains'), (15, u'not contains'), @@ -763,10 +760,9 @@ def test_column_filters(): (19, u'in list'), (20, u'not in list'), ] - ) - eq_( - [(f['index'], f['operation']) for f in view._filter_groups[u'Model1 / Test4']], + assert \ + [(f['index'], f['operation']) for f in view._filter_groups[u'Model1 / Test4']] == \ [ (21, u'contains'), (22, u'not contains'), @@ -776,18 +772,16 @@ def test_column_filters(): (26, u'in list'), (27, u'not in list'), ] - ) - eq_( - [(f['index'], f['operation']) for f in view._filter_groups[u'Model1 / Bool Field']], + assert \ + [(f['index'], f['operation']) for f in view._filter_groups[u'Model1 / Bool Field']] == \ [ (28, u'equals'), (29, u'not equal'), ] - ) - eq_( - [(f['index'], f['operation']) for f in view._filter_groups[u'Model1 / Date Field']], + assert \ + [(f['index'], f['operation']) for f in view._filter_groups[u'Model1 / Date Field']] == \ [ (30, u'equals'), (31, u'not equal'), @@ -797,10 +791,9 @@ def test_column_filters(): (35, u'not between'), (36, u'empty'), ] - ) - eq_( - [(f['index'], f['operation']) for f in view._filter_groups[u'Model1 / Time Field']], + assert \ + [(f['index'], f['operation']) for f in view._filter_groups[u'Model1 / Time Field']] == \ [ (37, u'equals'), (38, u'not equal'), @@ -810,10 +803,9 @@ def test_column_filters(): (42, u'not between'), (43, u'empty'), ] - ) - eq_( - [(f['index'], f['operation']) for f in view._filter_groups[u'Model1 / Datetime Field']], + assert \ + [(f['index'], f['operation']) for f in view._filter_groups[u'Model1 / Datetime Field']] == \ [ (44, u'equals'), (45, u'not equal'), @@ -823,10 +815,9 @@ def test_column_filters(): (49, u'not between'), (50, u'empty'), ] - ) - eq_( - [(f['index'], f['operation']) for f in view._filter_groups[u'Model1 / Email Field']], + assert \ + [(f['index'], f['operation']) for f in view._filter_groups[u'Model1 / Email Field']] == \ [ (51, u'contains'), (52, u'not contains'), @@ -836,10 +827,9 @@ def test_column_filters(): (56, u'in list'), (57, u'not in list'), ] - ) - eq_( - [(f['index'], f['operation']) for f in view._filter_groups[u'Model1 / Enum Field']], + assert \ + [(f['index'], f['operation']) for f in view._filter_groups[u'Model1 / Enum Field']] == \ [ (58, u'equals'), (59, u'not equal'), @@ -847,10 +837,9 @@ def test_column_filters(): (61, u'in list'), (62, u'not in list'), ] - ) - eq_( - [(f['index'], f['operation']) for f in view._filter_groups[u'Model1 / Choice Field']], + assert \ + [(f['index'], f['operation']) for f in view._filter_groups[u'Model1 / Choice Field']] == \ [ (63, u'contains'), (64, u'not contains'), @@ -860,10 +849,9 @@ def test_column_filters(): (68, u'in list'), (69, u'not in list'), ] - ) - eq_( - [(f['index'], f['operation']) for f in view._filter_groups[u'Model1 / Sqla Utils Choice']], + assert \ + [(f['index'], f['operation']) for f in view._filter_groups[u'Model1 / Sqla Utils Choice']] == \ [ (70, u'equals'), (71, u'not equal'), @@ -871,10 +859,9 @@ def test_column_filters(): (73, u'not contains'), (74, u'empty'), ] - ) - eq_( - [(f['index'], f['operation']) for f in view._filter_groups[u'Model1 / Sqla Utils Enum']], + assert \ + [(f['index'], f['operation']) for f in view._filter_groups[u'Model1 / Sqla Utils Enum']] == \ [ (75, u'equals'), (76, u'not equal'), @@ -882,19 +869,17 @@ def test_column_filters(): (78, u'not contains'), (79, u'empty'), ] - ) # Test filter with a dot view = CustomModelView(Model2, db.session, column_filters=['model1.bool_field']) - eq_( - [(f['index'], f['operation']) for f in view._filter_groups[u'model1 / Model1 / Bool Field']], + assert \ + [(f['index'], f['operation']) for f in view._filter_groups[u'model1 / Model1 / Bool Field']] == \ [ (0, 'equals'), (1, 'not equal'), ] - ) # Test column_labels on filters view = CustomModelView(Model2, db.session, @@ -904,35 +889,35 @@ def test_column_filters(): 'string_field': 'Test Filter #2', }) - eq_(list(view._filter_groups.keys()), [u'Test Filter #1', u'Test Filter #2']) + assert list(view._filter_groups.keys()) == [u'Test Filter #1', u'Test Filter #2'] fill_db(db, Model1, Model2) # Test equals rv = client.get('/admin/model1/?flt0_0=test1_val_1') - eq_(rv.status_code, 200) + assert rv.status_code == 200 data = rv.data.decode('utf-8') # the filter value is always in "data" # need to check a different column than test1 for the expected row - ok_('test2_val_1' in data) - ok_('test1_val_2' not in data) + assert 'test2_val_1' in data + assert 'test1_val_2' not in data # Test NOT IN filter rv = client.get('/admin/model1/?flt0_6=test1_val_1') - eq_(rv.status_code, 200) + assert rv.status_code == 200 data = rv.data.decode('utf-8') - ok_('test1_val_2' in data) - ok_('test2_val_1' not in data) + assert 'test1_val_2' in data + assert 'test2_val_1' not in data # Test string filter view = CustomModelView(Model1, db.session, column_filters=['test1'], endpoint='_strings') admin.add_view(view) - eq_( - [(f['index'], f['operation']) for f in view._filter_groups[u'Test1']], + assert \ + [(f['index'], f['operation']) for f in view._filter_groups[u'Test1']] == \ [ (0, 'contains'), (1, 'not contains'), @@ -942,77 +927,76 @@ def test_column_filters(): (5, 'in list'), (6, 'not in list'), ] - ) # string - equals rv = client.get('/admin/_strings/?flt0_0=test1_val_1') - eq_(rv.status_code, 200) + assert rv.status_code == 200 data = rv.data.decode('utf-8') - ok_('test2_val_1' in data) - ok_('test1_val_2' not in data) + assert 'test2_val_1' in data + assert 'test1_val_2' not in data # string - not equal rv = client.get('/admin/_strings/?flt0_1=test1_val_1') - eq_(rv.status_code, 200) + assert rv.status_code == 200 data = rv.data.decode('utf-8') - ok_('test2_val_1' not in data) - ok_('test1_val_2' in data) + assert 'test2_val_1' not in data + assert 'test1_val_2' in data # string - contains rv = client.get('/admin/_strings/?flt0_2=test1_val_1') - eq_(rv.status_code, 200) + assert rv.status_code == 200 data = rv.data.decode('utf-8') - ok_('test2_val_1' in data) - ok_('test1_val_2' not in data) + assert 'test2_val_1' in data + assert 'test1_val_2' not in data # string - not contains rv = client.get('/admin/_strings/?flt0_3=test1_val_1') - eq_(rv.status_code, 200) + assert rv.status_code == 200 data = rv.data.decode('utf-8') - ok_('test2_val_1' not in data) - ok_('test1_val_2' in data) + assert 'test2_val_1' not in data + assert 'test1_val_2' in data # string - empty rv = client.get('/admin/_strings/?flt0_4=1') - eq_(rv.status_code, 200) + assert rv.status_code == 200 data = rv.data.decode('utf-8') - ok_('empty_obj' in data) - ok_('test1_val_1' not in data) - ok_('test1_val_2' not in data) + assert 'empty_obj' in data + assert 'test1_val_1' not in data + assert 'test1_val_2' not in data # string - not empty rv = client.get('/admin/_strings/?flt0_4=0') - eq_(rv.status_code, 200) + assert rv.status_code == 200 data = rv.data.decode('utf-8') - ok_('empty_obj' not in data) - ok_('test1_val_1' in data) - ok_('test1_val_2' in data) + assert 'empty_obj' not in data + assert 'test1_val_1' in data + assert 'test1_val_2' in data # string - in list rv = client.get('/admin/_strings/?flt0_5=test1_val_1%2Ctest1_val_2') - eq_(rv.status_code, 200) + assert rv.status_code == 200 data = rv.data.decode('utf-8') - ok_('test2_val_1' in data) - ok_('test2_val_2' in data) - ok_('test1_val_3' not in data) - ok_('test1_val_4' not in data) + assert 'test2_val_1' in data + assert 'test2_val_2' in data + assert 'test1_val_3' not in data + assert 'test1_val_4' not in data # string - not in list rv = client.get('/admin/_strings/?flt0_6=test1_val_1%2Ctest1_val_2') - eq_(rv.status_code, 200) + assert rv.status_code == 200 data = rv.data.decode('utf-8') - ok_('test2_val_1' not in data) - ok_('test2_val_2' not in data) - ok_('test1_val_3' in data) - ok_('test1_val_4' in data) + assert 'test2_val_1' not in data + assert 'test2_val_2' not in data + assert 'test1_val_3' in data + assert 'test1_val_4' in data # Test integer filter view = CustomModelView(Model2, db.session, column_filters=['int_field']) admin.add_view(view) - eq_( - [(f['index'], f['operation']) for f in view._filter_groups[u'Int Field']], + assert \ + [(f['index'], f['operation']) for f in view._filter_groups[u'Int Field']] == \ [ (0, 'equals'), (1, 'not equal'), @@ -1022,150 +1006,148 @@ def test_column_filters(): (5, 'in list'), (6, 'not in list'), ] - ) # integer - equals rv = client.get('/admin/model2/?flt0_0=5000') - eq_(rv.status_code, 200) + assert rv.status_code == 200 data = rv.data.decode('utf-8') - ok_('test2_val_3' in data) - ok_('test2_val_4' not in data) + assert 'test2_val_3' in data + assert 'test2_val_4' not in data # integer - equals (huge number) rv = client.get('/admin/model2/?flt0_0=6169453081680413441') - eq_(rv.status_code, 200) + assert rv.status_code == 200 data = rv.data.decode('utf-8') - ok_('test2_val_5' in data) - ok_('test2_val_4' not in data) + assert 'test2_val_5' in data + assert 'test2_val_4' not in data # integer - equals - test validation rv = client.get('/admin/model2/?flt0_0=badval') - eq_(rv.status_code, 200) + assert rv.status_code == 200 data = rv.data.decode('utf-8') - ok_('Invalid Filter Value' in data) + assert 'Invalid Filter Value' in data # integer - not equal rv = client.get('/admin/model2/?flt0_1=5000') - eq_(rv.status_code, 200) + assert rv.status_code == 200 data = rv.data.decode('utf-8') - ok_('test2_val_3' not in data) - ok_('test2_val_4' in data) + assert 'test2_val_3' not in data + assert 'test2_val_4' in data # integer - greater rv = client.get('/admin/model2/?flt0_2=6000') - eq_(rv.status_code, 200) + assert rv.status_code == 200 data = rv.data.decode('utf-8') - ok_('test2_val_3' not in data) - ok_('test2_val_4' in data) + assert 'test2_val_3' not in data + assert 'test2_val_4' in data # integer - smaller rv = client.get('/admin/model2/?flt0_3=6000') - eq_(rv.status_code, 200) + assert rv.status_code == 200 data = rv.data.decode('utf-8') - ok_('test2_val_3' in data) - ok_('test2_val_4' not in data) + assert 'test2_val_3' in data + assert 'test2_val_4' not in data # integer - empty rv = client.get('/admin/model2/?flt0_4=1') - eq_(rv.status_code, 200) + assert rv.status_code == 200 data = rv.data.decode('utf-8') - ok_('test2_val_1' in data) - ok_('test2_val_2' in data) - ok_('test2_val_3' not in data) - ok_('test2_val_4' not in data) + assert 'test2_val_1' in data + assert 'test2_val_2' in data + assert 'test2_val_3' not in data + assert 'test2_val_4' not in data # integer - not empty rv = client.get('/admin/model2/?flt0_4=0') - eq_(rv.status_code, 200) + assert rv.status_code == 200 data = rv.data.decode('utf-8') - ok_('test2_val_1' not in data) - ok_('test2_val_2' not in data) - ok_('test2_val_3' in data) - ok_('test2_val_4' in data) + assert 'test2_val_1' not in data + assert 'test2_val_2' not in data + assert 'test2_val_3' in data + assert 'test2_val_4' in data # integer - in list rv = client.get('/admin/model2/?flt0_5=5000%2C9000') - eq_(rv.status_code, 200) + assert rv.status_code == 200 data = rv.data.decode('utf-8') - ok_('test2_val_1' not in data) - ok_('test2_val_2' not in data) - ok_('test2_val_3' in data) - ok_('test2_val_4' in data) + assert 'test2_val_1' not in data + assert 'test2_val_2' not in data + assert 'test2_val_3' in data + assert 'test2_val_4' in data # integer - in list (huge number) rv = client.get('/admin/model2/?flt0_5=6169453081680413441') - eq_(rv.status_code, 200) + assert rv.status_code == 200 data = rv.data.decode('utf-8') - ok_('test2_val_1' not in data) - ok_('test2_val_5' in data) + assert 'test2_val_1' not in data + assert 'test2_val_5' in data # integer - in list - test validation rv = client.get('/admin/model2/?flt0_5=5000%2Cbadval') - eq_(rv.status_code, 200) + assert rv.status_code == 200 data = rv.data.decode('utf-8') - ok_('Invalid Filter Value' in data) + assert 'Invalid Filter Value' in data # integer - not in list rv = client.get('/admin/model2/?flt0_6=5000%2C9000') - eq_(rv.status_code, 200) + assert rv.status_code == 200 data = rv.data.decode('utf-8') - ok_('test2_val_1' in data) - ok_('test2_val_2' in data) - ok_('test2_val_3' not in data) - ok_('test2_val_4' not in data) + assert 'test2_val_1' in data + assert 'test2_val_2' in data + assert 'test2_val_3' not in data + assert 'test2_val_4' not in data # Test boolean filter view = CustomModelView(Model1, db.session, column_filters=['bool_field'], endpoint="_bools") admin.add_view(view) - eq_( - [(f['index'], f['operation']) for f in view._filter_groups[u'Bool Field']], + assert \ + [(f['index'], f['operation']) for f in view._filter_groups[u'Bool Field']] == \ [ (0, 'equals'), (1, 'not equal'), ] - ) # boolean - equals - Yes rv = client.get('/admin/_bools/?flt0_0=1') - eq_(rv.status_code, 200) + assert rv.status_code == 200 data = rv.data.decode('utf-8') - ok_('test2_val_1' in data) - ok_('test2_val_2' not in data) - ok_('test2_val_3' not in data) + assert 'test2_val_1' in data + assert 'test2_val_2' not in data + assert 'test2_val_3' not in data # boolean - equals - No rv = client.get('/admin/_bools/?flt0_0=0') - eq_(rv.status_code, 200) + assert rv.status_code == 200 data = rv.data.decode('utf-8') - ok_('test2_val_1' not in data) - ok_('test2_val_2' in data) - ok_('test2_val_3' in data) + assert 'test2_val_1' not in data + assert 'test2_val_2' in data + assert 'test2_val_3' in data # boolean - not equals - Yes rv = client.get('/admin/_bools/?flt0_1=1') - eq_(rv.status_code, 200) + assert rv.status_code == 200 data = rv.data.decode('utf-8') - ok_('test2_val_1' not in data) - ok_('test2_val_2' in data) - ok_('test2_val_3' in data) + assert 'test2_val_1' not in data + assert 'test2_val_2' in data + assert 'test2_val_3' in data # boolean - not equals - No rv = client.get('/admin/_bools/?flt0_1=0') - eq_(rv.status_code, 200) + assert rv.status_code == 200 data = rv.data.decode('utf-8') - ok_('test2_val_1' in data) - ok_('test2_val_2' not in data) - ok_('test2_val_3' not in data) + assert 'test2_val_1' in data + assert 'test2_val_2' not in data + assert 'test2_val_3' not in data # Test float filter view = CustomModelView(Model2, db.session, column_filters=['float_field'], endpoint="_float") admin.add_view(view) - eq_( - [(f['index'], f['operation']) for f in view._filter_groups[u'Float Field']], + assert \ + [(f['index'], f['operation']) for f in view._filter_groups[u'Float Field']] == \ [ (0, 'equals'), (1, 'not equal'), @@ -1175,83 +1157,82 @@ def test_column_filters(): (5, 'in list'), (6, 'not in list'), ] - ) # float - equals rv = client.get('/admin/_float/?flt0_0=25.9') - eq_(rv.status_code, 200) + assert rv.status_code == 200 data = rv.data.decode('utf-8') - ok_('test2_val_3' in data) - ok_('test2_val_4' not in data) + assert 'test2_val_3' in data + assert 'test2_val_4' not in data # float - equals - test validation rv = client.get('/admin/_float/?flt0_0=badval') - eq_(rv.status_code, 200) + assert rv.status_code == 200 data = rv.data.decode('utf-8') - ok_('Invalid Filter Value' in data) + assert 'Invalid Filter Value' in data # float - not equal rv = client.get('/admin/_float/?flt0_1=25.9') - eq_(rv.status_code, 200) + assert rv.status_code == 200 data = rv.data.decode('utf-8') - ok_('test2_val_3' not in data) - ok_('test2_val_4' in data) + assert 'test2_val_3' not in data + assert 'test2_val_4' in data # float - greater rv = client.get('/admin/_float/?flt0_2=60.5') - eq_(rv.status_code, 200) + assert rv.status_code == 200 data = rv.data.decode('utf-8') - ok_('test2_val_3' not in data) - ok_('test2_val_4' in data) + assert 'test2_val_3' not in data + assert 'test2_val_4' in data # float - smaller rv = client.get('/admin/_float/?flt0_3=60.5') - eq_(rv.status_code, 200) + assert rv.status_code == 200 data = rv.data.decode('utf-8') - ok_('test2_val_3' in data) - ok_('test2_val_4' not in data) + assert 'test2_val_3' in data + assert 'test2_val_4' not in data # float - empty rv = client.get('/admin/_float/?flt0_4=1') - eq_(rv.status_code, 200) + assert rv.status_code == 200 data = rv.data.decode('utf-8') - ok_('test2_val_1' in data) - ok_('test2_val_2' in data) - ok_('test2_val_3' not in data) - ok_('test2_val_4' not in data) + assert 'test2_val_1' in data + assert 'test2_val_2' in data + assert 'test2_val_3' not in data + assert 'test2_val_4' not in data # float - not empty rv = client.get('/admin/_float/?flt0_4=0') - eq_(rv.status_code, 200) + assert rv.status_code == 200 data = rv.data.decode('utf-8') - ok_('test2_val_1' not in data) - ok_('test2_val_2' not in data) - ok_('test2_val_3' in data) - ok_('test2_val_4' in data) + assert 'test2_val_1' not in data + assert 'test2_val_2' not in data + assert 'test2_val_3' in data + assert 'test2_val_4' in data # float - in list rv = client.get('/admin/_float/?flt0_5=25.9%2C75.5') - eq_(rv.status_code, 200) + assert rv.status_code == 200 data = rv.data.decode('utf-8') - ok_('test2_val_1' not in data) - ok_('test2_val_2' not in data) - ok_('test2_val_3' in data) - ok_('test2_val_4' in data) + assert 'test2_val_1' not in data + assert 'test2_val_2' not in data + assert 'test2_val_3' in data + assert 'test2_val_4' in data # float - in list - test validation rv = client.get('/admin/_float/?flt0_5=25.9%2Cbadval') - eq_(rv.status_code, 200) + assert rv.status_code == 200 data = rv.data.decode('utf-8') - ok_('Invalid Filter Value' in data) + assert 'Invalid Filter Value' in data # float - not in list rv = client.get('/admin/_float/?flt0_6=25.9%2C75.5') - eq_(rv.status_code, 200) + assert rv.status_code == 200 data = rv.data.decode('utf-8') - ok_('test2_val_1' in data) - ok_('test2_val_2' in data) - ok_('test2_val_3' not in data) - ok_('test2_val_4' not in data) + assert 'test2_val_1' in data + assert 'test2_val_2' in data + assert 'test2_val_3' not in data + assert 'test2_val_4' not in data # Test filters to joined table field view = CustomModelView( @@ -1267,12 +1248,12 @@ def test_column_filters(): admin.add_view(view) rv = client.get('/admin/_model2/?flt1_0=1') - eq_(rv.status_code, 200) + assert rv.status_code == 200 data = rv.data.decode('utf-8') - ok_('test2_val_1' in data) - ok_('test2_val_2' not in data) - ok_('test2_val_3' not in data) - ok_('test2_val_4' not in data) + assert 'test2_val_1' in data + assert 'test2_val_2' not in data + assert 'test2_val_3' not in data + assert 'test2_val_4' not in data # Test human readable URLs view = CustomModelView( @@ -1284,10 +1265,10 @@ def test_column_filters(): admin.add_view(view) rv = client.get('/admin/_model3/?flt1_test1_equals=test1_val_1') - eq_(rv.status_code, 200) + assert rv.status_code == 200 data = rv.data.decode('utf-8') - ok_('test1_val_1' in data) - ok_('test1_val_2' not in data) + assert 'test1_val_1' in data + assert 'test1_val_2' not in data # Test date, time, and datetime filters view = CustomModelView(Model1, db.session, @@ -1295,8 +1276,8 @@ def test_column_filters(): endpoint="_datetime") admin.add_view(view) - eq_( - [(f['index'], f['operation']) for f in view._filter_groups[u'Date Field']], + assert \ + [(f['index'], f['operation']) for f in view._filter_groups[u'Date Field']] == \ [ (0, 'equals'), (1, 'not equal'), @@ -1306,10 +1287,9 @@ def test_column_filters(): (5, 'not between'), (6, 'empty'), ] - ) - eq_( - [(f['index'], f['operation']) for f in view._filter_groups[u'Datetime Field']], + assert \ + [(f['index'], f['operation']) for f in view._filter_groups[u'Datetime Field']] == \ [ (7, 'equals'), (8, 'not equal'), @@ -1319,10 +1299,9 @@ def test_column_filters(): (12, 'not between'), (13, 'empty'), ] - ) - eq_( - [(f['index'], f['operation']) for f in view._filter_groups[u'Time Field']], + assert \ + [(f['index'], f['operation']) for f in view._filter_groups[u'Time Field']] == \ [ (14, 'equals'), (15, 'not equal'), @@ -1332,181 +1311,180 @@ def test_column_filters(): (19, 'not between'), (20, 'empty'), ] - ) # date - equals rv = client.get('/admin/_datetime/?flt0_0=2014-11-17') - eq_(rv.status_code, 200) + assert rv.status_code == 200 data = rv.data.decode('utf-8') - ok_('date_obj1' in data) - ok_('date_obj2' not in data) + assert 'date_obj1' in data + assert 'date_obj2' not in data # date - not equal rv = client.get('/admin/_datetime/?flt0_1=2014-11-17') - eq_(rv.status_code, 200) + assert rv.status_code == 200 data = rv.data.decode('utf-8') - ok_('date_obj1' not in data) - ok_('date_obj2' in data) + assert 'date_obj1' not in data + assert 'date_obj2' in data # date - greater rv = client.get('/admin/_datetime/?flt0_2=2014-11-16') - eq_(rv.status_code, 200) + assert rv.status_code == 200 data = rv.data.decode('utf-8') - ok_('date_obj1' in data) - ok_('date_obj2' not in data) + assert 'date_obj1' in data + assert 'date_obj2' not in data # date - smaller rv = client.get('/admin/_datetime/?flt0_3=2014-11-16') - eq_(rv.status_code, 200) + assert rv.status_code == 200 data = rv.data.decode('utf-8') - ok_('date_obj1' not in data) - ok_('date_obj2' in data) + assert 'date_obj1' not in data + assert 'date_obj2' in data # date - between rv = client.get('/admin/_datetime/?flt0_4=2014-11-13+to+2014-11-20') - eq_(rv.status_code, 200) + assert rv.status_code == 200 data = rv.data.decode('utf-8') - ok_('date_obj1' in data) - ok_('date_obj2' not in data) + assert 'date_obj1' in data + assert 'date_obj2' not in data # date - not between rv = client.get('/admin/_datetime/?flt0_5=2014-11-13+to+2014-11-20') - eq_(rv.status_code, 200) + assert rv.status_code == 200 data = rv.data.decode('utf-8') - ok_('date_obj1' not in data) - ok_('date_obj2' in data) + assert 'date_obj1' not in data + assert 'date_obj2' in data # date - empty rv = client.get('/admin/_datetime/?flt0_6=1') - eq_(rv.status_code, 200) + assert rv.status_code == 200 data = rv.data.decode('utf-8') - ok_('test1_val_1' in data) - ok_('date_obj1' not in data) - ok_('date_obj2' not in data) + assert 'test1_val_1' in data + assert 'date_obj1' not in data + assert 'date_obj2' not in data # date - empty rv = client.get('/admin/_datetime/?flt0_6=0') - eq_(rv.status_code, 200) + assert rv.status_code == 200 data = rv.data.decode('utf-8') - ok_('test1_val_1' not in data) - ok_('date_obj1' in data) - ok_('date_obj2' in data) + assert 'test1_val_1' not in data + assert 'date_obj1' in data + assert 'date_obj2' in data # datetime - equals rv = client.get('/admin/_datetime/?flt0_7=2014-04-03+01%3A09%3A00') - eq_(rv.status_code, 200) + assert rv.status_code == 200 data = rv.data.decode('utf-8') - ok_('datetime_obj1' in data) - ok_('datetime_obj2' not in data) + assert 'datetime_obj1' in data + assert 'datetime_obj2' not in data # datetime - not equal rv = client.get('/admin/_datetime/?flt0_8=2014-04-03+01%3A09%3A00') - eq_(rv.status_code, 200) + assert rv.status_code == 200 data = rv.data.decode('utf-8') - ok_('datetime_obj1' not in data) - ok_('datetime_obj2' in data) + assert 'datetime_obj1' not in data + assert 'datetime_obj2' in data # datetime - greater rv = client.get('/admin/_datetime/?flt0_9=2014-04-03+01%3A08%3A00') - eq_(rv.status_code, 200) + assert rv.status_code == 200 data = rv.data.decode('utf-8') - ok_('datetime_obj1' in data) - ok_('datetime_obj2' not in data) + assert 'datetime_obj1' in data + assert 'datetime_obj2' not in data # datetime - smaller rv = client.get('/admin/_datetime/?flt0_10=2014-04-03+01%3A08%3A00') - eq_(rv.status_code, 200) + assert rv.status_code == 200 data = rv.data.decode('utf-8') - ok_('datetime_obj1' not in data) - ok_('datetime_obj2' in data) + assert 'datetime_obj1' not in data + assert 'datetime_obj2' in data # datetime - between rv = client.get('/admin/_datetime/?flt0_11=2014-04-02+00%3A00%3A00+to+2014-11-20+23%3A59%3A59') - eq_(rv.status_code, 200) + assert rv.status_code == 200 data = rv.data.decode('utf-8') - ok_('datetime_obj1' in data) - ok_('datetime_obj2' not in data) + assert 'datetime_obj1' in data + assert 'datetime_obj2' not in data # datetime - not between rv = client.get('/admin/_datetime/?flt0_12=2014-04-02+00%3A00%3A00+to+2014-11-20+23%3A59%3A59') - eq_(rv.status_code, 200) + assert rv.status_code == 200 data = rv.data.decode('utf-8') - ok_('datetime_obj1' not in data) - ok_('datetime_obj2' in data) + assert 'datetime_obj1' not in data + assert 'datetime_obj2' in data # datetime - empty rv = client.get('/admin/_datetime/?flt0_13=1') - eq_(rv.status_code, 200) + assert rv.status_code == 200 data = rv.data.decode('utf-8') - ok_('test1_val_1' in data) - ok_('datetime_obj1' not in data) - ok_('datetime_obj2' not in data) + assert 'test1_val_1' in data + assert 'datetime_obj1' not in data + assert 'datetime_obj2' not in data # datetime - not empty rv = client.get('/admin/_datetime/?flt0_13=0') - eq_(rv.status_code, 200) + assert rv.status_code == 200 data = rv.data.decode('utf-8') - ok_('test1_val_1' not in data) - ok_('datetime_obj1' in data) - ok_('datetime_obj2' in data) + assert 'test1_val_1' not in data + assert 'datetime_obj1' in data + assert 'datetime_obj2' in data # time - equals rv = client.get('/admin/_datetime/?flt0_14=11%3A10%3A09') - eq_(rv.status_code, 200) + assert rv.status_code == 200 data = rv.data.decode('utf-8') - ok_('timeonly_obj1' in data) - ok_('timeonly_obj2' not in data) + assert 'timeonly_obj1' in data + assert 'timeonly_obj2' not in data # time - not equal rv = client.get('/admin/_datetime/?flt0_15=11%3A10%3A09') - eq_(rv.status_code, 200) + assert rv.status_code == 200 data = rv.data.decode('utf-8') - ok_('timeonly_obj1' not in data) - ok_('timeonly_obj2' in data) + assert 'timeonly_obj1' not in data + assert 'timeonly_obj2' in data # time - greater rv = client.get('/admin/_datetime/?flt0_16=11%3A09%3A09') - eq_(rv.status_code, 200) + assert rv.status_code == 200 data = rv.data.decode('utf-8') - ok_('timeonly_obj1' in data) - ok_('timeonly_obj2' not in data) + assert 'timeonly_obj1' in data + assert 'timeonly_obj2' not in data # time - smaller rv = client.get('/admin/_datetime/?flt0_17=11%3A09%3A09') - eq_(rv.status_code, 200) + assert rv.status_code == 200 data = rv.data.decode('utf-8') - ok_('timeonly_obj1' not in data) - ok_('timeonly_obj2' in data) + assert 'timeonly_obj1' not in data + assert 'timeonly_obj2' in data # time - between rv = client.get('/admin/_datetime/?flt0_18=10%3A40%3A00+to+11%3A50%3A59') - eq_(rv.status_code, 200) + assert rv.status_code == 200 data = rv.data.decode('utf-8') - ok_('timeonly_obj1' in data) - ok_('timeonly_obj2' not in data) + assert 'timeonly_obj1' in data + assert 'timeonly_obj2' not in data # time - not between rv = client.get('/admin/_datetime/?flt0_19=10%3A40%3A00+to+11%3A50%3A59') - eq_(rv.status_code, 200) + assert rv.status_code == 200 data = rv.data.decode('utf-8') - ok_('timeonly_obj1' not in data) - ok_('timeonly_obj2' in data) + assert 'timeonly_obj1' not in data + assert 'timeonly_obj2' in data # time - empty rv = client.get('/admin/_datetime/?flt0_20=1') - eq_(rv.status_code, 200) + assert rv.status_code == 200 data = rv.data.decode('utf-8') - ok_('test1_val_1' in data) - ok_('timeonly_obj1' not in data) - ok_('timeonly_obj2' not in data) + assert 'test1_val_1' in data + assert 'timeonly_obj1' not in data + assert 'timeonly_obj2' not in data # time - not empty rv = client.get('/admin/_datetime/?flt0_20=0') - eq_(rv.status_code, 200) + assert rv.status_code == 200 data = rv.data.decode('utf-8') - ok_('test1_val_1' not in data) - ok_('timeonly_obj1' in data) - ok_('timeonly_obj2' in data) + assert 'test1_val_1' not in data + assert 'timeonly_obj1' in data + assert 'timeonly_obj2' in data # Test enum filter view = CustomModelView(Model1, db.session, @@ -1516,49 +1494,49 @@ def test_column_filters(): # enum - equals rv = client.get('/admin/_enumfield/?flt0_0=model1_v1') - eq_(rv.status_code, 200) + assert rv.status_code == 200 data = rv.data.decode('utf-8') - ok_('enum_obj1' in data) - ok_('enum_obj2' not in data) + assert 'enum_obj1' in data + assert 'enum_obj2' not in data # enum - not equal rv = client.get('/admin/_enumfield/?flt0_1=model1_v1') - eq_(rv.status_code, 200) + assert rv.status_code == 200 data = rv.data.decode('utf-8') - ok_('enum_obj1' not in data) - ok_('enum_obj2' in data) + assert 'enum_obj1' not in data + assert 'enum_obj2' in data # enum - empty rv = client.get('/admin/_enumfield/?flt0_2=1') - eq_(rv.status_code, 200) + assert rv.status_code == 200 data = rv.data.decode('utf-8') - ok_('test1_val_1' in data) - ok_('enum_obj1' not in data) - ok_('enum_obj2' not in data) + assert 'test1_val_1' in data + assert 'enum_obj1' not in data + assert 'enum_obj2' not in data # enum - not empty rv = client.get('/admin/_enumfield/?flt0_2=0') - eq_(rv.status_code, 200) + assert rv.status_code == 200 data = rv.data.decode('utf-8') - ok_('test1_val_1' not in data) - ok_('enum_obj1' in data) - ok_('enum_obj2' in data) + assert 'test1_val_1' not in data + assert 'enum_obj1' in data + assert 'enum_obj2' in data # enum - in list rv = client.get('/admin/_enumfield/?flt0_3=model1_v1%2Cmodel1_v2') - eq_(rv.status_code, 200) + assert rv.status_code == 200 data = rv.data.decode('utf-8') - ok_('test1_val_1' not in data) - ok_('enum_obj1' in data) - ok_('enum_obj2' in data) + assert 'test1_val_1' not in data + assert 'enum_obj1' in data + assert 'enum_obj2' in data # enum - not in list rv = client.get('/admin/_enumfield/?flt0_4=model1_v1%2Cmodel1_v2') - eq_(rv.status_code, 200) + assert rv.status_code == 200 data = rv.data.decode('utf-8') - ok_('test1_val_1' in data) - ok_('enum_obj1' not in data) - ok_('enum_obj2' not in data) + assert 'test1_val_1' in data + assert 'enum_obj1' not in data + assert 'enum_obj2' not in data # Test single custom filter on relation view = CustomModelView(Model2, db.session, @@ -1570,8 +1548,8 @@ def test_column_filters(): rv = client.get('/admin/_relation_test/?flt1_0=test1_val_1') data = rv.data.decode('utf-8') - ok_('test1_val_1' in data) - ok_('test1_val_2' not in data) + assert 'test1_val_1' in data + assert 'test1_val_2' not in data def test_column_filters_sqla_obj(): @@ -1585,7 +1563,7 @@ def test_column_filters_sqla_obj(): ) admin.add_view(view) - eq_(len(view._filters), 7) + assert len(view._filters) == 7 def test_hybrid_property(): @@ -1611,10 +1589,10 @@ def number_of_pixels_str(cls): db.create_all() - ok_(tools.is_hybrid_property(Model1, 'number_of_pixels')) - ok_(tools.is_hybrid_property(Model1, 'number_of_pixels_str')) - ok_(not tools.is_hybrid_property(Model1, 'height')) - ok_(not tools.is_hybrid_property(Model1, 'width')) + assert tools.is_hybrid_property(Model1, 'number_of_pixels') + assert tools.is_hybrid_property(Model1, 'number_of_pixels_str') + assert not tools.is_hybrid_property(Model1, 'height') + assert not tools.is_hybrid_property(Model1, 'width') db.session.add(Model1(id=1, name="test_row_1", width=25, height=25)) db.session.add(Model1(id=2, name="test_row_2", width=10, height=10)) @@ -1633,27 +1611,27 @@ def number_of_pixels_str(cls): # filters - hybrid_property integer - greater rv = client.get('/admin/model1/?flt0_0=600') - eq_(rv.status_code, 200) + assert rv.status_code == 200 data = rv.data.decode('utf-8') - ok_('test_row_1' in data) - ok_('test_row_2' not in data) + assert 'test_row_1' in data + assert 'test_row_2' not in data # sorting rv = client.get('/admin/model1/?sort=0') - eq_(rv.status_code, 200) + assert rv.status_code == 200 _, data = view.get_list(0, None, None, None, None) - eq_(len(data), 2) - eq_(data[0].name, 'test_row_2') - eq_(data[1].name, 'test_row_1') + assert len(data) == 2 + assert data[0].name == 'test_row_2' + assert data[1].name == 'test_row_1' # searching rv = client.get('/admin/model1/?search=100') - eq_(rv.status_code, 200) + assert rv.status_code == 200 data = rv.data.decode('utf-8') - ok_('test_row_2' in data) - ok_('test_row_1' not in data) + assert 'test_row_2' in data + assert 'test_row_1' not in data def test_hybrid_property_nested(): @@ -1676,8 +1654,8 @@ class Model2(db.Model): db.create_all() - ok_(tools.is_hybrid_property(Model2, 'owner.fullname')) - ok_(not tools.is_hybrid_property(Model2, 'owner.firstname')) + assert tools.is_hybrid_property(Model2, 'owner.fullname') + assert not tools.is_hybrid_property(Model2, 'owner.firstname') db.session.add(Model1(id=1, firstname="John", lastname="Dow")) db.session.add(Model1(id=2, firstname="Jim", lastname="Smith")) @@ -1696,10 +1674,10 @@ class Model2(db.Model): admin.add_view(view) rv = client.get('/admin/model2/') - eq_(rv.status_code, 200) + assert rv.status_code == 200 data = rv.data.decode('utf-8') - ok_('John Dow' in data) - ok_('Jim Smith' in data) + assert 'John Dow' in data + assert 'Jim Smith' in data def test_url_args(): @@ -1723,41 +1701,41 @@ def test_url_args(): rv = client.get('/admin/model1/') data = rv.data.decode('utf-8') - ok_('data1' in data) - ok_('data3' not in data) + assert 'data1' in data + assert 'data3' not in data # page rv = client.get('/admin/model1/?page=1') data = rv.data.decode('utf-8') - ok_('data1' not in data) - ok_('data3' in data) + assert 'data1' not in data + assert 'data3' in data # sort rv = client.get('/admin/model1/?sort=0&desc=1') data = rv.data.decode('utf-8') - ok_('data1' not in data) - ok_('data3' in data) - ok_('data4' in data) + assert 'data1' not in data + assert 'data3' in data + assert 'data4' in data # search rv = client.get('/admin/model1/?search=data1') data = rv.data.decode('utf-8') - ok_('data1' in data) - ok_('data2' not in data) + assert 'data1' in data + assert 'data2' not in data rv = client.get('/admin/model1/?search=^data1') data = rv.data.decode('utf-8') - ok_('data2' not in data) + assert 'data2' not in data # like rv = client.get('/admin/model1/?flt0=0&flt0v=data1') data = rv.data.decode('utf-8') - ok_('data1' in data) + assert 'data1' in data # not like rv = client.get('/admin/model1/?flt0=1&flt0v=data1') data = rv.data.decode('utf-8') - ok_('data2' in data) + assert 'data2' in data def test_non_int_pk(): @@ -1775,21 +1753,21 @@ class Model(db.Model): client = app.test_client() rv = client.get('/admin/model/') - eq_(rv.status_code, 200) + assert rv.status_code == 200 rv = client.post('/admin/model/new/', data=dict(id='test1', test='test2')) - eq_(rv.status_code, 302) + assert rv.status_code == 302 rv = client.get('/admin/model/') - eq_(rv.status_code, 200) + assert rv.status_code == 200 data = rv.data.decode('utf-8') - ok_('test1' in data) + assert 'test1' in data rv = client.get('/admin/model/edit/?id=test1') - eq_(rv.status_code, 200) + assert rv.status_code == 200 data = rv.data.decode('utf-8') - ok_('test2' in data) + assert 'test2' in data def test_form_columns(): @@ -1830,32 +1808,32 @@ class EnumChoices(enum.Enum): form2 = view2.create_form() form3 = view3.create_form() - ok_('int_field' in form1._fields) - ok_('text_field' in form1._fields) - ok_('datetime_field' not in form1._fields) - ok_('excluded_column' not in form2._fields) + assert 'int_field' in form1._fields + assert 'text_field' in form1._fields + assert 'datetime_field' not in form1._fields + assert 'excluded_column' not in form2._fields # check that relation shows up as a query select - ok_(type(form3.model).__name__ == 'QuerySelectField') + assert type(form3.model).__name__ == 'QuerySelectField' # check that select field is rendered if form_choices were specified - ok_(type(form3.choice_field).__name__ == 'Select2Field') + assert type(form3.choice_field).__name__ == 'Select2Field' # check that select field is rendered for enum fields - ok_(type(form3.enum_field).__name__ == 'Select2Field') + assert type(form3.enum_field).__name__ == 'Select2Field' # check that sqlalchemy_utils field types are handled appropriately - ok_(type(form3.sqla_utils_choice).__name__ == 'Select2Field') - ok_(type(form3.sqla_utils_enum).__name__ == 'Select2Field') + assert type(form3.sqla_utils_choice).__name__ == 'Select2Field' + assert type(form3.sqla_utils_enum).__name__ == 'Select2Field' # test form_columns with model objects view4 = CustomModelView(Model, db.session, endpoint='view1', form_columns=[Model.int_field]) form4 = view4.create_form() - ok_('int_field' in form4._fields) + assert 'int_field' in form4._fields -@raises(Exception) +@pytest.mark.xfail(raises=Exception) def test_complex_form_columns(): app, db, admin = setup() M1, M2 = create_models(db) @@ -1880,11 +1858,11 @@ class Model(db.Model): admin.add_view(view) create_form = view.create_form() - eq_(len(create_form.test.validators), 2) + assert len(create_form.test.validators) == 2 # ensure shared field_args don't create duplicate validators edit_form = view.edit_form() - eq_(len(edit_form.test.validators), 2) + assert len(edit_form.test.validators) == 2 def test_form_override(): @@ -1901,8 +1879,8 @@ class Model(db.Model): admin.add_view(view1) admin.add_view(view2) - eq_(view1._create_form_class.test.field_class, fields.StringField) - eq_(view2._create_form_class.test.field_class, fields.FileField) + assert view1._create_form_class.test.field_class == fields.StringField + assert view2._create_form_class.test.field_class == fields.FileField def test_form_onetoone(): @@ -1931,11 +1909,11 @@ class Model2(db.Model): db.session.add(model2) db.session.commit() - eq_(model1.model2, model2) - eq_(model2.model1, model1) + assert model1.model2 == model2 + assert model2.model1 == model1 - eq_(view1._create_form_class.model2.field_class.widget.multiple, False) - eq_(view2._create_form_class.model1.field_class.widget.multiple, False) + assert not view1._create_form_class.model2.field_class.widget.multiple + assert not view2._create_form_class.model1.field_class.widget.multiple def test_relations(): @@ -1963,17 +1941,17 @@ def on_model_delete(self, model): data=dict(test1='test1large', test2='test2')) model = db.session.query(Model1).first() - eq_(model.test1, 'TEST1LARGE') + assert model.test1 == 'TEST1LARGE' url = '/admin/model1/edit/?id=%s' % model.id client.post(url, data=dict(test1='test1small', test2='test2large')) model = db.session.query(Model1).first() - eq_(model.test1, 'TEST1SMALL') + assert model.test1 == 'TEST1SMALL' url = '/admin/model1/delete/?id=%s' % model.id client.post(url) - ok_(view.deleted) + assert view.deleted def test_multiple_delete(): @@ -1982,7 +1960,7 @@ def test_multiple_delete(): db.session.add_all([M1('a'), M1('b'), M1('c')]) db.session.commit() - eq_(M1.query.count(), 3) + assert M1.query.count() == 3 view = ModelView(M1, db.session) admin.add_view(view) @@ -1990,8 +1968,8 @@ def test_multiple_delete(): client = app.test_client() rv = client.post('/admin/model1/action/', data=dict(action='delete', rowid=[1, 2, 3])) - eq_(rv.status_code, 302) - eq_(M1.query.count(), 0) + assert rv.status_code == 302 + assert M1.query.count() == 0 def test_default_sort(): @@ -2000,17 +1978,17 @@ def test_default_sort(): db.session.add_all([M1('c', 'x'), M1('b', 'x'), M1('a', 'y')]) db.session.commit() - eq_(M1.query.count(), 3) + assert M1.query.count() == 3 view = CustomModelView(M1, db.session, column_default_sort='test1') admin.add_view(view) _, data = view.get_list(0, None, None, None, None) - eq_(len(data), 3) - eq_(data[0].test1, 'a') - eq_(data[1].test1, 'b') - eq_(data[2].test1, 'c') + assert len(data) == 3 + assert data[0].test1 == 'a' + assert data[1].test1 == 'b' + assert data[2].test1 == 'c' # test default sort on renamed columns - with column_list scaffolding view2 = CustomModelView(M1, db.session, column_default_sort='test1', @@ -2019,10 +1997,10 @@ def test_default_sort(): _, data = view2.get_list(0, None, None, None, None) - eq_(len(data), 3) - eq_(data[0].test1, 'a') - eq_(data[1].test1, 'b') - eq_(data[2].test1, 'c') + assert len(data) == 3 + assert data[0].test1 == 'a' + assert data[1].test1 == 'b' + assert data[2].test1 == 'c' # test default sort on renamed columns - without column_list scaffolding view3 = CustomModelView(M1, db.session, column_default_sort='test1', @@ -2032,10 +2010,10 @@ def test_default_sort(): _, data = view3.get_list(0, None, None, None, None) - eq_(len(data), 3) - eq_(data[0].test1, 'a') - eq_(data[1].test1, 'b') - eq_(data[2].test1, 'c') + assert len(data) == 3 + assert data[0].test1 == 'a' + assert data[1].test1 == 'b' + assert data[2].test1 == 'c' # test default sort with multiple columns order = [('test2', False), ('test1', False)] @@ -2044,10 +2022,10 @@ def test_default_sort(): _, data = view4.get_list(0, None, None, None, None) - eq_(len(data), 3) - eq_(data[0].test1, 'b') - eq_(data[1].test1, 'c') - eq_(data[2].test1, 'a') + assert len(data) == 3 + assert data[0].test1 == 'b' + assert data[1].test1 == 'c' + assert data[2].test1 == 'a' def test_complex_sort(): @@ -2077,13 +2055,13 @@ def test_complex_sort(): client = app.test_client() rv = client.get('/admin/model2/?sort=0') - eq_(rv.status_code, 200) + assert rv.status_code == 200 _, data = view.get_list(0, 'model1.test1', False, None, None) - eq_(data[0].model1.test1, 'a') - eq_(data[1].model1.test1, 'b') - eq_(data[2].model1.test1, 'c') + assert data[0].model1.test1 == 'a' + assert data[1].model1.test1 == 'b' + assert data[2].model1.test1 == 'c' # test sorting on multiple columns in related model view2 = CustomModelView(M2, db.session, @@ -2092,16 +2070,16 @@ def test_complex_sort(): admin.add_view(view2) rv = client.get('/admin/m1_2/?sort=0') - eq_(rv.status_code, 200) + assert rv.status_code == 200 _, data = view2.get_list(0, 'model1', False, None, None) - eq_(data[0].model1.test1, 'b') - eq_(data[1].model1.test1, 'c') - eq_(data[2].model1.test1, 'a') + assert data[0].model1.test1 == 'b' + assert data[1].model1.test1 == 'c' + assert data[2].model1.test1 == 'a' -@raises(Exception) +@pytest.mark.xfail(raises=Exception) def test_complex_sort_exception(): app, db, admin = setup() M1, M2 = create_models(db) @@ -2114,9 +2092,9 @@ def test_complex_sort_exception(): sort_column = view._get_column_by_idx(0)[0] _, data = view.get_list(0, sort_column, False, None, None) - eq_(len(data), 2) - eq_(data[0].model1.test1, 'a') - eq_(data[1].model1.test1, 'b') + assert len(data) == 2 + assert data[0].model1.test1 == 'a' + assert data[1].model1.test1 == 'b' def test_default_complex_sort(): @@ -2138,9 +2116,9 @@ def test_default_complex_sort(): _, data = view.get_list(0, None, None, None, None) - eq_(len(data), 2) - eq_(data[0].model1.test1, 'a') - eq_(data[1].model1.test1, 'b') + assert len(data) == 2 + assert data[0].model1.test1 == 'a' + assert data[1].model1.test1 == 'b' # test column_default_sort on a related table's column object view2 = CustomModelView(M2, db.session, endpoint="model2_2", @@ -2149,9 +2127,9 @@ def test_default_complex_sort(): _, data = view2.get_list(0, None, None, None, None) - eq_(len(data), 2) - eq_(data[0].model1.test1, 'a') - eq_(data[1].model1.test1, 'b') + assert len(data) == 2 + assert data[0].model1.test1 == 'a' + assert data[1].model1.test1 == 'b' def test_extra_fields(): @@ -2170,14 +2148,14 @@ def test_extra_fields(): client = app.test_client() rv = client.get('/admin/model1/new/') - eq_(rv.status_code, 200) + assert rv.status_code == 200 # Check presence and order data = rv.data.decode('utf-8') - ok_('Extra Field' in data) + assert 'Extra Field' in data pos1 = data.find('Extra Field') pos2 = data.find('Test1') - ok_(pos2 < pos1) + assert pos2 < pos1 def test_extra_field_order(): @@ -2197,13 +2175,13 @@ def test_extra_field_order(): client = app.test_client() rv = client.get('/admin/model1/new/') - eq_(rv.status_code, 200) + assert rv.status_code == 200 # Check presence and order data = rv.data.decode('utf-8') pos1 = data.find('Extra Field') pos2 = data.find('Test1') - ok_(pos2 > pos1) + assert pos2 > pos1 def test_modelview_localization(): @@ -2226,10 +2204,10 @@ def test_locale(locale): client = app.test_client() rv = client.get('/admin/model1/') - eq_(rv.status_code, 200) + assert rv.status_code == 200 rv = client.get('/admin/model1/new/') - eq_(rv.status_code, 200) + assert rv.status_code == 200 except: print("Error on the following locale:", locale) raise @@ -2257,7 +2235,7 @@ def test_modelview_named_filter_localization(): flt = filters[2] with app.test_request_context(): flt_name = view.get_filter_arg(2, flt) - eq_('test1_equals', flt_name) + assert 'test1_equals' == flt_name def test_custom_form_base(): @@ -2274,10 +2252,10 @@ class TestForm(form.BaseForm): ) admin.add_view(view) - ok_(hasattr(view._create_form_class, 'test1')) + assert hasattr(view._create_form_class, 'test1') create_form = view.create_form() - ok_(isinstance(create_form, TestForm)) + assert isinstance(create_form, TestForm) def test_ajax_fk(): @@ -2296,7 +2274,7 @@ def test_ajax_fk(): ) admin.add_view(view) - ok_(u'model1' in view._form_ajax_refs) + assert u'model1' in view._form_ajax_refs model = Model1(u'first') model2 = Model1(u'foo', u'bar') @@ -2306,42 +2284,42 @@ def test_ajax_fk(): # Check loader loader = view._form_ajax_refs[u'model1'] mdl = loader.get_one(model.id) - eq_(mdl.test1, model.test1) + assert mdl.test1 == model.test1 items = loader.get_list(u'fir') - eq_(len(items), 1) - eq_(items[0].id, model.id) + assert len(items) == 1 + assert items[0].id == model.id items = loader.get_list(u'bar') - eq_(len(items), 1) - eq_(items[0].test1, u'foo') + assert len(items) == 1 + assert items[0].test1 == u'foo' # Check form generation form = view.create_form() - eq_(form.model1.__class__.__name__, u'AjaxSelectField') + assert form.model1.__class__.__name__ == u'AjaxSelectField' with app.test_request_context('/admin/view/'): - ok_(u'value=""' not in form.model1()) + assert u'value=""' not in form.model1() form.model1.data = model - ok_(u'data-json="[%s, "first"]"' % model.id in form.model1() or - u'data-json="[%s, "first"]"' % model.id in form.model1()) - ok_(u'value="1"' in form.model1()) + assert (u'data-json="[%s, "first"]"' % model.id in form.model1() or + u'data-json="[%s, "first"]"' % model.id in form.model1()) + assert u'value="1"' in form.model1() # Check querying client = app.test_client() req = client.get(u'/admin/view/ajax/lookup/?name=model1&query=foo') - eq_(req.data.decode('utf-8'), u'[[%s, "foo"]]' % model2.id) + assert req.data.decode('utf-8') == u'[[%s, "foo"]]' % model2.id # Check submitting req = client.post('/admin/view/new/', data={u'model1': as_unicode(model.id)}) mdl = db.session.query(Model2).first() - ok_(mdl is not None) - ok_(mdl.model1 is not None) - eq_(mdl.model1.id, model.id) - eq_(mdl.model1.test1, u'first') + assert mdl is not None + assert mdl.model1 is not None + assert mdl.model1.id == model.id + assert mdl.model1.test1 == u'first' def test_ajax_fk_multi(): @@ -2383,7 +2361,7 @@ class Model2(db.Model): ) admin.add_view(view) - ok_(u'model1' in view._form_ajax_refs) + assert u'model1' in view._form_ajax_refs model = Model1(name=u'first') db.session.add_all([model, Model1(name=u'foo')]) @@ -2391,23 +2369,23 @@ class Model2(db.Model): # Check form generation form = view.create_form() - eq_(form.model1.__class__.__name__, u'AjaxSelectMultipleField') + assert form.model1.__class__.__name__ == u'AjaxSelectMultipleField' with app.test_request_context('/admin/view/'): - ok_(u'data-json="[]"' in form.model1()) + assert u'data-json="[]"' in form.model1() form.model1.data = [model] - ok_(u'data-json="[[1, "first"]]"' in form.model1() or - u'data-json="[[1, "first"]]"' in form.model1()) + assert (u'data-json="[[1, "first"]]"' in form.model1() or + u'data-json="[[1, "first"]]"' in form.model1()) # Check submitting client = app.test_client() client.post('/admin/view/new/', data={u'model1': as_unicode(model.id)}) mdl = db.session.query(Model2).first() - ok_(mdl is not None) - ok_(mdl.model1 is not None) - eq_(len(mdl.model1), 1) + assert mdl is not None + assert mdl.model1 is not None + assert len(mdl.model1) == 1 def test_safe_redirect(): @@ -2423,19 +2401,19 @@ def test_safe_redirect(): data=dict(test1='test1large', test2='test2', _continue_editing='Save and Continue Editing')) - eq_(rv.status_code, 302) - assert_true(rv.location.startswith('http://localhost/admin/model1/edit/')) - assert_true('url=http%3A%2F%2Flocalhost%2Fadmin%2Fmodel2view%2F' in rv.location) - assert_true('id=1' in rv.location) + assert rv.status_code == 302 + assert rv.location.startswith('http://localhost/admin/model1/edit/') + assert 'url=http%3A%2F%2Flocalhost%2Fadmin%2Fmodel2view%2F' in rv.location + assert 'id=1' in rv.location rv = client.post('/admin/model1/new/?url=http://google.com/evil/', data=dict(test1='test1large', test2='test2', _continue_editing='Save and Continue Editing')) - eq_(rv.status_code, 302) - assert_true(rv.location.startswith('http://localhost/admin/model1/edit/')) - assert_true('url=%2Fadmin%2Fmodel1%2F' in rv.location) - assert_true('id=2' in rv.location) + assert rv.status_code == 302 + assert rv.location.startswith('http://localhost/admin/model1/edit/') + assert 'url=%2Fadmin%2Fmodel1%2F' in rv.location + assert 'id=2' in rv.location def test_simple_list_pager(): @@ -2452,7 +2430,7 @@ def get_count_query(self): admin.add_view(view) count, data = view.get_list(0, None, None, None, None) - assert_true(count is None) + assert count is None def test_unlimited_page_size(): @@ -2469,12 +2447,12 @@ def test_unlimited_page_size(): # test 0 as page_size _, data = view.get_list(0, None, None, None, None, execute=True, page_size=0) - eq_(len(data), 21) + assert len(data) == 21 # test False as page_size _, data = view.get_list(0, None, None, None, None, execute=True, page_size=False) - eq_(len(data), 21) + assert len(data) == 21 def test_advanced_joins(): @@ -2510,46 +2488,46 @@ class Model3(db.Model): # Test joins attr, path = tools.get_field_with_path(Model2, 'model1.val1') - eq_(attr, Model1.val1) - eq_(path, [Model2.model1]) + assert attr == Model1.val1 + assert path == [Model2.model1] attr, path = tools.get_field_with_path(Model1, 'model2.val2') - eq_(attr, Model2.val2) - eq_(id(path[0]), id(Model1.model2)) + assert attr == Model2.val2 + assert id(path[0]) == id(Model1.model2) attr, path = tools.get_field_with_path(Model3, 'model2.model1.val1') - eq_(attr, Model1.val1) - eq_(path, [Model3.model2, Model2.model1]) + assert attr == Model1.val1 + assert path == [Model3.model2, Model2.model1] # Test how joins are applied query = view3.get_query() joins = {} q1, joins, alias = view3._apply_path_joins(query, joins, path) - ok_((True, Model3.model2) in joins) - ok_((True, Model2.model1) in joins) - ok_(alias is not None) + assert (True, Model3.model2) in joins + assert (True, Model2.model1) in joins + assert alias is not None # Check if another join would use same path attr, path = tools.get_field_with_path(Model2, 'model1.test') q2, joins, alias = view2._apply_path_joins(query, joins, path) - eq_(len(joins), 2) + assert len(joins) == 2 if hasattr(q2, '_join_entities'): for p in q2._join_entities: - ok_(p in q1._join_entities) + assert p in q1._join_entities - ok_(alias is not None) + assert alias is not None # Check if normal properties are supported by tools.get_field_with_path attr, path = tools.get_field_with_path(Model2, Model1.test) - eq_(attr, Model1.test) - eq_(path, [Model1.__table__]) + assert attr == Model1.test + assert path == [Model1.__table__] q3, joins, alias = view2._apply_path_joins(view2.get_query(), joins, path) - eq_(len(joins), 3) - ok_(alias is None) + assert len(joins) == 3 + assert alias is None def test_multipath_joins(): @@ -2578,7 +2556,7 @@ class Model2(db.Model): client = app.test_client() rv = client.get('/admin/model2/') - eq_(rv.status_code, 200) + assert rv.status_code == 200 def test_different_bind_joins(): @@ -2606,7 +2584,7 @@ class Model2(db.Model): client = app.test_client() rv = client.get('/admin/model2/') - eq_(rv.status_code, 200) + assert rv.status_code == 200 def test_model_default(): @@ -2621,7 +2599,7 @@ class ModelView(CustomModelView): client = app.test_client() rv = client.post('/admin/model2/new/', data=dict()) - assert_true(b'This field is required' not in rv.data) + assert b'This field is required' not in rv.data def test_export_csv(): @@ -2641,10 +2619,10 @@ def test_export_csv(): # test export_max_rows rv = client.get('/admin/row_limit_2/export/csv/') data = rv.data.decode('utf-8') - eq_(rv.status_code, 200) - ok_("Test1,Test2\r\n" - "test1_val_1,test2_val_1\r\n" - "test1_val_2,test2_val_2\r\n" == data) + assert rv.status_code == 200 + assert "Test1,Test2\r\n" + \ + "test1_val_1,test2_val_1\r\n" + \ + "test1_val_2,test2_val_2\r\n" == data view = CustomModelView(Model1, db.session, can_export=True, column_list=['test1', 'test2'], @@ -2654,5 +2632,5 @@ def test_export_csv(): # test row limit without export_max_rows rv = client.get('/admin/no_row_limit/export/csv/') data = rv.data.decode('utf-8') - eq_(rv.status_code, 200) - ok_(len(data.splitlines()) > 21) + assert rv.status_code == 200 + assert len(data.splitlines()) > 21 diff --git a/flask_admin/tests/sqla/test_form_rules.py b/flask_admin/tests/sqla/test_form_rules.py index 6f9375198e..64b507c94d 100644 --- a/flask_admin/tests/sqla/test_form_rules.py +++ b/flask_admin/tests/sqla/test_form_rules.py @@ -1,5 +1,3 @@ -from nose.tools import eq_, ok_ - from . import setup from .test_basic import CustomModelView, create_models @@ -19,16 +17,16 @@ def test_form_rules(): client = app.test_client() rv = client.get('/admin/model1/new/') - eq_(rv.status_code, 200) + assert rv.status_code == 200 data = rv.data.decode('utf-8') pos1 = data.find('Test1') pos2 = data.find('Test2') pos3 = data.find('Test3') pos4 = data.find('Test4') - ok_(pos1 > pos2) - ok_(pos4 > pos1) - ok_(pos3 == -1) + assert pos1 > pos2 + assert pos4 > pos1 + assert pos3 == -1 def test_rule_macro(): @@ -46,11 +44,11 @@ def test_rule_macro(): client = app.test_client() rv = client.get('/admin/model1/new/') - eq_(rv.status_code, 200) + assert rv.status_code == 200 data = rv.data.decode('utf-8') - ok_('Value = foobar' in data) - ok_('Hello another_test' in data) + assert 'Value = foobar' in data + assert 'Hello another_test' in data def test_rule_container(): @@ -67,16 +65,16 @@ def test_rule_container(): client = app.test_client() rv = client.get('/admin/model1/new/') - eq_(rv.status_code, 200) + assert rv.status_code == 200 data = rv.data.decode('utf-8') pos1 = data.find('') pos2 = data.find('another_test') pos3 = data.find('') - ok_(pos1 != -1) - ok_(pos2 != -1) - ok_(pos3 != -1) - ok_(pos1 < pos2 < pos3) + assert pos1 != -1 + assert pos2 != -1 + assert pos3 != -1 + assert pos1 < pos2 < pos3 def test_rule_header(): @@ -92,10 +90,10 @@ def test_rule_header(): client = app.test_client() rv = client.get('/admin/model1/new/') - eq_(rv.status_code, 200) + assert rv.status_code == 200 data = rv.data.decode('utf-8') - ok_('

hello

' in data) + assert '

hello

' in data def test_rule_field_set(): @@ -111,17 +109,17 @@ def test_rule_field_set(): client = app.test_client() rv = client.get('/admin/model1/new/') - eq_(rv.status_code, 200) + assert rv.status_code == 200 data = rv.data.decode('utf-8') - ok_('

header

' in data) + assert '

header

' in data pos1 = data.find('Test1') pos2 = data.find('Test2') pos3 = data.find('Test3') pos4 = data.find('Test4') - ok_(pos1 > pos2) - ok_(pos4 > pos1) - ok_(pos3 == -1) + assert pos1 > pos2 + assert pos4 > pos1 + assert pos3 == -1 def test_rule_inlinefieldlist(): @@ -138,7 +136,7 @@ def test_rule_inlinefieldlist(): client = app.test_client() rv = client.get('/admin/model1/new/') - eq_(rv.status_code, 200) + assert rv.status_code == 200 def test_inline_model_rules(): @@ -154,7 +152,7 @@ def test_inline_model_rules(): client = app.test_client() rv = client.get('/admin/model1/new/') - eq_(rv.status_code, 200) + assert rv.status_code == 200 data = rv.data.decode('utf-8') - ok_('int_field' not in data) + assert 'int_field' not in data diff --git a/flask_admin/tests/sqla/test_inlineform.py b/flask_admin/tests/sqla/test_inlineform.py index b0665fe2dd..bd45c0f6e6 100644 --- a/flask_admin/tests/sqla/test_inlineform.py +++ b/flask_admin/tests/sqla/test_inlineform.py @@ -1,6 +1,4 @@ # -*- coding: utf-8 -*- -from nose.tools import eq_, ok_ - from wtforms import fields from flask_admin import form @@ -42,35 +40,35 @@ class UserModelView(ModelView): admin.add_view(view) # Basic tests - ok_(view._create_form_class is not None) - ok_(view._edit_form_class is not None) - eq_(view.endpoint, 'user') + assert view._create_form_class is not None + assert view._edit_form_class is not None + assert view.endpoint == 'user' # Verify form - eq_(view._create_form_class.name.field_class, fields.StringField) - eq_(view._create_form_class.info.field_class, InlineModelFormList) + assert view._create_form_class.name.field_class == fields.StringField + assert view._create_form_class.info.field_class == InlineModelFormList rv = client.get('/admin/user/') - eq_(rv.status_code, 200) + assert rv.status_code == 200 rv = client.get('/admin/user/new/') - eq_(rv.status_code, 200) + assert rv.status_code == 200 # Create rv = client.post('/admin/user/new/', data=dict(name=u'äõüxyz')) - eq_(rv.status_code, 302) - eq_(User.query.count(), 1) - eq_(UserInfo.query.count(), 0) + assert rv.status_code == 302 + assert User.query.count() == 1 + assert UserInfo.query.count() == 0 data = {'name': u'fbar', 'info-0-key': 'foo', 'info-0-val': 'bar'} rv = client.post('/admin/user/new/', data=data) - eq_(rv.status_code, 302) - eq_(User.query.count(), 2) - eq_(UserInfo.query.count(), 1) + assert rv.status_code == 302 + assert User.query.count() == 2 + assert UserInfo.query.count() == 1 # Edit rv = client.get('/admin/user/edit/?id=2') - eq_(rv.status_code, 200) + assert rv.status_code == 200 # Edit - update data = { 'name': u'barfoo', @@ -79,8 +77,8 @@ class UserModelView(ModelView): 'info-0-val': u'yyy', } rv = client.post('/admin/user/edit/?id=2', data=data) - eq_(UserInfo.query.count(), 1) - eq_(UserInfo.query.one().key, u'xxx') + assert UserInfo.query.count() == 1 + assert UserInfo.query.one().key == u'xxx' # Edit - add & delete data = { @@ -94,20 +92,20 @@ class UserModelView(ModelView): 'info-1-val': u'foo', } rv = client.post('/admin/user/edit/?id=2', data=data) - eq_(rv.status_code, 302) - eq_(User.query.count(), 2) - eq_(User.query.get(2).name, u'barf') - eq_(UserInfo.query.count(), 1) - eq_(UserInfo.query.one().key, u'bar') + assert rv.status_code == 302 + assert User.query.count() == 2 + assert User.query.get(2).name == u'barf' + assert UserInfo.query.count() == 1 + assert UserInfo.query.one().key == u'bar' # Delete rv = client.post('/admin/user/delete/?id=2') - eq_(rv.status_code, 302) - eq_(User.query.count(), 1) + assert rv.status_code == 302 + assert User.query.count() == 1 rv = client.post('/admin/user/delete/?id=1') - eq_(rv.status_code, 302) - eq_(User.query.count(), 0) - eq_(UserInfo.query.count(), 0) + assert rv.status_code == 302 + assert User.query.count() == 0 + assert UserInfo.query.count() == 0 def test_inline_form_required(): @@ -145,17 +143,17 @@ class UserModelView(ModelView): # Create rv = client.post('/admin/user/new/', data=dict(name=u'no-email')) - eq_(rv.status_code, 200) - eq_(User.query.count(), 0) + assert rv.status_code == 200 + assert User.query.count() == 0 data = { 'name': 'hasEmail', 'emails-0-email': 'foo@bar.com', } rv = client.post('/admin/user/new/', data=data) - eq_(rv.status_code, 302) - eq_(User.query.count(), 1) - eq_(UserEmail.query.count(), 1) + assert rv.status_code == 302 + assert User.query.count() == 1 + assert UserEmail.query.count() == 1 def test_inline_form_ajax_fk(): @@ -208,10 +206,10 @@ class UserModelView(ModelView): form = view.create_form() user_info_form = form.info.unbound_field.args[0] loader = user_info_form.tag.args[0] - eq_(loader.name, 'userinfo-tag') - eq_(loader.model, Tag) + assert loader.name == 'userinfo-tag' + assert loader.model == Tag - ok_('userinfo-tag' in view._form_ajax_refs) + assert 'userinfo-tag' in view._form_ajax_refs def test_inline_form_self(): @@ -232,7 +230,7 @@ class TreeView(ModelView): parent = Tree() child = Tree(parent=parent) form = view.edit_form(child) - eq_(form.parent.data, parent) + assert form.parent.data == parent def test_inline_form_base_class(): @@ -286,6 +284,6 @@ class UserModelView(ModelView): 'emails-0-email': '', } rv = client.post('/admin/user/new/', data=data) - eq_(rv.status_code, 200) - eq_(User.query.count(), 0) - ok_(b'success!' in rv.data, rv.data) + assert rv.status_code == 200 + assert User.query.count() == 0 + assert b'success!' in rv.data, rv.data diff --git a/flask_admin/tests/sqla/test_multi_pk.py b/flask_admin/tests/sqla/test_multi_pk.py index fc96df765b..1261a218b5 100644 --- a/flask_admin/tests/sqla/test_multi_pk.py +++ b/flask_admin/tests/sqla/test_multi_pk.py @@ -1,5 +1,3 @@ -from nose.tools import eq_, ok_ - from . import setup from .test_basic import CustomModelView @@ -24,25 +22,25 @@ class Model(db.Model): client = app.test_client() rv = client.get('/admin/model/') - eq_(rv.status_code, 200) + assert rv.status_code == 200 rv = client.post('/admin/model/new/', data=dict(id=1, id2='two', test='test3')) - eq_(rv.status_code, 302) + assert rv.status_code == 302 rv = client.get('/admin/model/') - eq_(rv.status_code, 200) + assert rv.status_code == 200 data = rv.data.decode('utf-8') - ok_('test3' in data) + assert 'test3' in data rv = client.get('/admin/model/edit/?id=1,two') - eq_(rv.status_code, 200) + assert rv.status_code == 200 data = rv.data.decode('utf-8') - ok_('test3' in data) + assert 'test3' in data # Correct order is mandatory -> fail here rv = client.get('/admin/model/edit/?id=two,1') - eq_(rv.status_code, 302) + assert rv.status_code == 302 def test_joined_inheritance(): @@ -71,17 +69,17 @@ class Child(Parent): client = app.test_client() rv = client.get('/admin/child/') - eq_(rv.status_code, 200) + assert rv.status_code == 200 rv = client.post('/admin/child/new/', data=dict(id=1, test='foo', name='bar')) - eq_(rv.status_code, 302) + assert rv.status_code == 302 rv = client.get('/admin/child/edit/?id=1') - eq_(rv.status_code, 200) + assert rv.status_code == 200 data = rv.data.decode('utf-8') - ok_('foo' in data) - ok_('bar' in data) + assert 'foo' in data + assert 'bar' in data def test_single_table_inheritance(): @@ -111,17 +109,17 @@ class Child(Parent): client = app.test_client() rv = client.get('/admin/child/') - eq_(rv.status_code, 200) + assert rv.status_code == 200 rv = client.post('/admin/child/new/', data=dict(id=1, test='foo', name='bar')) - eq_(rv.status_code, 302) + assert rv.status_code == 302 rv = client.get('/admin/child/edit/?id=1') - eq_(rv.status_code, 200) + assert rv.status_code == 200 data = rv.data.decode('utf-8') - ok_('foo' in data) - ok_('bar' in data) + assert 'foo' in data + assert 'bar' in data def test_concrete_table_inheritance(): @@ -146,17 +144,17 @@ class Child(Parent): client = app.test_client() rv = client.get('/admin/child/') - eq_(rv.status_code, 200) + assert rv.status_code == 200 rv = client.post('/admin/child/new/', data=dict(id=1, test='foo', name='bar')) - eq_(rv.status_code, 302) + assert rv.status_code == 302 rv = client.get('/admin/child/edit/?id=1') - eq_(rv.status_code, 200) + assert rv.status_code == 200 data = rv.data.decode('utf-8') - ok_('foo' in data) - ok_('bar' in data) + assert 'foo' in data + assert 'bar' in data def test_concrete_multipk_inheritance(): @@ -182,14 +180,14 @@ class Child(Parent): client = app.test_client() rv = client.get('/admin/child/') - eq_(rv.status_code, 200) + assert rv.status_code == 200 rv = client.post('/admin/child/new/', data=dict(id=1, id2=2, test='foo', name='bar')) - eq_(rv.status_code, 302) + assert rv.status_code == 302 rv = client.get('/admin/child/edit/?id=1,2') - eq_(rv.status_code, 200) + assert rv.status_code == 200 data = rv.data.decode('utf-8') - ok_('foo' in data) - ok_('bar' in data) + assert 'foo' in data + assert 'bar' in data diff --git a/flask_admin/tests/sqla/test_postgres.py b/flask_admin/tests/sqla/test_postgres.py index edc45b9e9e..0e97cd38f7 100644 --- a/flask_admin/tests/sqla/test_postgres.py +++ b/flask_admin/tests/sqla/test_postgres.py @@ -1,5 +1,3 @@ -from nose.tools import eq_, ok_ - from . import setup_postgres from .test_basic import CustomModelView @@ -22,25 +20,25 @@ class Model(db.Model): client = app.test_client() rv = client.get('/admin/model/') - eq_(rv.status_code, 200) + assert rv.status_code == 200 rv = client.post('/admin/model/new/', data={ 'hstore_test-0-key': 'test_val1', 'hstore_test-0-value': 'test_val2' }) - eq_(rv.status_code, 302) + assert rv.status_code == 302 rv = client.get('/admin/model/') - eq_(rv.status_code, 200) + assert rv.status_code == 200 data = rv.data.decode('utf-8') - ok_('test_val1' in data) - ok_('test_val2' in data) + assert 'test_val1' in data + assert 'test_val2' in data rv = client.get('/admin/model/edit/?id=1') - eq_(rv.status_code, 200) + assert rv.status_code == 200 data = rv.data.decode('utf-8') - ok_('test_val1' in data) - ok_('test_val2' in data) + assert 'test_val1' in data + assert 'test_val2' in data def test_json(): @@ -58,25 +56,25 @@ class JSONModel(db.Model): client = app.test_client() rv = client.get('/admin/jsonmodel/') - eq_(rv.status_code, 200) + assert rv.status_code == 200 rv = client.post('/admin/jsonmodel/new/', data={ 'json_test': '{"test_key1": "test_value1"}', }) - eq_(rv.status_code, 302) + assert rv.status_code == 302 rv = client.get('/admin/jsonmodel/') - eq_(rv.status_code, 200) + assert rv.status_code == 200 data = rv.data.decode('utf-8') - ok_('json_test' in data) - ok_('{"test_key1": "test_value1"}' in data) + assert 'json_test' in data + assert '{"test_key1": "test_value1"}' in data rv = client.get('/admin/jsonmodel/edit/?id=1') - eq_(rv.status_code, 200) + assert rv.status_code == 200 data = rv.data.decode('utf-8') - ok_('json_test' in data) - ok_('>{"test_key1": "test_value1"}<' in data or - '{"test_key1": "test_value1"}<' in data) + assert 'json_test' in data + assert ('>{"test_key1": "test_value1"}<' in data or + '{"test_key1": "test_value1"}<' in data) def test_citext(): @@ -95,23 +93,23 @@ class CITextModel(db.Model): client = app.test_client() rv = client.get('/admin/citextmodel/') - eq_(rv.status_code, 200) + assert rv.status_code == 200 rv = client.post('/admin/citextmodel/new/', data={ 'citext_test': 'Foo', }) - eq_(rv.status_code, 302) + assert rv.status_code == 302 rv = client.get('/admin/citextmodel/') - eq_(rv.status_code, 200) + assert rv.status_code == 200 data = rv.data.decode('utf-8') - ok_('citext_test' in data) - ok_('Foo' in data) + assert 'citext_test' in data + assert 'Foo' in data rv = client.get('/admin/citextmodel/edit/?id=1') - eq_(rv.status_code, 200) + assert rv.status_code == 200 data = rv.data.decode('utf-8') - ok_('name="citext_test"' in data) - ok_('>Foo\nFoo\r\nFooFoo\nFoo\r\nFoo=1.0', + 'pytest', 'pillow>=3.3.2', 'mongoengine', 'pymongo', @@ -90,5 +90,5 @@ def grep(attrname): 'Programming Language :: Python :: 3.5', 'Programming Language :: Python :: 3.6', ], - test_suite='nose.collector' + test_suite='flask_admin.tests' ) From 7f8a3c93b333c310601e8b217b75972e06ccb9c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C4=9Bj=20Cepl?= Date: Tue, 1 Jun 2021 09:50:57 +0200 Subject: [PATCH 45/69] Make the code 2.7 syntax compatible. --- flask_admin/tests/sqla/test_basic.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flask_admin/tests/sqla/test_basic.py b/flask_admin/tests/sqla/test_basic.py index a2b31699c0..3c559d801e 100644 --- a/flask_admin/tests/sqla/test_basic.py +++ b/flask_admin/tests/sqla/test_basic.py @@ -1644,7 +1644,7 @@ class Model1(db.Model): @hybrid_property def fullname(self): - return f'{self.firstname} {self.lastname}' + return '{} {}'.format(self.firstname, self.lastname) class Model2(db.Model): id = db.Column(db.Integer, primary_key=True) From 25618dc00214c77100bee9264ebdf140ac274f10 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C4=9Bj=20Cepl?= Date: Tue, 1 Jun 2021 09:54:17 +0200 Subject: [PATCH 46/69] Fix CI --- requirements-dev.txt | 3 ++- tox.ini | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/requirements-dev.txt b/requirements-dev.txt index 3f4c872ca2..82c7ead8ab 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -12,7 +12,8 @@ flask-babelex shapely==1.5.9 geoalchemy2 psycopg2 -nose +pytest +pytest-cov coveralls pylint sqlalchemy-citext diff --git a/tox.ini b/tox.ini index eddac1c7ca..c669f1d2c9 100644 --- a/tox.ini +++ b/tox.ini @@ -20,7 +20,7 @@ deps = WTForms2: WTForms>=2.0 -r{toxinidir}/requirements-dev.txt commands = - nosetests flask_admin/tests --with-coverage --cover-erase --cover-inclusive + pytest -v flask_admin/tests --cov=flask_admin --cov-report=html [testenv:flake8] deps = flake8 From 8c564ccfcc7337413d84ce0834d51da63f7f07e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C4=9Bj=20Cepl?= Date: Tue, 1 Jun 2021 10:53:26 +0200 Subject: [PATCH 47/69] Fix a syntax error in tests/geoa/test_basic.py ... misplaced ends of brackets. --- flask_admin/tests/geoa/test_basic.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flask_admin/tests/geoa/test_basic.py b/flask_admin/tests/geoa/test_basic.py index 3243cc7c80..b92faea853 100644 --- a/flask_admin/tests/geoa/test_basic.py +++ b/flask_admin/tests/geoa/test_basic.py @@ -72,7 +72,7 @@ def test_model(): model = db.session.query(GeoModel).first() assert model.name == "test1" assert to_shape(model.point).geom_type == "Point" - assert list(to_shape(model.point).coords) == [(125.8, 10.0]) + assert list(to_shape(model.point).coords) == [(125.8, 10.0,)] assert to_shape(model.line).geom_type == "LineString" assert list(to_shape(model.line).coords) == [(50.2345, 94.2, (50.21, 94.87)]) assert to_shape(model.polygon).geom_type == "Polygon" From b21e33601b321d724598707f0a61349f8eee3cd1 Mon Sep 17 00:00:00 2001 From: rtilk89 Date: Thu, 3 Jun 2021 13:01:42 -0500 Subject: [PATCH 48/69] Upgrade jquery to 3.5.1 --- flask_admin/static/vendor/jquery-3.3.1.slim.min.js | 2 -- flask_admin/static/vendor/jquery-3.5.1.slim.min.js | 2 ++ flask_admin/static/vendor/jquery.min.js | 4 ++-- flask_admin/templates/bootstrap2/admin/base.html | 2 +- flask_admin/templates/bootstrap3/admin/base.html | 2 +- flask_admin/templates/bootstrap4/admin/base.html | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) delete mode 100644 flask_admin/static/vendor/jquery-3.3.1.slim.min.js create mode 100644 flask_admin/static/vendor/jquery-3.5.1.slim.min.js diff --git a/flask_admin/static/vendor/jquery-3.3.1.slim.min.js b/flask_admin/static/vendor/jquery-3.3.1.slim.min.js deleted file mode 100644 index f4ca9b24ba..0000000000 --- a/flask_admin/static/vendor/jquery-3.3.1.slim.min.js +++ /dev/null @@ -1,2 +0,0 @@ -/*! jQuery v3.3.1 -ajax,-ajax/jsonp,-ajax/load,-ajax/parseXML,-ajax/script,-ajax/var/location,-ajax/var/nonce,-ajax/var/rquery,-ajax/xhr,-manipulation/_evalUrl,-event/ajax,-effects,-effects/Tween,-effects/animatedSelector | (c) JS Foundation and other contributors | jquery.org/license */ -!function(e,t){"use strict";"object"==typeof module&&"object"==typeof module.exports?module.exports=e.document?t(e,!0):function(e){if(!e.document)throw new Error("jQuery requires a window with a document");return t(e)}:t(e)}("undefined"!=typeof window?window:this,function(e,t){"use strict";var n=[],r=e.document,i=Object.getPrototypeOf,o=n.slice,a=n.concat,u=n.push,s=n.indexOf,l={},c=l.toString,f=l.hasOwnProperty,d=f.toString,p=d.call(Object),h={},g=function e(t){return"function"==typeof t&&"number"!=typeof t.nodeType},v=function e(t){return null!=t&&t===t.window},y={type:!0,src:!0,noModule:!0};function m(e,t,n){var i,o=(t=t||r).createElement("script");if(o.text=e,n)for(i in y)n[i]&&(o[i]=n[i]);t.head.appendChild(o).parentNode.removeChild(o)}function b(e){return null==e?e+"":"object"==typeof e||"function"==typeof e?l[c.call(e)]||"object":typeof e}var x="3.3.1 -ajax,-ajax/jsonp,-ajax/load,-ajax/parseXML,-ajax/script,-ajax/var/location,-ajax/var/nonce,-ajax/var/rquery,-ajax/xhr,-manipulation/_evalUrl,-event/ajax,-effects,-effects/Tween,-effects/animatedSelector",w=function(e,t){return new w.fn.init(e,t)},C=/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g;w.fn=w.prototype={jquery:x,constructor:w,length:0,toArray:function(){return o.call(this)},get:function(e){return null==e?o.call(this):e<0?this[e+this.length]:this[e]},pushStack:function(e){var t=w.merge(this.constructor(),e);return t.prevObject=this,t},each:function(e){return w.each(this,e)},map:function(e){return this.pushStack(w.map(this,function(t,n){return e.call(t,n,t)}))},slice:function(){return this.pushStack(o.apply(this,arguments))},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},eq:function(e){var t=this.length,n=+e+(e<0?t:0);return this.pushStack(n>=0&&n0&&t-1 in e)}var E=function(e){var t,n,r,i,o,a,u,s,l,c,f,d,p,h,g,v,y,m,b,x="sizzle"+1*new Date,w=e.document,C=0,T=0,E=ae(),N=ae(),k=ae(),A=function(e,t){return e===t&&(f=!0),0},D={}.hasOwnProperty,S=[],L=S.pop,j=S.push,q=S.push,O=S.slice,P=function(e,t){for(var n=0,r=e.length;n+~]|"+I+")"+I+"*"),_=new RegExp("="+I+"*([^\\]'\"]*?)"+I+"*\\]","g"),U=new RegExp(M),V=new RegExp("^"+R+"$"),X={ID:new RegExp("^#("+R+")"),CLASS:new RegExp("^\\.("+R+")"),TAG:new RegExp("^("+R+"|[*])"),ATTR:new RegExp("^"+B),PSEUDO:new RegExp("^"+M),CHILD:new RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+I+"*(even|odd|(([+-]|)(\\d*)n|)"+I+"*(?:([+-]|)"+I+"*(\\d+)|))"+I+"*\\)|)","i"),bool:new RegExp("^(?:"+H+")$","i"),needsContext:new RegExp("^"+I+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+I+"*((?:-\\d)?\\d*)"+I+"*\\)|)(?=[^-]|$)","i")},Q=/^(?:input|select|textarea|button)$/i,Y=/^h\d$/i,G=/^[^{]+\{\s*\[native \w/,K=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,J=/[+~]/,Z=new RegExp("\\\\([\\da-f]{1,6}"+I+"?|("+I+")|.)","ig"),ee=function(e,t,n){var r="0x"+t-65536;return r!==r||n?t:r<0?String.fromCharCode(r+65536):String.fromCharCode(r>>10|55296,1023&r|56320)},te=/([\0-\x1f\x7f]|^-?\d)|^-$|[^\0-\x1f\x7f-\uFFFF\w-]/g,ne=function(e,t){return t?"\0"===e?"\ufffd":e.slice(0,-1)+"\\"+e.charCodeAt(e.length-1).toString(16)+" ":"\\"+e},re=function(){d()},ie=me(function(e){return!0===e.disabled&&("form"in e||"label"in e)},{dir:"parentNode",next:"legend"});try{q.apply(S=O.call(w.childNodes),w.childNodes),S[w.childNodes.length].nodeType}catch(e){q={apply:S.length?function(e,t){j.apply(e,O.call(t))}:function(e,t){var n=e.length,r=0;while(e[n++]=t[r++]);e.length=n-1}}}function oe(e,t,r,i){var o,u,l,c,f,h,y,m=t&&t.ownerDocument,C=t?t.nodeType:9;if(r=r||[],"string"!=typeof e||!e||1!==C&&9!==C&&11!==C)return r;if(!i&&((t?t.ownerDocument||t:w)!==p&&d(t),t=t||p,g)){if(11!==C&&(f=K.exec(e)))if(o=f[1]){if(9===C){if(!(l=t.getElementById(o)))return r;if(l.id===o)return r.push(l),r}else if(m&&(l=m.getElementById(o))&&b(t,l)&&l.id===o)return r.push(l),r}else{if(f[2])return q.apply(r,t.getElementsByTagName(e)),r;if((o=f[3])&&n.getElementsByClassName&&t.getElementsByClassName)return q.apply(r,t.getElementsByClassName(o)),r}if(n.qsa&&!k[e+" "]&&(!v||!v.test(e))){if(1!==C)m=t,y=e;else if("object"!==t.nodeName.toLowerCase()){(c=t.getAttribute("id"))?c=c.replace(te,ne):t.setAttribute("id",c=x),u=(h=a(e)).length;while(u--)h[u]="#"+c+" "+ye(h[u]);y=h.join(","),m=J.test(e)&&ge(t.parentNode)||t}if(y)try{return q.apply(r,m.querySelectorAll(y)),r}catch(e){}finally{c===x&&t.removeAttribute("id")}}}return s(e.replace($,"$1"),t,r,i)}function ae(){var e=[];function t(n,i){return e.push(n+" ")>r.cacheLength&&delete t[e.shift()],t[n+" "]=i}return t}function ue(e){return e[x]=!0,e}function se(e){var t=p.createElement("fieldset");try{return!!e(t)}catch(e){return!1}finally{t.parentNode&&t.parentNode.removeChild(t),t=null}}function le(e,t){var n=e.split("|"),i=n.length;while(i--)r.attrHandle[n[i]]=t}function ce(e,t){var n=t&&e,r=n&&1===e.nodeType&&1===t.nodeType&&e.sourceIndex-t.sourceIndex;if(r)return r;if(n)while(n=n.nextSibling)if(n===t)return-1;return e?1:-1}function fe(e){return function(t){return"input"===t.nodeName.toLowerCase()&&t.type===e}}function de(e){return function(t){var n=t.nodeName.toLowerCase();return("input"===n||"button"===n)&&t.type===e}}function pe(e){return function(t){return"form"in t?t.parentNode&&!1===t.disabled?"label"in t?"label"in t.parentNode?t.parentNode.disabled===e:t.disabled===e:t.isDisabled===e||t.isDisabled!==!e&&ie(t)===e:t.disabled===e:"label"in t&&t.disabled===e}}function he(e){return ue(function(t){return t=+t,ue(function(n,r){var i,o=e([],n.length,t),a=o.length;while(a--)n[i=o[a]]&&(n[i]=!(r[i]=n[i]))})})}function ge(e){return e&&"undefined"!=typeof e.getElementsByTagName&&e}n=oe.support={},o=oe.isXML=function(e){var t=e&&(e.ownerDocument||e).documentElement;return!!t&&"HTML"!==t.nodeName},d=oe.setDocument=function(e){var t,i,a=e?e.ownerDocument||e:w;return a!==p&&9===a.nodeType&&a.documentElement?(p=a,h=p.documentElement,g=!o(p),w!==p&&(i=p.defaultView)&&i.top!==i&&(i.addEventListener?i.addEventListener("unload",re,!1):i.attachEvent&&i.attachEvent("onunload",re)),n.attributes=se(function(e){return e.className="i",!e.getAttribute("className")}),n.getElementsByTagName=se(function(e){return e.appendChild(p.createComment("")),!e.getElementsByTagName("*").length}),n.getElementsByClassName=G.test(p.getElementsByClassName),n.getById=se(function(e){return h.appendChild(e).id=x,!p.getElementsByName||!p.getElementsByName(x).length}),n.getById?(r.filter.ID=function(e){var t=e.replace(Z,ee);return function(e){return e.getAttribute("id")===t}},r.find.ID=function(e,t){if("undefined"!=typeof t.getElementById&&g){var n=t.getElementById(e);return n?[n]:[]}}):(r.filter.ID=function(e){var t=e.replace(Z,ee);return function(e){var n="undefined"!=typeof e.getAttributeNode&&e.getAttributeNode("id");return n&&n.value===t}},r.find.ID=function(e,t){if("undefined"!=typeof t.getElementById&&g){var n,r,i,o=t.getElementById(e);if(o){if((n=o.getAttributeNode("id"))&&n.value===e)return[o];i=t.getElementsByName(e),r=0;while(o=i[r++])if((n=o.getAttributeNode("id"))&&n.value===e)return[o]}return[]}}),r.find.TAG=n.getElementsByTagName?function(e,t){return"undefined"!=typeof t.getElementsByTagName?t.getElementsByTagName(e):n.qsa?t.querySelectorAll(e):void 0}:function(e,t){var n,r=[],i=0,o=t.getElementsByTagName(e);if("*"===e){while(n=o[i++])1===n.nodeType&&r.push(n);return r}return o},r.find.CLASS=n.getElementsByClassName&&function(e,t){if("undefined"!=typeof t.getElementsByClassName&&g)return t.getElementsByClassName(e)},y=[],v=[],(n.qsa=G.test(p.querySelectorAll))&&(se(function(e){h.appendChild(e).innerHTML="",e.querySelectorAll("[msallowcapture^='']").length&&v.push("[*^$]="+I+"*(?:''|\"\")"),e.querySelectorAll("[selected]").length||v.push("\\["+I+"*(?:value|"+H+")"),e.querySelectorAll("[id~="+x+"-]").length||v.push("~="),e.querySelectorAll(":checked").length||v.push(":checked"),e.querySelectorAll("a#"+x+"+*").length||v.push(".#.+[+~]")}),se(function(e){e.innerHTML="";var t=p.createElement("input");t.setAttribute("type","hidden"),e.appendChild(t).setAttribute("name","D"),e.querySelectorAll("[name=d]").length&&v.push("name"+I+"*[*^$|!~]?="),2!==e.querySelectorAll(":enabled").length&&v.push(":enabled",":disabled"),h.appendChild(e).disabled=!0,2!==e.querySelectorAll(":disabled").length&&v.push(":enabled",":disabled"),e.querySelectorAll("*,:x"),v.push(",.*:")})),(n.matchesSelector=G.test(m=h.matches||h.webkitMatchesSelector||h.mozMatchesSelector||h.oMatchesSelector||h.msMatchesSelector))&&se(function(e){n.disconnectedMatch=m.call(e,"*"),m.call(e,"[s!='']:x"),y.push("!=",M)}),v=v.length&&new RegExp(v.join("|")),y=y.length&&new RegExp(y.join("|")),t=G.test(h.compareDocumentPosition),b=t||G.test(h.contains)?function(e,t){var n=9===e.nodeType?e.documentElement:e,r=t&&t.parentNode;return e===r||!(!r||1!==r.nodeType||!(n.contains?n.contains(r):e.compareDocumentPosition&&16&e.compareDocumentPosition(r)))}:function(e,t){if(t)while(t=t.parentNode)if(t===e)return!0;return!1},A=t?function(e,t){if(e===t)return f=!0,0;var r=!e.compareDocumentPosition-!t.compareDocumentPosition;return r||(1&(r=(e.ownerDocument||e)===(t.ownerDocument||t)?e.compareDocumentPosition(t):1)||!n.sortDetached&&t.compareDocumentPosition(e)===r?e===p||e.ownerDocument===w&&b(w,e)?-1:t===p||t.ownerDocument===w&&b(w,t)?1:c?P(c,e)-P(c,t):0:4&r?-1:1)}:function(e,t){if(e===t)return f=!0,0;var n,r=0,i=e.parentNode,o=t.parentNode,a=[e],u=[t];if(!i||!o)return e===p?-1:t===p?1:i?-1:o?1:c?P(c,e)-P(c,t):0;if(i===o)return ce(e,t);n=e;while(n=n.parentNode)a.unshift(n);n=t;while(n=n.parentNode)u.unshift(n);while(a[r]===u[r])r++;return r?ce(a[r],u[r]):a[r]===w?-1:u[r]===w?1:0},p):p},oe.matches=function(e,t){return oe(e,null,null,t)},oe.matchesSelector=function(e,t){if((e.ownerDocument||e)!==p&&d(e),t=t.replace(_,"='$1']"),n.matchesSelector&&g&&!k[t+" "]&&(!y||!y.test(t))&&(!v||!v.test(t)))try{var r=m.call(e,t);if(r||n.disconnectedMatch||e.document&&11!==e.document.nodeType)return r}catch(e){}return oe(t,p,null,[e]).length>0},oe.contains=function(e,t){return(e.ownerDocument||e)!==p&&d(e),b(e,t)},oe.attr=function(e,t){(e.ownerDocument||e)!==p&&d(e);var i=r.attrHandle[t.toLowerCase()],o=i&&D.call(r.attrHandle,t.toLowerCase())?i(e,t,!g):void 0;return void 0!==o?o:n.attributes||!g?e.getAttribute(t):(o=e.getAttributeNode(t))&&o.specified?o.value:null},oe.escape=function(e){return(e+"").replace(te,ne)},oe.error=function(e){throw new Error("Syntax error, unrecognized expression: "+e)},oe.uniqueSort=function(e){var t,r=[],i=0,o=0;if(f=!n.detectDuplicates,c=!n.sortStable&&e.slice(0),e.sort(A),f){while(t=e[o++])t===e[o]&&(i=r.push(o));while(i--)e.splice(r[i],1)}return c=null,e},i=oe.getText=function(e){var t,n="",r=0,o=e.nodeType;if(o){if(1===o||9===o||11===o){if("string"==typeof e.textContent)return e.textContent;for(e=e.firstChild;e;e=e.nextSibling)n+=i(e)}else if(3===o||4===o)return e.nodeValue}else while(t=e[r++])n+=i(t);return n},(r=oe.selectors={cacheLength:50,createPseudo:ue,match:X,attrHandle:{},find:{},relative:{">":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(e){return e[1]=e[1].replace(Z,ee),e[3]=(e[3]||e[4]||e[5]||"").replace(Z,ee),"~="===e[2]&&(e[3]=" "+e[3]+" "),e.slice(0,4)},CHILD:function(e){return e[1]=e[1].toLowerCase(),"nth"===e[1].slice(0,3)?(e[3]||oe.error(e[0]),e[4]=+(e[4]?e[5]+(e[6]||1):2*("even"===e[3]||"odd"===e[3])),e[5]=+(e[7]+e[8]||"odd"===e[3])):e[3]&&oe.error(e[0]),e},PSEUDO:function(e){var t,n=!e[6]&&e[2];return X.CHILD.test(e[0])?null:(e[3]?e[2]=e[4]||e[5]||"":n&&U.test(n)&&(t=a(n,!0))&&(t=n.indexOf(")",n.length-t)-n.length)&&(e[0]=e[0].slice(0,t),e[2]=n.slice(0,t)),e.slice(0,3))}},filter:{TAG:function(e){var t=e.replace(Z,ee).toLowerCase();return"*"===e?function(){return!0}:function(e){return e.nodeName&&e.nodeName.toLowerCase()===t}},CLASS:function(e){var t=E[e+" "];return t||(t=new RegExp("(^|"+I+")"+e+"("+I+"|$)"))&&E(e,function(e){return t.test("string"==typeof e.className&&e.className||"undefined"!=typeof e.getAttribute&&e.getAttribute("class")||"")})},ATTR:function(e,t,n){return function(r){var i=oe.attr(r,e);return null==i?"!="===t:!t||(i+="","="===t?i===n:"!="===t?i!==n:"^="===t?n&&0===i.indexOf(n):"*="===t?n&&i.indexOf(n)>-1:"$="===t?n&&i.slice(-n.length)===n:"~="===t?(" "+i.replace(W," ")+" ").indexOf(n)>-1:"|="===t&&(i===n||i.slice(0,n.length+1)===n+"-"))}},CHILD:function(e,t,n,r,i){var o="nth"!==e.slice(0,3),a="last"!==e.slice(-4),u="of-type"===t;return 1===r&&0===i?function(e){return!!e.parentNode}:function(t,n,s){var l,c,f,d,p,h,g=o!==a?"nextSibling":"previousSibling",v=t.parentNode,y=u&&t.nodeName.toLowerCase(),m=!s&&!u,b=!1;if(v){if(o){while(g){d=t;while(d=d[g])if(u?d.nodeName.toLowerCase()===y:1===d.nodeType)return!1;h=g="only"===e&&!h&&"nextSibling"}return!0}if(h=[a?v.firstChild:v.lastChild],a&&m){b=(p=(l=(c=(f=(d=v)[x]||(d[x]={}))[d.uniqueID]||(f[d.uniqueID]={}))[e]||[])[0]===C&&l[1])&&l[2],d=p&&v.childNodes[p];while(d=++p&&d&&d[g]||(b=p=0)||h.pop())if(1===d.nodeType&&++b&&d===t){c[e]=[C,p,b];break}}else if(m&&(b=p=(l=(c=(f=(d=t)[x]||(d[x]={}))[d.uniqueID]||(f[d.uniqueID]={}))[e]||[])[0]===C&&l[1]),!1===b)while(d=++p&&d&&d[g]||(b=p=0)||h.pop())if((u?d.nodeName.toLowerCase()===y:1===d.nodeType)&&++b&&(m&&((c=(f=d[x]||(d[x]={}))[d.uniqueID]||(f[d.uniqueID]={}))[e]=[C,b]),d===t))break;return(b-=i)===r||b%r==0&&b/r>=0}}},PSEUDO:function(e,t){var n,i=r.pseudos[e]||r.setFilters[e.toLowerCase()]||oe.error("unsupported pseudo: "+e);return i[x]?i(t):i.length>1?(n=[e,e,"",t],r.setFilters.hasOwnProperty(e.toLowerCase())?ue(function(e,n){var r,o=i(e,t),a=o.length;while(a--)e[r=P(e,o[a])]=!(n[r]=o[a])}):function(e){return i(e,0,n)}):i}},pseudos:{not:ue(function(e){var t=[],n=[],r=u(e.replace($,"$1"));return r[x]?ue(function(e,t,n,i){var o,a=r(e,null,i,[]),u=e.length;while(u--)(o=a[u])&&(e[u]=!(t[u]=o))}):function(e,i,o){return t[0]=e,r(t,null,o,n),t[0]=null,!n.pop()}}),has:ue(function(e){return function(t){return oe(e,t).length>0}}),contains:ue(function(e){return e=e.replace(Z,ee),function(t){return(t.textContent||t.innerText||i(t)).indexOf(e)>-1}}),lang:ue(function(e){return V.test(e||"")||oe.error("unsupported lang: "+e),e=e.replace(Z,ee).toLowerCase(),function(t){var n;do{if(n=g?t.lang:t.getAttribute("xml:lang")||t.getAttribute("lang"))return(n=n.toLowerCase())===e||0===n.indexOf(e+"-")}while((t=t.parentNode)&&1===t.nodeType);return!1}}),target:function(t){var n=e.location&&e.location.hash;return n&&n.slice(1)===t.id},root:function(e){return e===h},focus:function(e){return e===p.activeElement&&(!p.hasFocus||p.hasFocus())&&!!(e.type||e.href||~e.tabIndex)},enabled:pe(!1),disabled:pe(!0),checked:function(e){var t=e.nodeName.toLowerCase();return"input"===t&&!!e.checked||"option"===t&&!!e.selected},selected:function(e){return e.parentNode&&e.parentNode.selectedIndex,!0===e.selected},empty:function(e){for(e=e.firstChild;e;e=e.nextSibling)if(e.nodeType<6)return!1;return!0},parent:function(e){return!r.pseudos.empty(e)},header:function(e){return Y.test(e.nodeName)},input:function(e){return Q.test(e.nodeName)},button:function(e){var t=e.nodeName.toLowerCase();return"input"===t&&"button"===e.type||"button"===t},text:function(e){var t;return"input"===e.nodeName.toLowerCase()&&"text"===e.type&&(null==(t=e.getAttribute("type"))||"text"===t.toLowerCase())},first:he(function(){return[0]}),last:he(function(e,t){return[t-1]}),eq:he(function(e,t,n){return[n<0?n+t:n]}),even:he(function(e,t){for(var n=0;n=0;)e.push(r);return e}),gt:he(function(e,t,n){for(var r=n<0?n+t:n;++r1?function(t,n,r){var i=e.length;while(i--)if(!e[i](t,n,r))return!1;return!0}:e[0]}function xe(e,t,n){for(var r=0,i=t.length;r-1&&(o[l]=!(a[l]=f))}}else y=we(y===a?y.splice(h,y.length):y),i?i(null,a,y,s):q.apply(a,y)})}function Te(e){for(var t,n,i,o=e.length,a=r.relative[e[0].type],u=a||r.relative[" "],s=a?1:0,c=me(function(e){return e===t},u,!0),f=me(function(e){return P(t,e)>-1},u,!0),d=[function(e,n,r){var i=!a&&(r||n!==l)||((t=n).nodeType?c(e,n,r):f(e,n,r));return t=null,i}];s1&&be(d),s>1&&ye(e.slice(0,s-1).concat({value:" "===e[s-2].type?"*":""})).replace($,"$1"),n,s0,i=e.length>0,o=function(o,a,u,s,c){var f,h,v,y=0,m="0",b=o&&[],x=[],w=l,T=o||i&&r.find.TAG("*",c),E=C+=null==w?1:Math.random()||.1,N=T.length;for(c&&(l=a===p||a||c);m!==N&&null!=(f=T[m]);m++){if(i&&f){h=0,a||f.ownerDocument===p||(d(f),u=!g);while(v=e[h++])if(v(f,a||p,u)){s.push(f);break}c&&(C=E)}n&&((f=!v&&f)&&y--,o&&b.push(f))}if(y+=m,n&&m!==y){h=0;while(v=t[h++])v(b,x,a,u);if(o){if(y>0)while(m--)b[m]||x[m]||(x[m]=L.call(s));x=we(x)}q.apply(s,x),c&&!o&&x.length>0&&y+t.length>1&&oe.uniqueSort(s)}return c&&(C=E,l=w),b};return n?ue(o):o}return u=oe.compile=function(e,t){var n,r=[],i=[],o=k[e+" "];if(!o){t||(t=a(e)),n=t.length;while(n--)(o=Te(t[n]))[x]?r.push(o):i.push(o);(o=k(e,Ee(i,r))).selector=e}return o},s=oe.select=function(e,t,n,i){var o,s,l,c,f,d="function"==typeof e&&e,p=!i&&a(e=d.selector||e);if(n=n||[],1===p.length){if((s=p[0]=p[0].slice(0)).length>2&&"ID"===(l=s[0]).type&&9===t.nodeType&&g&&r.relative[s[1].type]){if(!(t=(r.find.ID(l.matches[0].replace(Z,ee),t)||[])[0]))return n;d&&(t=t.parentNode),e=e.slice(s.shift().value.length)}o=X.needsContext.test(e)?0:s.length;while(o--){if(l=s[o],r.relative[c=l.type])break;if((f=r.find[c])&&(i=f(l.matches[0].replace(Z,ee),J.test(s[0].type)&&ge(t.parentNode)||t))){if(s.splice(o,1),!(e=i.length&&ye(s)))return q.apply(n,i),n;break}}}return(d||u(e,p))(i,t,!g,n,!t||J.test(e)&&ge(t.parentNode)||t),n},n.sortStable=x.split("").sort(A).join("")===x,n.detectDuplicates=!!f,d(),n.sortDetached=se(function(e){return 1&e.compareDocumentPosition(p.createElement("fieldset"))}),se(function(e){return e.innerHTML="","#"===e.firstChild.getAttribute("href")})||le("type|href|height|width",function(e,t,n){if(!n)return e.getAttribute(t,"type"===t.toLowerCase()?1:2)}),n.attributes&&se(function(e){return e.innerHTML="",e.firstChild.setAttribute("value",""),""===e.firstChild.getAttribute("value")})||le("value",function(e,t,n){if(!n&&"input"===e.nodeName.toLowerCase())return e.defaultValue}),se(function(e){return null==e.getAttribute("disabled")})||le(H,function(e,t,n){var r;if(!n)return!0===e[t]?t.toLowerCase():(r=e.getAttributeNode(t))&&r.specified?r.value:null}),oe}(e);w.find=E,w.expr=E.selectors,w.expr[":"]=w.expr.pseudos,w.uniqueSort=w.unique=E.uniqueSort,w.text=E.getText,w.isXMLDoc=E.isXML,w.contains=E.contains,w.escapeSelector=E.escape;var N=function(e,t,n){var r=[],i=void 0!==n;while((e=e[t])&&9!==e.nodeType)if(1===e.nodeType){if(i&&w(e).is(n))break;r.push(e)}return r},k=function(e,t){for(var n=[];e;e=e.nextSibling)1===e.nodeType&&e!==t&&n.push(e);return n},A=w.expr.match.needsContext;function D(e,t){return e.nodeName&&e.nodeName.toLowerCase()===t.toLowerCase()}var S=/^<([a-z][^\/\0>:\x20\t\r\n\f]*)[\x20\t\r\n\f]*\/?>(?:<\/\1>|)$/i;function L(e,t,n){return g(t)?w.grep(e,function(e,r){return!!t.call(e,r,e)!==n}):t.nodeType?w.grep(e,function(e){return e===t!==n}):"string"!=typeof t?w.grep(e,function(e){return s.call(t,e)>-1!==n}):w.filter(t,e,n)}w.filter=function(e,t,n){var r=t[0];return n&&(e=":not("+e+")"),1===t.length&&1===r.nodeType?w.find.matchesSelector(r,e)?[r]:[]:w.find.matches(e,w.grep(t,function(e){return 1===e.nodeType}))},w.fn.extend({find:function(e){var t,n,r=this.length,i=this;if("string"!=typeof e)return this.pushStack(w(e).filter(function(){for(t=0;t1?w.uniqueSort(n):n},filter:function(e){return this.pushStack(L(this,e||[],!1))},not:function(e){return this.pushStack(L(this,e||[],!0))},is:function(e){return!!L(this,"string"==typeof e&&A.test(e)?w(e):e||[],!1).length}});var j,q=/^(?:\s*(<[\w\W]+>)[^>]*|#([\w-]+))$/;(w.fn.init=function(e,t,n){var i,o;if(!e)return this;if(n=n||j,"string"==typeof e){if(!(i="<"===e[0]&&">"===e[e.length-1]&&e.length>=3?[null,e,null]:q.exec(e))||!i[1]&&t)return!t||t.jquery?(t||n).find(e):this.constructor(t).find(e);if(i[1]){if(t=t instanceof w?t[0]:t,w.merge(this,w.parseHTML(i[1],t&&t.nodeType?t.ownerDocument||t:r,!0)),S.test(i[1])&&w.isPlainObject(t))for(i in t)g(this[i])?this[i](t[i]):this.attr(i,t[i]);return this}return(o=r.getElementById(i[2]))&&(this[0]=o,this.length=1),this}return e.nodeType?(this[0]=e,this.length=1,this):g(e)?void 0!==n.ready?n.ready(e):e(w):w.makeArray(e,this)}).prototype=w.fn,j=w(r);var O=/^(?:parents|prev(?:Until|All))/,P={children:!0,contents:!0,next:!0,prev:!0};w.fn.extend({has:function(e){var t=w(e,this),n=t.length;return this.filter(function(){for(var e=0;e-1:1===n.nodeType&&w.find.matchesSelector(n,e))){o.push(n);break}return this.pushStack(o.length>1?w.uniqueSort(o):o)},index:function(e){return e?"string"==typeof e?s.call(w(e),this[0]):s.call(this,e.jquery?e[0]:e):this[0]&&this[0].parentNode?this.first().prevAll().length:-1},add:function(e,t){return this.pushStack(w.uniqueSort(w.merge(this.get(),w(e,t))))},addBack:function(e){return this.add(null==e?this.prevObject:this.prevObject.filter(e))}});function H(e,t){while((e=e[t])&&1!==e.nodeType);return e}w.each({parent:function(e){var t=e.parentNode;return t&&11!==t.nodeType?t:null},parents:function(e){return N(e,"parentNode")},parentsUntil:function(e,t,n){return N(e,"parentNode",n)},next:function(e){return H(e,"nextSibling")},prev:function(e){return H(e,"previousSibling")},nextAll:function(e){return N(e,"nextSibling")},prevAll:function(e){return N(e,"previousSibling")},nextUntil:function(e,t,n){return N(e,"nextSibling",n)},prevUntil:function(e,t,n){return N(e,"previousSibling",n)},siblings:function(e){return k((e.parentNode||{}).firstChild,e)},children:function(e){return k(e.firstChild)},contents:function(e){return D(e,"iframe")?e.contentDocument:(D(e,"template")&&(e=e.content||e),w.merge([],e.childNodes))}},function(e,t){w.fn[e]=function(n,r){var i=w.map(this,t,n);return"Until"!==e.slice(-5)&&(r=n),r&&"string"==typeof r&&(i=w.filter(r,i)),this.length>1&&(P[e]||w.uniqueSort(i),O.test(e)&&i.reverse()),this.pushStack(i)}});var I=/[^\x20\t\r\n\f]+/g;function R(e){var t={};return w.each(e.match(I)||[],function(e,n){t[n]=!0}),t}w.Callbacks=function(e){e="string"==typeof e?R(e):w.extend({},e);var t,n,r,i,o=[],a=[],u=-1,s=function(){for(i=i||e.once,r=t=!0;a.length;u=-1){n=a.shift();while(++u-1)o.splice(n,1),n<=u&&u--}),this},has:function(e){return e?w.inArray(e,o)>-1:o.length>0},empty:function(){return o&&(o=[]),this},disable:function(){return i=a=[],o=n="",this},disabled:function(){return!o},lock:function(){return i=a=[],n||t||(o=n=""),this},locked:function(){return!!i},fireWith:function(e,n){return i||(n=[e,(n=n||[]).slice?n.slice():n],a.push(n),t||s()),this},fire:function(){return l.fireWith(this,arguments),this},fired:function(){return!!r}};return l};function B(e){return e}function M(e){throw e}function W(e,t,n,r){var i;try{e&&g(i=e.promise)?i.call(e).done(t).fail(n):e&&g(i=e.then)?i.call(e,t,n):t.apply(void 0,[e].slice(r))}catch(e){n.apply(void 0,[e])}}w.extend({Deferred:function(t){var n=[["notify","progress",w.Callbacks("memory"),w.Callbacks("memory"),2],["resolve","done",w.Callbacks("once memory"),w.Callbacks("once memory"),0,"resolved"],["reject","fail",w.Callbacks("once memory"),w.Callbacks("once memory"),1,"rejected"]],r="pending",i={state:function(){return r},always:function(){return o.done(arguments).fail(arguments),this},"catch":function(e){return i.then(null,e)},pipe:function(){var e=arguments;return w.Deferred(function(t){w.each(n,function(n,r){var i=g(e[r[4]])&&e[r[4]];o[r[1]](function(){var e=i&&i.apply(this,arguments);e&&g(e.promise)?e.promise().progress(t.notify).done(t.resolve).fail(t.reject):t[r[0]+"With"](this,i?[e]:arguments)})}),e=null}).promise()},then:function(t,r,i){var o=0;function a(t,n,r,i){return function(){var u=this,s=arguments,l=function(){var e,l;if(!(t=o&&(r!==M&&(u=void 0,s=[e]),n.rejectWith(u,s))}};t?c():(w.Deferred.getStackHook&&(c.stackTrace=w.Deferred.getStackHook()),e.setTimeout(c))}}return w.Deferred(function(e){n[0][3].add(a(0,e,g(i)?i:B,e.notifyWith)),n[1][3].add(a(0,e,g(t)?t:B)),n[2][3].add(a(0,e,g(r)?r:M))}).promise()},promise:function(e){return null!=e?w.extend(e,i):i}},o={};return w.each(n,function(e,t){var a=t[2],u=t[5];i[t[1]]=a.add,u&&a.add(function(){r=u},n[3-e][2].disable,n[3-e][3].disable,n[0][2].lock,n[0][3].lock),a.add(t[3].fire),o[t[0]]=function(){return o[t[0]+"With"](this===o?void 0:this,arguments),this},o[t[0]+"With"]=a.fireWith}),i.promise(o),t&&t.call(o,o),o},when:function(e){var t=arguments.length,n=t,r=Array(n),i=o.call(arguments),a=w.Deferred(),u=function(e){return function(n){r[e]=this,i[e]=arguments.length>1?o.call(arguments):n,--t||a.resolveWith(r,i)}};if(t<=1&&(W(e,a.done(u(n)).resolve,a.reject,!t),"pending"===a.state()||g(i[n]&&i[n].then)))return a.then();while(n--)W(i[n],u(n),a.reject);return a.promise()}});var $=/^(Eval|Internal|Range|Reference|Syntax|Type|URI)Error$/;w.Deferred.exceptionHook=function(t,n){e.console&&e.console.warn&&t&&$.test(t.name)&&e.console.warn("jQuery.Deferred exception: "+t.message,t.stack,n)},w.readyException=function(t){e.setTimeout(function(){throw t})};var F=w.Deferred();w.fn.ready=function(e){return F.then(e)["catch"](function(e){w.readyException(e)}),this},w.extend({isReady:!1,readyWait:1,ready:function(e){(!0===e?--w.readyWait:w.isReady)||(w.isReady=!0,!0!==e&&--w.readyWait>0||F.resolveWith(r,[w]))}}),w.ready.then=F.then;function z(){r.removeEventListener("DOMContentLoaded",z),e.removeEventListener("load",z),w.ready()}"complete"===r.readyState||"loading"!==r.readyState&&!r.documentElement.doScroll?e.setTimeout(w.ready):(r.addEventListener("DOMContentLoaded",z),e.addEventListener("load",z));var _=function(e,t,n,r,i,o,a){var u=0,s=e.length,l=null==n;if("object"===b(n)){i=!0;for(u in n)_(e,t,u,n[u],!0,o,a)}else if(void 0!==r&&(i=!0,g(r)||(a=!0),l&&(a?(t.call(e,r),t=null):(l=t,t=function(e,t,n){return l.call(w(e),n)})),t))for(;u1,null,!0)},removeData:function(e){return this.each(function(){J.remove(this,e)})}}),w.extend({queue:function(e,t,n){var r;if(e)return t=(t||"fx")+"queue",r=K.get(e,t),n&&(!r||Array.isArray(n)?r=K.access(e,t,w.makeArray(n)):r.push(n)),r||[]},dequeue:function(e,t){t=t||"fx";var n=w.queue(e,t),r=n.length,i=n.shift(),o=w._queueHooks(e,t),a=function(){w.dequeue(e,t)};"inprogress"===i&&(i=n.shift(),r--),i&&("fx"===t&&n.unshift("inprogress"),delete o.stop,i.call(e,a,o)),!r&&o&&o.empty.fire()},_queueHooks:function(e,t){var n=t+"queueHooks";return K.get(e,n)||K.access(e,n,{empty:w.Callbacks("once memory").add(function(){K.remove(e,[t+"queue",n])})})}}),w.fn.extend({queue:function(e,t){var n=2;return"string"!=typeof e&&(t=e,e="fx",n--),arguments.length\x20\t\r\n\f]+)/i,he=/^$|^module$|\/(?:java|ecma)script/i,ge={option:[1,""],thead:[1,"","
"],col:[2,"","
"],tr:[2,"","
"],td:[3,"","
"],_default:[0,"",""]};ge.optgroup=ge.option,ge.tbody=ge.tfoot=ge.colgroup=ge.caption=ge.thead,ge.th=ge.td;function ve(e,t){var n;return n="undefined"!=typeof e.getElementsByTagName?e.getElementsByTagName(t||"*"):"undefined"!=typeof e.querySelectorAll?e.querySelectorAll(t||"*"):[],void 0===t||t&&D(e,t)?w.merge([e],n):n}function ye(e,t){for(var n=0,r=e.length;n-1)i&&i.push(o);else if(l=w.contains(o.ownerDocument,o),a=ve(f.appendChild(o),"script"),l&&ye(a),n){c=0;while(o=a[c++])he.test(o.type||"")&&n.push(o)}return f}!function(){var e=r.createDocumentFragment().appendChild(r.createElement("div")),t=r.createElement("input");t.setAttribute("type","radio"),t.setAttribute("checked","checked"),t.setAttribute("name","t"),e.appendChild(t),h.checkClone=e.cloneNode(!0).cloneNode(!0).lastChild.checked,e.innerHTML="",h.noCloneChecked=!!e.cloneNode(!0).lastChild.defaultValue}();var xe=r.documentElement,we=/^key/,Ce=/^(?:mouse|pointer|contextmenu|drag|drop)|click/,Te=/^([^.]*)(?:\.(.+)|)/;function Ee(){return!0}function Ne(){return!1}function ke(){try{return r.activeElement}catch(e){}}function Ae(e,t,n,r,i,o){var a,u;if("object"==typeof t){"string"!=typeof n&&(r=r||n,n=void 0);for(u in t)Ae(e,u,n,r,t[u],o);return e}if(null==r&&null==i?(i=n,r=n=void 0):null==i&&("string"==typeof n?(i=r,r=void 0):(i=r,r=n,n=void 0)),!1===i)i=Ne;else if(!i)return e;return 1===o&&(a=i,(i=function(e){return w().off(e),a.apply(this,arguments)}).guid=a.guid||(a.guid=w.guid++)),e.each(function(){w.event.add(this,t,i,r,n)})}w.event={global:{},add:function(e,t,n,r,i){var o,a,u,s,l,c,f,d,p,h,g,v=K.get(e);if(v){n.handler&&(n=(o=n).handler,i=o.selector),i&&w.find.matchesSelector(xe,i),n.guid||(n.guid=w.guid++),(s=v.events)||(s=v.events={}),(a=v.handle)||(a=v.handle=function(t){return"undefined"!=typeof w&&w.event.triggered!==t.type?w.event.dispatch.apply(e,arguments):void 0}),l=(t=(t||"").match(I)||[""]).length;while(l--)p=g=(u=Te.exec(t[l])||[])[1],h=(u[2]||"").split(".").sort(),p&&(f=w.event.special[p]||{},p=(i?f.delegateType:f.bindType)||p,f=w.event.special[p]||{},c=w.extend({type:p,origType:g,data:r,handler:n,guid:n.guid,selector:i,needsContext:i&&w.expr.match.needsContext.test(i),namespace:h.join(".")},o),(d=s[p])||((d=s[p]=[]).delegateCount=0,f.setup&&!1!==f.setup.call(e,r,h,a)||e.addEventListener&&e.addEventListener(p,a)),f.add&&(f.add.call(e,c),c.handler.guid||(c.handler.guid=n.guid)),i?d.splice(d.delegateCount++,0,c):d.push(c),w.event.global[p]=!0)}},remove:function(e,t,n,r,i){var o,a,u,s,l,c,f,d,p,h,g,v=K.hasData(e)&&K.get(e);if(v&&(s=v.events)){l=(t=(t||"").match(I)||[""]).length;while(l--)if(u=Te.exec(t[l])||[],p=g=u[1],h=(u[2]||"").split(".").sort(),p){f=w.event.special[p]||{},d=s[p=(r?f.delegateType:f.bindType)||p]||[],u=u[2]&&new RegExp("(^|\\.)"+h.join("\\.(?:.*\\.|)")+"(\\.|$)"),a=o=d.length;while(o--)c=d[o],!i&&g!==c.origType||n&&n.guid!==c.guid||u&&!u.test(c.namespace)||r&&r!==c.selector&&("**"!==r||!c.selector)||(d.splice(o,1),c.selector&&d.delegateCount--,f.remove&&f.remove.call(e,c));a&&!d.length&&(f.teardown&&!1!==f.teardown.call(e,h,v.handle)||w.removeEvent(e,p,v.handle),delete s[p])}else for(p in s)w.event.remove(e,p+t[l],n,r,!0);w.isEmptyObject(s)&&K.remove(e,"handle events")}},dispatch:function(e){var t=w.event.fix(e),n,r,i,o,a,u,s=new Array(arguments.length),l=(K.get(this,"events")||{})[t.type]||[],c=w.event.special[t.type]||{};for(s[0]=t,n=1;n=1))for(;l!==this;l=l.parentNode||this)if(1===l.nodeType&&("click"!==e.type||!0!==l.disabled)){for(o=[],a={},n=0;n-1:w.find(i,this,null,[l]).length),a[i]&&o.push(r);o.length&&u.push({elem:l,handlers:o})}return l=this,s\x20\t\r\n\f]*)[^>]*)\/>/gi,Se=/\s*$/g;function qe(e,t){return D(e,"table")&&D(11!==t.nodeType?t:t.firstChild,"tr")?w(e).children("tbody")[0]||e:e}function Oe(e){return e.type=(null!==e.getAttribute("type"))+"/"+e.type,e}function Pe(e){return"true/"===(e.type||"").slice(0,5)?e.type=e.type.slice(5):e.removeAttribute("type"),e}function He(e,t){var n,r,i,o,a,u,s,l;if(1===t.nodeType){if(K.hasData(e)&&(o=K.access(e),a=K.set(t,o),l=o.events)){delete a.handle,a.events={};for(i in l)for(n=0,r=l[i].length;n1&&"string"==typeof v&&!h.checkClone&&Le.test(v))return e.each(function(i){var o=e.eq(i);y&&(t[0]=v.call(this,i,o.html())),Re(o,t,n,r)});if(d&&(i=be(t,e[0].ownerDocument,!1,e,r),o=i.firstChild,1===i.childNodes.length&&(i=o),o||r)){for(s=(u=w.map(ve(i,"script"),Oe)).length;f")},clone:function(e,t,n){var r,i,o,a,u=e.cloneNode(!0),s=w.contains(e.ownerDocument,e);if(!(h.noCloneChecked||1!==e.nodeType&&11!==e.nodeType||w.isXMLDoc(e)))for(a=ve(u),r=0,i=(o=ve(e)).length;r0&&ye(a,!s&&ve(e,"script")),u},cleanData:function(e){for(var t,n,r,i=w.event.special,o=0;void 0!==(n=e[o]);o++)if(Y(n)){if(t=n[K.expando]){if(t.events)for(r in t.events)i[r]?w.event.remove(n,r):w.removeEvent(n,r,t.handle);n[K.expando]=void 0}n[J.expando]&&(n[J.expando]=void 0)}}}),w.fn.extend({detach:function(e){return Be(this,e,!0)},remove:function(e){return Be(this,e)},text:function(e){return _(this,function(e){return void 0===e?w.text(this):this.empty().each(function(){1!==this.nodeType&&11!==this.nodeType&&9!==this.nodeType||(this.textContent=e)})},null,e,arguments.length)},append:function(){return Re(this,arguments,function(e){1!==this.nodeType&&11!==this.nodeType&&9!==this.nodeType||qe(this,e).appendChild(e)})},prepend:function(){return Re(this,arguments,function(e){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var t=qe(this,e);t.insertBefore(e,t.firstChild)}})},before:function(){return Re(this,arguments,function(e){this.parentNode&&this.parentNode.insertBefore(e,this)})},after:function(){return Re(this,arguments,function(e){this.parentNode&&this.parentNode.insertBefore(e,this.nextSibling)})},empty:function(){for(var e,t=0;null!=(e=this[t]);t++)1===e.nodeType&&(w.cleanData(ve(e,!1)),e.textContent="");return this},clone:function(e,t){return e=null!=e&&e,t=null==t?e:t,this.map(function(){return w.clone(this,e,t)})},html:function(e){return _(this,function(e){var t=this[0]||{},n=0,r=this.length;if(void 0===e&&1===t.nodeType)return t.innerHTML;if("string"==typeof e&&!Se.test(e)&&!ge[(pe.exec(e)||["",""])[1].toLowerCase()]){e=w.htmlPrefilter(e);try{for(;n=0&&(s+=Math.max(0,Math.ceil(e["offset"+t[0].toUpperCase()+t.slice(1)]-o-s-u-.5))),s}function et(e,t,n){var r=We(e),i=Fe(e,t,r),o="border-box"===w.css(e,"boxSizing",!1,r),a=o;if(Me.test(i)){if(!n)return i;i="auto"}return a=a&&(h.boxSizingReliable()||i===e.style[t]),("auto"===i||!parseFloat(i)&&"inline"===w.css(e,"display",!1,r))&&(i=e["offset"+t[0].toUpperCase()+t.slice(1)],a=!0),(i=parseFloat(i)||0)+Ze(e,t,n||(o?"border":"content"),a,r,i)+"px"}w.extend({cssHooks:{opacity:{get:function(e,t){if(t){var n=Fe(e,"opacity");return""===n?"1":n}}}},cssNumber:{animationIterationCount:!0,columnCount:!0,fillOpacity:!0,flexGrow:!0,flexShrink:!0,fontWeight:!0,lineHeight:!0,opacity:!0,order:!0,orphans:!0,widows:!0,zIndex:!0,zoom:!0},cssProps:{},style:function(e,t,n,r){if(e&&3!==e.nodeType&&8!==e.nodeType&&e.style){var i,o,a,u=Q(t),s=Ue.test(t),l=e.style;if(s||(t=Ke(u)),a=w.cssHooks[t]||w.cssHooks[u],void 0===n)return a&&"get"in a&&void 0!==(i=a.get(e,!1,r))?i:l[t];"string"==(o=typeof n)&&(i=ie.exec(n))&&i[1]&&(n=se(e,t,i),o="number"),null!=n&&n===n&&("number"===o&&(n+=i&&i[3]||(w.cssNumber[u]?"":"px")),h.clearCloneStyle||""!==n||0!==t.indexOf("background")||(l[t]="inherit"),a&&"set"in a&&void 0===(n=a.set(e,n,r))||(s?l.setProperty(t,n):l[t]=n))}},css:function(e,t,n,r){var i,o,a,u=Q(t);return Ue.test(t)||(t=Ke(u)),(a=w.cssHooks[t]||w.cssHooks[u])&&"get"in a&&(i=a.get(e,!0,n)),void 0===i&&(i=Fe(e,t,r)),"normal"===i&&t in Xe&&(i=Xe[t]),""===n||n?(o=parseFloat(i),!0===n||isFinite(o)?o||0:i):i}}),w.each(["height","width"],function(e,t){w.cssHooks[t]={get:function(e,n,r){if(n)return!_e.test(w.css(e,"display"))||e.getClientRects().length&&e.getBoundingClientRect().width?et(e,t,r):ue(e,Ve,function(){return et(e,t,r)})},set:function(e,n,r){var i,o=We(e),a="border-box"===w.css(e,"boxSizing",!1,o),u=r&&Ze(e,t,r,a,o);return a&&h.scrollboxSize()===o.position&&(u-=Math.ceil(e["offset"+t[0].toUpperCase()+t.slice(1)]-parseFloat(o[t])-Ze(e,t,"border",!1,o)-.5)),u&&(i=ie.exec(n))&&"px"!==(i[3]||"px")&&(e.style[t]=n,n=w.css(e,t)),Je(e,n,u)}}}),w.cssHooks.marginLeft=ze(h.reliableMarginLeft,function(e,t){if(t)return(parseFloat(Fe(e,"marginLeft"))||e.getBoundingClientRect().left-ue(e,{marginLeft:0},function(){return e.getBoundingClientRect().left}))+"px"}),w.each({margin:"",padding:"",border:"Width"},function(e,t){w.cssHooks[e+t]={expand:function(n){for(var r=0,i={},o="string"==typeof n?n.split(" "):[n];r<4;r++)i[e+oe[r]+t]=o[r]||o[r-2]||o[0];return i}},"margin"!==e&&(w.cssHooks[e+t].set=Je)}),w.fn.extend({css:function(e,t){return _(this,function(e,t,n){var r,i,o={},a=0;if(Array.isArray(t)){for(r=We(e),i=t.length;a1)}}),w.fn.delay=function(t,n){return t=w.fx?w.fx.speeds[t]||t:t,n=n||"fx",this.queue(n,function(n,r){var i=e.setTimeout(n,t);r.stop=function(){e.clearTimeout(i)}})},function(){var e=r.createElement("input"),t=r.createElement("select").appendChild(r.createElement("option"));e.type="checkbox",h.checkOn=""!==e.value,h.optSelected=t.selected,(e=r.createElement("input")).value="t",e.type="radio",h.radioValue="t"===e.value}();var tt,nt=w.expr.attrHandle;w.fn.extend({attr:function(e,t){return _(this,w.attr,e,t,arguments.length>1)},removeAttr:function(e){return this.each(function(){w.removeAttr(this,e)})}}),w.extend({attr:function(e,t,n){var r,i,o=e.nodeType;if(3!==o&&8!==o&&2!==o)return"undefined"==typeof e.getAttribute?w.prop(e,t,n):(1===o&&w.isXMLDoc(e)||(i=w.attrHooks[t.toLowerCase()]||(w.expr.match.bool.test(t)?tt:void 0)),void 0!==n?null===n?void w.removeAttr(e,t):i&&"set"in i&&void 0!==(r=i.set(e,n,t))?r:(e.setAttribute(t,n+""),n):i&&"get"in i&&null!==(r=i.get(e,t))?r:null==(r=w.find.attr(e,t))?void 0:r)},attrHooks:{type:{set:function(e,t){if(!h.radioValue&&"radio"===t&&D(e,"input")){var n=e.value;return e.setAttribute("type",t),n&&(e.value=n),t}}}},removeAttr:function(e,t){var n,r=0,i=t&&t.match(I);if(i&&1===e.nodeType)while(n=i[r++])e.removeAttribute(n)}}),tt={set:function(e,t,n){return!1===t?w.removeAttr(e,n):e.setAttribute(n,n),n}},w.each(w.expr.match.bool.source.match(/\w+/g),function(e,t){var n=nt[t]||w.find.attr;nt[t]=function(e,t,r){var i,o,a=t.toLowerCase();return r||(o=nt[a],nt[a]=i,i=null!=n(e,t,r)?a:null,nt[a]=o),i}});var rt=/^(?:input|select|textarea|button)$/i,it=/^(?:a|area)$/i;w.fn.extend({prop:function(e,t){return _(this,w.prop,e,t,arguments.length>1)},removeProp:function(e){return this.each(function(){delete this[w.propFix[e]||e]})}}),w.extend({prop:function(e,t,n){var r,i,o=e.nodeType;if(3!==o&&8!==o&&2!==o)return 1===o&&w.isXMLDoc(e)||(t=w.propFix[t]||t,i=w.propHooks[t]),void 0!==n?i&&"set"in i&&void 0!==(r=i.set(e,n,t))?r:e[t]=n:i&&"get"in i&&null!==(r=i.get(e,t))?r:e[t]},propHooks:{tabIndex:{get:function(e){var t=w.find.attr(e,"tabindex");return t?parseInt(t,10):rt.test(e.nodeName)||it.test(e.nodeName)&&e.href?0:-1}}},propFix:{"for":"htmlFor","class":"className"}}),h.optSelected||(w.propHooks.selected={get:function(e){var t=e.parentNode;return t&&t.parentNode&&t.parentNode.selectedIndex,null},set:function(e){var t=e.parentNode;t&&(t.selectedIndex,t.parentNode&&t.parentNode.selectedIndex)}}),w.each(["tabIndex","readOnly","maxLength","cellSpacing","cellPadding","rowSpan","colSpan","useMap","frameBorder","contentEditable"],function(){w.propFix[this.toLowerCase()]=this});function ot(e){return(e.match(I)||[]).join(" ")}function at(e){return e.getAttribute&&e.getAttribute("class")||""}function ut(e){return Array.isArray(e)?e:"string"==typeof e?e.match(I)||[]:[]}w.fn.extend({addClass:function(e){var t,n,r,i,o,a,u,s=0;if(g(e))return this.each(function(t){w(this).addClass(e.call(this,t,at(this)))});if((t=ut(e)).length)while(n=this[s++])if(i=at(n),r=1===n.nodeType&&" "+ot(i)+" "){a=0;while(o=t[a++])r.indexOf(" "+o+" ")<0&&(r+=o+" ");i!==(u=ot(r))&&n.setAttribute("class",u)}return this},removeClass:function(e){var t,n,r,i,o,a,u,s=0;if(g(e))return this.each(function(t){w(this).removeClass(e.call(this,t,at(this)))});if(!arguments.length)return this.attr("class","");if((t=ut(e)).length)while(n=this[s++])if(i=at(n),r=1===n.nodeType&&" "+ot(i)+" "){a=0;while(o=t[a++])while(r.indexOf(" "+o+" ")>-1)r=r.replace(" "+o+" "," ");i!==(u=ot(r))&&n.setAttribute("class",u)}return this},toggleClass:function(e,t){var n=typeof e,r="string"===n||Array.isArray(e);return"boolean"==typeof t&&r?t?this.addClass(e):this.removeClass(e):g(e)?this.each(function(n){w(this).toggleClass(e.call(this,n,at(this),t),t)}):this.each(function(){var t,i,o,a;if(r){i=0,o=w(this),a=ut(e);while(t=a[i++])o.hasClass(t)?o.removeClass(t):o.addClass(t)}else void 0!==e&&"boolean"!==n||((t=at(this))&&K.set(this,"__className__",t),this.setAttribute&&this.setAttribute("class",t||!1===e?"":K.get(this,"__className__")||""))})},hasClass:function(e){var t,n,r=0;t=" "+e+" ";while(n=this[r++])if(1===n.nodeType&&(" "+ot(at(n))+" ").indexOf(t)>-1)return!0;return!1}});var st=/\r/g;w.fn.extend({val:function(e){var t,n,r,i=this[0];{if(arguments.length)return r=g(e),this.each(function(n){var i;1===this.nodeType&&(null==(i=r?e.call(this,n,w(this).val()):e)?i="":"number"==typeof i?i+="":Array.isArray(i)&&(i=w.map(i,function(e){return null==e?"":e+""})),(t=w.valHooks[this.type]||w.valHooks[this.nodeName.toLowerCase()])&&"set"in t&&void 0!==t.set(this,i,"value")||(this.value=i))});if(i)return(t=w.valHooks[i.type]||w.valHooks[i.nodeName.toLowerCase()])&&"get"in t&&void 0!==(n=t.get(i,"value"))?n:"string"==typeof(n=i.value)?n.replace(st,""):null==n?"":n}}}),w.extend({valHooks:{option:{get:function(e){var t=w.find.attr(e,"value");return null!=t?t:ot(w.text(e))}},select:{get:function(e){var t,n,r,i=e.options,o=e.selectedIndex,a="select-one"===e.type,u=a?null:[],s=a?o+1:i.length;for(r=o<0?s:a?o:0;r-1)&&(n=!0);return n||(e.selectedIndex=-1),o}}}}),w.each(["radio","checkbox"],function(){w.valHooks[this]={set:function(e,t){if(Array.isArray(t))return e.checked=w.inArray(w(e).val(),t)>-1}},h.checkOn||(w.valHooks[this].get=function(e){return null===e.getAttribute("value")?"on":e.value})}),h.focusin="onfocusin"in e;var lt=/^(?:focusinfocus|focusoutblur)$/,ct=function(e){e.stopPropagation()};w.extend(w.event,{trigger:function(t,n,i,o){var a,u,s,l,c,d,p,h,y=[i||r],m=f.call(t,"type")?t.type:t,b=f.call(t,"namespace")?t.namespace.split("."):[];if(u=h=s=i=i||r,3!==i.nodeType&&8!==i.nodeType&&!lt.test(m+w.event.triggered)&&(m.indexOf(".")>-1&&(m=(b=m.split(".")).shift(),b.sort()),c=m.indexOf(":")<0&&"on"+m,t=t[w.expando]?t:new w.Event(m,"object"==typeof t&&t),t.isTrigger=o?2:3,t.namespace=b.join("."),t.rnamespace=t.namespace?new RegExp("(^|\\.)"+b.join("\\.(?:.*\\.|)")+"(\\.|$)"):null,t.result=void 0,t.target||(t.target=i),n=null==n?[t]:w.makeArray(n,[t]),p=w.event.special[m]||{},o||!p.trigger||!1!==p.trigger.apply(i,n))){if(!o&&!p.noBubble&&!v(i)){for(l=p.delegateType||m,lt.test(l+m)||(u=u.parentNode);u;u=u.parentNode)y.push(u),s=u;s===(i.ownerDocument||r)&&y.push(s.defaultView||s.parentWindow||e)}a=0;while((u=y[a++])&&!t.isPropagationStopped())h=u,t.type=a>1?l:p.bindType||m,(d=(K.get(u,"events")||{})[t.type]&&K.get(u,"handle"))&&d.apply(u,n),(d=c&&u[c])&&d.apply&&Y(u)&&(t.result=d.apply(u,n),!1===t.result&&t.preventDefault());return t.type=m,o||t.isDefaultPrevented()||p._default&&!1!==p._default.apply(y.pop(),n)||!Y(i)||c&&g(i[m])&&!v(i)&&((s=i[c])&&(i[c]=null),w.event.triggered=m,t.isPropagationStopped()&&h.addEventListener(m,ct),i[m](),t.isPropagationStopped()&&h.removeEventListener(m,ct),w.event.triggered=void 0,s&&(i[c]=s)),t.result}},simulate:function(e,t,n){var r=w.extend(new w.Event,n,{type:e,isSimulated:!0});w.event.trigger(r,null,t)}}),w.fn.extend({trigger:function(e,t){return this.each(function(){w.event.trigger(e,t,this)})},triggerHandler:function(e,t){var n=this[0];if(n)return w.event.trigger(e,t,n,!0)}}),h.focusin||w.each({focus:"focusin",blur:"focusout"},function(e,t){var n=function(e){w.event.simulate(t,e.target,w.event.fix(e))};w.event.special[t]={setup:function(){var r=this.ownerDocument||this,i=K.access(r,t);i||r.addEventListener(e,n,!0),K.access(r,t,(i||0)+1)},teardown:function(){var r=this.ownerDocument||this,i=K.access(r,t)-1;i?K.access(r,t,i):(r.removeEventListener(e,n,!0),K.remove(r,t))}}});var ft=/\[\]$/,dt=/\r?\n/g,pt=/^(?:submit|button|image|reset|file)$/i,ht=/^(?:input|select|textarea|keygen)/i;function gt(e,t,n,r){var i;if(Array.isArray(t))w.each(t,function(t,i){n||ft.test(e)?r(e,i):gt(e+"["+("object"==typeof i&&null!=i?t:"")+"]",i,n,r)});else if(n||"object"!==b(t))r(e,t);else for(i in t)gt(e+"["+i+"]",t[i],n,r)}w.param=function(e,t){var n,r=[],i=function(e,t){var n=g(t)?t():t;r[r.length]=encodeURIComponent(e)+"="+encodeURIComponent(null==n?"":n)};if(Array.isArray(e)||e.jquery&&!w.isPlainObject(e))w.each(e,function(){i(this.name,this.value)});else for(n in e)gt(n,e[n],t,i);return r.join("&")},w.fn.extend({serialize:function(){return w.param(this.serializeArray())},serializeArray:function(){return this.map(function(){var e=w.prop(this,"elements");return e?w.makeArray(e):this}).filter(function(){var e=this.type;return this.name&&!w(this).is(":disabled")&&ht.test(this.nodeName)&&!pt.test(e)&&(this.checked||!de.test(e))}).map(function(e,t){var n=w(this).val();return null==n?null:Array.isArray(n)?w.map(n,function(e){return{name:t.name,value:e.replace(dt,"\r\n")}}):{name:t.name,value:n.replace(dt,"\r\n")}}).get()}}),w.fn.extend({wrapAll:function(e){var t;return this[0]&&(g(e)&&(e=e.call(this[0])),t=w(e,this[0].ownerDocument).eq(0).clone(!0),this[0].parentNode&&t.insertBefore(this[0]),t.map(function(){var e=this;while(e.firstElementChild)e=e.firstElementChild;return e}).append(this)),this},wrapInner:function(e){return g(e)?this.each(function(t){w(this).wrapInner(e.call(this,t))}):this.each(function(){var t=w(this),n=t.contents();n.length?n.wrapAll(e):t.append(e)})},wrap:function(e){var t=g(e);return this.each(function(n){w(this).wrapAll(t?e.call(this,n):e)})},unwrap:function(e){return this.parent(e).not("body").each(function(){w(this).replaceWith(this.childNodes)}),this}}),w.expr.pseudos.hidden=function(e){return!w.expr.pseudos.visible(e)},w.expr.pseudos.visible=function(e){return!!(e.offsetWidth||e.offsetHeight||e.getClientRects().length)},h.createHTMLDocument=function(){var e=r.implementation.createHTMLDocument("").body;return e.innerHTML="
",2===e.childNodes.length}(),w.parseHTML=function(e,t,n){if("string"!=typeof e)return[];"boolean"==typeof t&&(n=t,t=!1);var i,o,a;return t||(h.createHTMLDocument?((i=(t=r.implementation.createHTMLDocument("")).createElement("base")).href=r.location.href,t.head.appendChild(i)):t=r),o=S.exec(e),a=!n&&[],o?[t.createElement(o[1])]:(o=be([e],t,a),a&&a.length&&w(a).remove(),w.merge([],o.childNodes))},w.offset={setOffset:function(e,t,n){var r,i,o,a,u,s,l,c=w.css(e,"position"),f=w(e),d={};"static"===c&&(e.style.position="relative"),u=f.offset(),o=w.css(e,"top"),s=w.css(e,"left"),(l=("absolute"===c||"fixed"===c)&&(o+s).indexOf("auto")>-1)?(a=(r=f.position()).top,i=r.left):(a=parseFloat(o)||0,i=parseFloat(s)||0),g(t)&&(t=t.call(e,n,w.extend({},u))),null!=t.top&&(d.top=t.top-u.top+a),null!=t.left&&(d.left=t.left-u.left+i),"using"in t?t.using.call(e,d):f.css(d)}},w.fn.extend({offset:function(e){if(arguments.length)return void 0===e?this:this.each(function(t){w.offset.setOffset(this,e,t)});var t,n,r=this[0];if(r)return r.getClientRects().length?(t=r.getBoundingClientRect(),n=r.ownerDocument.defaultView,{top:t.top+n.pageYOffset,left:t.left+n.pageXOffset}):{top:0,left:0}},position:function(){if(this[0]){var e,t,n,r=this[0],i={top:0,left:0};if("fixed"===w.css(r,"position"))t=r.getBoundingClientRect();else{t=this.offset(),n=r.ownerDocument,e=r.offsetParent||n.documentElement;while(e&&(e===n.body||e===n.documentElement)&&"static"===w.css(e,"position"))e=e.parentNode;e&&e!==r&&1===e.nodeType&&((i=w(e).offset()).top+=w.css(e,"borderTopWidth",!0),i.left+=w.css(e,"borderLeftWidth",!0))}return{top:t.top-i.top-w.css(r,"marginTop",!0),left:t.left-i.left-w.css(r,"marginLeft",!0)}}},offsetParent:function(){return this.map(function(){var e=this.offsetParent;while(e&&"static"===w.css(e,"position"))e=e.offsetParent;return e||xe})}}),w.each({scrollLeft:"pageXOffset",scrollTop:"pageYOffset"},function(e,t){var n="pageYOffset"===t;w.fn[e]=function(r){return _(this,function(e,r,i){var o;if(v(e)?o=e:9===e.nodeType&&(o=e.defaultView),void 0===i)return o?o[t]:e[r];o?o.scrollTo(n?o.pageXOffset:i,n?i:o.pageYOffset):e[r]=i},e,r,arguments.length)}}),w.each(["top","left"],function(e,t){w.cssHooks[t]=ze(h.pixelPosition,function(e,n){if(n)return n=Fe(e,t),Me.test(n)?w(e).position()[t]+"px":n})}),w.each({Height:"height",Width:"width"},function(e,t){w.each({padding:"inner"+e,content:t,"":"outer"+e},function(n,r){w.fn[r]=function(i,o){var a=arguments.length&&(n||"boolean"!=typeof i),u=n||(!0===i||!0===o?"margin":"border");return _(this,function(t,n,i){var o;return v(t)?0===r.indexOf("outer")?t["inner"+e]:t.document.documentElement["client"+e]:9===t.nodeType?(o=t.documentElement,Math.max(t.body["scroll"+e],o["scroll"+e],t.body["offset"+e],o["offset"+e],o["client"+e])):void 0===i?w.css(t,n,u):w.style(t,n,i,u)},t,a?i:void 0,a)}})}),w.each("blur focus focusin focusout resize scroll click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup contextmenu".split(" "),function(e,t){w.fn[t]=function(e,n){return arguments.length>0?this.on(t,null,e,n):this.trigger(t)}}),w.fn.extend({hover:function(e,t){return this.mouseenter(e).mouseleave(t||e)}}),w.fn.extend({bind:function(e,t,n){return this.on(e,null,t,n)},unbind:function(e,t){return this.off(e,null,t)},delegate:function(e,t,n,r){return this.on(t,e,n,r)},undelegate:function(e,t,n){return 1===arguments.length?this.off(e,"**"):this.off(t,e||"**",n)}}),w.proxy=function(e,t){var n,r,i;if("string"==typeof t&&(n=e[t],t=e,e=n),g(e))return r=o.call(arguments,2),i=function(){return e.apply(t||this,r.concat(o.call(arguments)))},i.guid=e.guid=e.guid||w.guid++,i},w.holdReady=function(e){e?w.readyWait++:w.ready(!0)},w.isArray=Array.isArray,w.parseJSON=JSON.parse,w.nodeName=D,w.isFunction=g,w.isWindow=v,w.camelCase=Q,w.type=b,w.now=Date.now,w.isNumeric=function(e){var t=w.type(e);return("number"===t||"string"===t)&&!isNaN(e-parseFloat(e))},"function"==typeof define&&define.amd&&define("jquery",[],function(){return w});var vt=e.jQuery,yt=e.$;return w.noConflict=function(t){return e.$===w&&(e.$=yt),t&&e.jQuery===w&&(e.jQuery=vt),w},t||(e.jQuery=e.$=w),w}); diff --git a/flask_admin/static/vendor/jquery-3.5.1.slim.min.js b/flask_admin/static/vendor/jquery-3.5.1.slim.min.js new file mode 100644 index 0000000000..36b4e1a137 --- /dev/null +++ b/flask_admin/static/vendor/jquery-3.5.1.slim.min.js @@ -0,0 +1,2 @@ +/*! jQuery v3.5.1 -ajax,-ajax/jsonp,-ajax/load,-ajax/script,-ajax/var/location,-ajax/var/nonce,-ajax/var/rquery,-ajax/xhr,-manipulation/_evalUrl,-deprecated/ajax-event-alias,-effects,-effects/Tween,-effects/animatedSelector | (c) JS Foundation and other contributors | jquery.org/license */ +!function(e,t){"use strict";"object"==typeof module&&"object"==typeof module.exports?module.exports=e.document?t(e,!0):function(e){if(!e.document)throw new Error("jQuery requires a window with a document");return t(e)}:t(e)}("undefined"!=typeof window?window:this,function(g,e){"use strict";var t=[],r=Object.getPrototypeOf,s=t.slice,v=t.flat?function(e){return t.flat.call(e)}:function(e){return t.concat.apply([],e)},u=t.push,i=t.indexOf,n={},o=n.toString,y=n.hasOwnProperty,a=y.toString,l=a.call(Object),m={},b=function(e){return"function"==typeof e&&"number"!=typeof e.nodeType},x=function(e){return null!=e&&e===e.window},w=g.document,c={type:!0,src:!0,nonce:!0,noModule:!0};function C(e,t,n){var r,i,o=(n=n||w).createElement("script");if(o.text=e,t)for(r in c)(i=t[r]||t.getAttribute&&t.getAttribute(r))&&o.setAttribute(r,i);n.head.appendChild(o).parentNode.removeChild(o)}function T(e){return null==e?e+"":"object"==typeof e||"function"==typeof e?n[o.call(e)]||"object":typeof e}var f="3.5.1 -ajax,-ajax/jsonp,-ajax/load,-ajax/script,-ajax/var/location,-ajax/var/nonce,-ajax/var/rquery,-ajax/xhr,-manipulation/_evalUrl,-deprecated/ajax-event-alias,-effects,-effects/Tween,-effects/animatedSelector",E=function(e,t){return new E.fn.init(e,t)};function d(e){var t=!!e&&"length"in e&&e.length,n=T(e);return!b(e)&&!x(e)&&("array"===n||0===t||"number"==typeof t&&0+~]|"+R+")"+R+"*"),U=new RegExp(R+"|>"),V=new RegExp(W),X=new RegExp("^"+B+"$"),Q={ID:new RegExp("^#("+B+")"),CLASS:new RegExp("^\\.("+B+")"),TAG:new RegExp("^("+B+"|[*])"),ATTR:new RegExp("^"+M),PSEUDO:new RegExp("^"+W),CHILD:new RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+R+"*(even|odd|(([+-]|)(\\d*)n|)"+R+"*(?:([+-]|)"+R+"*(\\d+)|))"+R+"*\\)|)","i"),bool:new RegExp("^(?:"+I+")$","i"),needsContext:new RegExp("^"+R+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+R+"*((?:-\\d)?\\d*)"+R+"*\\)|)(?=[^-]|$)","i")},Y=/HTML$/i,G=/^(?:input|select|textarea|button)$/i,K=/^h\d$/i,J=/^[^{]+\{\s*\[native \w/,Z=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,ee=/[+~]/,te=new RegExp("\\\\[\\da-fA-F]{1,6}"+R+"?|\\\\([^\\r\\n\\f])","g"),ne=function(e,t){var n="0x"+e.slice(1)-65536;return t||(n<0?String.fromCharCode(n+65536):String.fromCharCode(n>>10|55296,1023&n|56320))},re=/([\0-\x1f\x7f]|^-?\d)|^-$|[^\0-\x1f\x7f-\uFFFF\w-]/g,ie=function(e,t){return t?"\0"===e?"\ufffd":e.slice(0,-1)+"\\"+e.charCodeAt(e.length-1).toString(16)+" ":"\\"+e},oe=function(){C()},ae=xe(function(e){return!0===e.disabled&&"fieldset"===e.nodeName.toLowerCase()},{dir:"parentNode",next:"legend"});try{O.apply(t=P.call(d.childNodes),d.childNodes),t[d.childNodes.length].nodeType}catch(e){O={apply:t.length?function(e,t){q.apply(e,P.call(t))}:function(e,t){var n=e.length,r=0;while(e[n++]=t[r++]);e.length=n-1}}}function se(t,e,n,r){var i,o,a,s,u,l,c,f=e&&e.ownerDocument,d=e?e.nodeType:9;if(n=n||[],"string"!=typeof t||!t||1!==d&&9!==d&&11!==d)return n;if(!r&&(C(e),e=e||T,E)){if(11!==d&&(u=Z.exec(t)))if(i=u[1]){if(9===d){if(!(a=e.getElementById(i)))return n;if(a.id===i)return n.push(a),n}else if(f&&(a=f.getElementById(i))&&y(e,a)&&a.id===i)return n.push(a),n}else{if(u[2])return O.apply(n,e.getElementsByTagName(t)),n;if((i=u[3])&&p.getElementsByClassName&&e.getElementsByClassName)return O.apply(n,e.getElementsByClassName(i)),n}if(p.qsa&&!k[t+" "]&&(!v||!v.test(t))&&(1!==d||"object"!==e.nodeName.toLowerCase())){if(c=t,f=e,1===d&&(U.test(t)||_.test(t))){(f=ee.test(t)&&ye(e.parentNode)||e)===e&&p.scope||((s=e.getAttribute("id"))?s=s.replace(re,ie):e.setAttribute("id",s=A)),o=(l=h(t)).length;while(o--)l[o]=(s?"#"+s:":scope")+" "+be(l[o]);c=l.join(",")}try{return O.apply(n,f.querySelectorAll(c)),n}catch(e){k(t,!0)}finally{s===A&&e.removeAttribute("id")}}}return g(t.replace($,"$1"),e,n,r)}function ue(){var r=[];return function e(t,n){return r.push(t+" ")>x.cacheLength&&delete e[r.shift()],e[t+" "]=n}}function le(e){return e[A]=!0,e}function ce(e){var t=T.createElement("fieldset");try{return!!e(t)}catch(e){return!1}finally{t.parentNode&&t.parentNode.removeChild(t),t=null}}function fe(e,t){var n=e.split("|"),r=n.length;while(r--)x.attrHandle[n[r]]=t}function de(e,t){var n=t&&e,r=n&&1===e.nodeType&&1===t.nodeType&&e.sourceIndex-t.sourceIndex;if(r)return r;if(n)while(n=n.nextSibling)if(n===t)return-1;return e?1:-1}function pe(t){return function(e){return"input"===e.nodeName.toLowerCase()&&e.type===t}}function he(n){return function(e){var t=e.nodeName.toLowerCase();return("input"===t||"button"===t)&&e.type===n}}function ge(t){return function(e){return"form"in e?e.parentNode&&!1===e.disabled?"label"in e?"label"in e.parentNode?e.parentNode.disabled===t:e.disabled===t:e.isDisabled===t||e.isDisabled!==!t&&ae(e)===t:e.disabled===t:"label"in e&&e.disabled===t}}function ve(a){return le(function(o){return o=+o,le(function(e,t){var n,r=a([],e.length,o),i=r.length;while(i--)e[n=r[i]]&&(e[n]=!(t[n]=e[n]))})})}function ye(e){return e&&"undefined"!=typeof e.getElementsByTagName&&e}for(e in p=se.support={},i=se.isXML=function(e){var t=e.namespaceURI,n=(e.ownerDocument||e).documentElement;return!Y.test(t||n&&n.nodeName||"HTML")},C=se.setDocument=function(e){var t,n,r=e?e.ownerDocument||e:d;return r!=T&&9===r.nodeType&&r.documentElement&&(a=(T=r).documentElement,E=!i(T),d!=T&&(n=T.defaultView)&&n.top!==n&&(n.addEventListener?n.addEventListener("unload",oe,!1):n.attachEvent&&n.attachEvent("onunload",oe)),p.scope=ce(function(e){return a.appendChild(e).appendChild(T.createElement("div")),"undefined"!=typeof e.querySelectorAll&&!e.querySelectorAll(":scope fieldset div").length}),p.attributes=ce(function(e){return e.className="i",!e.getAttribute("className")}),p.getElementsByTagName=ce(function(e){return e.appendChild(T.createComment("")),!e.getElementsByTagName("*").length}),p.getElementsByClassName=J.test(T.getElementsByClassName),p.getById=ce(function(e){return a.appendChild(e).id=A,!T.getElementsByName||!T.getElementsByName(A).length}),p.getById?(x.filter.ID=function(e){var t=e.replace(te,ne);return function(e){return e.getAttribute("id")===t}},x.find.ID=function(e,t){if("undefined"!=typeof t.getElementById&&E){var n=t.getElementById(e);return n?[n]:[]}}):(x.filter.ID=function(e){var n=e.replace(te,ne);return function(e){var t="undefined"!=typeof e.getAttributeNode&&e.getAttributeNode("id");return t&&t.value===n}},x.find.ID=function(e,t){if("undefined"!=typeof t.getElementById&&E){var n,r,i,o=t.getElementById(e);if(o){if((n=o.getAttributeNode("id"))&&n.value===e)return[o];i=t.getElementsByName(e),r=0;while(o=i[r++])if((n=o.getAttributeNode("id"))&&n.value===e)return[o]}return[]}}),x.find.TAG=p.getElementsByTagName?function(e,t){return"undefined"!=typeof t.getElementsByTagName?t.getElementsByTagName(e):p.qsa?t.querySelectorAll(e):void 0}:function(e,t){var n,r=[],i=0,o=t.getElementsByTagName(e);if("*"===e){while(n=o[i++])1===n.nodeType&&r.push(n);return r}return o},x.find.CLASS=p.getElementsByClassName&&function(e,t){if("undefined"!=typeof t.getElementsByClassName&&E)return t.getElementsByClassName(e)},s=[],v=[],(p.qsa=J.test(T.querySelectorAll))&&(ce(function(e){var t;a.appendChild(e).innerHTML="",e.querySelectorAll("[msallowcapture^='']").length&&v.push("[*^$]="+R+"*(?:''|\"\")"),e.querySelectorAll("[selected]").length||v.push("\\["+R+"*(?:value|"+I+")"),e.querySelectorAll("[id~="+A+"-]").length||v.push("~="),(t=T.createElement("input")).setAttribute("name",""),e.appendChild(t),e.querySelectorAll("[name='']").length||v.push("\\["+R+"*name"+R+"*="+R+"*(?:''|\"\")"),e.querySelectorAll(":checked").length||v.push(":checked"),e.querySelectorAll("a#"+A+"+*").length||v.push(".#.+[+~]"),e.querySelectorAll("\\\f"),v.push("[\\r\\n\\f]")}),ce(function(e){e.innerHTML="";var t=T.createElement("input");t.setAttribute("type","hidden"),e.appendChild(t).setAttribute("name","D"),e.querySelectorAll("[name=d]").length&&v.push("name"+R+"*[*^$|!~]?="),2!==e.querySelectorAll(":enabled").length&&v.push(":enabled",":disabled"),a.appendChild(e).disabled=!0,2!==e.querySelectorAll(":disabled").length&&v.push(":enabled",":disabled"),e.querySelectorAll("*,:x"),v.push(",.*:")})),(p.matchesSelector=J.test(c=a.matches||a.webkitMatchesSelector||a.mozMatchesSelector||a.oMatchesSelector||a.msMatchesSelector))&&ce(function(e){p.disconnectedMatch=c.call(e,"*"),c.call(e,"[s!='']:x"),s.push("!=",W)}),v=v.length&&new RegExp(v.join("|")),s=s.length&&new RegExp(s.join("|")),t=J.test(a.compareDocumentPosition),y=t||J.test(a.contains)?function(e,t){var n=9===e.nodeType?e.documentElement:e,r=t&&t.parentNode;return e===r||!(!r||1!==r.nodeType||!(n.contains?n.contains(r):e.compareDocumentPosition&&16&e.compareDocumentPosition(r)))}:function(e,t){if(t)while(t=t.parentNode)if(t===e)return!0;return!1},D=t?function(e,t){if(e===t)return l=!0,0;var n=!e.compareDocumentPosition-!t.compareDocumentPosition;return n||(1&(n=(e.ownerDocument||e)==(t.ownerDocument||t)?e.compareDocumentPosition(t):1)||!p.sortDetached&&t.compareDocumentPosition(e)===n?e==T||e.ownerDocument==d&&y(d,e)?-1:t==T||t.ownerDocument==d&&y(d,t)?1:u?H(u,e)-H(u,t):0:4&n?-1:1)}:function(e,t){if(e===t)return l=!0,0;var n,r=0,i=e.parentNode,o=t.parentNode,a=[e],s=[t];if(!i||!o)return e==T?-1:t==T?1:i?-1:o?1:u?H(u,e)-H(u,t):0;if(i===o)return de(e,t);n=e;while(n=n.parentNode)a.unshift(n);n=t;while(n=n.parentNode)s.unshift(n);while(a[r]===s[r])r++;return r?de(a[r],s[r]):a[r]==d?-1:s[r]==d?1:0}),T},se.matches=function(e,t){return se(e,null,null,t)},se.matchesSelector=function(e,t){if(C(e),p.matchesSelector&&E&&!k[t+" "]&&(!s||!s.test(t))&&(!v||!v.test(t)))try{var n=c.call(e,t);if(n||p.disconnectedMatch||e.document&&11!==e.document.nodeType)return n}catch(e){k(t,!0)}return 0":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(e){return e[1]=e[1].replace(te,ne),e[3]=(e[3]||e[4]||e[5]||"").replace(te,ne),"~="===e[2]&&(e[3]=" "+e[3]+" "),e.slice(0,4)},CHILD:function(e){return e[1]=e[1].toLowerCase(),"nth"===e[1].slice(0,3)?(e[3]||se.error(e[0]),e[4]=+(e[4]?e[5]+(e[6]||1):2*("even"===e[3]||"odd"===e[3])),e[5]=+(e[7]+e[8]||"odd"===e[3])):e[3]&&se.error(e[0]),e},PSEUDO:function(e){var t,n=!e[6]&&e[2];return Q.CHILD.test(e[0])?null:(e[3]?e[2]=e[4]||e[5]||"":n&&V.test(n)&&(t=h(n,!0))&&(t=n.indexOf(")",n.length-t)-n.length)&&(e[0]=e[0].slice(0,t),e[2]=n.slice(0,t)),e.slice(0,3))}},filter:{TAG:function(e){var t=e.replace(te,ne).toLowerCase();return"*"===e?function(){return!0}:function(e){return e.nodeName&&e.nodeName.toLowerCase()===t}},CLASS:function(e){var t=m[e+" "];return t||(t=new RegExp("(^|"+R+")"+e+"("+R+"|$)"))&&m(e,function(e){return t.test("string"==typeof e.className&&e.className||"undefined"!=typeof e.getAttribute&&e.getAttribute("class")||"")})},ATTR:function(n,r,i){return function(e){var t=se.attr(e,n);return null==t?"!="===r:!r||(t+="","="===r?t===i:"!="===r?t!==i:"^="===r?i&&0===t.indexOf(i):"*="===r?i&&-1:\x20\t\r\n\f]*)[\x20\t\r\n\f]*\/?>(?:<\/\1>|)$/i;function D(e,n,r){return b(n)?E.grep(e,function(e,t){return!!n.call(e,t,e)!==r}):n.nodeType?E.grep(e,function(e){return e===n!==r}):"string"!=typeof n?E.grep(e,function(e){return-1)[^>]*|#([\w-]+))$/;(E.fn.init=function(e,t,n){var r,i;if(!e)return this;if(n=n||L,"string"==typeof e){if(!(r="<"===e[0]&&">"===e[e.length-1]&&3<=e.length?[null,e,null]:j.exec(e))||!r[1]&&t)return!t||t.jquery?(t||n).find(e):this.constructor(t).find(e);if(r[1]){if(t=t instanceof E?t[0]:t,E.merge(this,E.parseHTML(r[1],t&&t.nodeType?t.ownerDocument||t:w,!0)),k.test(r[1])&&E.isPlainObject(t))for(r in t)b(this[r])?this[r](t[r]):this.attr(r,t[r]);return this}return(i=w.getElementById(r[2]))&&(this[0]=i,this.length=1),this}return e.nodeType?(this[0]=e,this.length=1,this):b(e)?void 0!==n.ready?n.ready(e):e(E):E.makeArray(e,this)}).prototype=E.fn,L=E(w);var q=/^(?:parents|prev(?:Until|All))/,O={children:!0,contents:!0,next:!0,prev:!0};function P(e,t){while((e=e[t])&&1!==e.nodeType);return e}E.fn.extend({has:function(e){var t=E(e,this),n=t.length;return this.filter(function(){for(var e=0;e\x20\t\r\n\f]*)/i,pe=/^$|^module$|\/(?:java|ecma)script/i;le=w.createDocumentFragment().appendChild(w.createElement("div")),(ce=w.createElement("input")).setAttribute("type","radio"),ce.setAttribute("checked","checked"),ce.setAttribute("name","t"),le.appendChild(ce),m.checkClone=le.cloneNode(!0).cloneNode(!0).lastChild.checked,le.innerHTML="",m.noCloneChecked=!!le.cloneNode(!0).lastChild.defaultValue,le.innerHTML="",m.option=!!le.lastChild;var he={thead:[1,"","
"],col:[2,"","
"],tr:[2,"","
"],td:[3,"","
"],_default:[0,"",""]};function ge(e,t){var n;return n="undefined"!=typeof e.getElementsByTagName?e.getElementsByTagName(t||"*"):"undefined"!=typeof e.querySelectorAll?e.querySelectorAll(t||"*"):[],void 0===t||t&&S(e,t)?E.merge([e],n):n}function ve(e,t){for(var n=0,r=e.length;n",""]);var ye=/<|&#?\w+;/;function me(e,t,n,r,i){for(var o,a,s,u,l,c,f=t.createDocumentFragment(),d=[],p=0,h=e.length;p\s*$/g;function Le(e,t){return S(e,"table")&&S(11!==t.nodeType?t:t.firstChild,"tr")&&E(e).children("tbody")[0]||e}function je(e){return e.type=(null!==e.getAttribute("type"))+"/"+e.type,e}function qe(e){return"true/"===(e.type||"").slice(0,5)?e.type=e.type.slice(5):e.removeAttribute("type"),e}function Oe(e,t){var n,r,i,o,a,s;if(1===t.nodeType){if(Y.hasData(e)&&(s=Y.get(e).events))for(i in Y.remove(t,"handle events"),s)for(n=0,r=s[i].length;n
",2===ft.childNodes.length),E.parseHTML=function(e,t,n){return"string"!=typeof e?[]:("boolean"==typeof t&&(n=t,t=!1),t||(m.createHTMLDocument?((r=(t=w.implementation.createHTMLDocument("")).createElement("base")).href=w.location.href,t.head.appendChild(r)):t=w),o=!n&&[],(i=k.exec(e))?[t.createElement(i[1])]:(i=me([e],t,o),o&&o.length&&E(o).remove(),E.merge([],i.childNodes)));var r,i,o},E.offset={setOffset:function(e,t,n){var r,i,o,a,s,u,l=E.css(e,"position"),c=E(e),f={};"static"===l&&(e.style.position="relative"),s=c.offset(),o=E.css(e,"top"),u=E.css(e,"left"),("absolute"===l||"fixed"===l)&&-1<(o+u).indexOf("auto")?(a=(r=c.position()).top,i=r.left):(a=parseFloat(o)||0,i=parseFloat(u)||0),b(t)&&(t=t.call(e,n,E.extend({},s))),null!=t.top&&(f.top=t.top-s.top+a),null!=t.left&&(f.left=t.left-s.left+i),"using"in t?t.using.call(e,f):("number"==typeof f.top&&(f.top+="px"),"number"==typeof f.left&&(f.left+="px"),c.css(f))}},E.fn.extend({offset:function(t){if(arguments.length)return void 0===t?this:this.each(function(e){E.offset.setOffset(this,t,e)});var e,n,r=this[0];return r?r.getClientRects().length?(e=r.getBoundingClientRect(),n=r.ownerDocument.defaultView,{top:e.top+n.pageYOffset,left:e.left+n.pageXOffset}):{top:0,left:0}:void 0},position:function(){if(this[0]){var e,t,n,r=this[0],i={top:0,left:0};if("fixed"===E.css(r,"position"))t=r.getBoundingClientRect();else{t=this.offset(),n=r.ownerDocument,e=r.offsetParent||n.documentElement;while(e&&(e===n.body||e===n.documentElement)&&"static"===E.css(e,"position"))e=e.parentNode;e&&e!==r&&1===e.nodeType&&((i=E(e).offset()).top+=E.css(e,"borderTopWidth",!0),i.left+=E.css(e,"borderLeftWidth",!0))}return{top:t.top-i.top-E.css(r,"marginTop",!0),left:t.left-i.left-E.css(r,"marginLeft",!0)}}},offsetParent:function(){return this.map(function(){var e=this.offsetParent;while(e&&"static"===E.css(e,"position"))e=e.offsetParent;return e||re})}}),E.each({scrollLeft:"pageXOffset",scrollTop:"pageYOffset"},function(t,i){var o="pageYOffset"===i;E.fn[t]=function(e){return $(this,function(e,t,n){var r;if(x(e)?r=e:9===e.nodeType&&(r=e.defaultView),void 0===n)return r?r[i]:e[t];r?r.scrollTo(o?r.pageXOffset:n,o?n:r.pageYOffset):e[t]=n},t,e,arguments.length)}}),E.each(["top","left"],function(e,n){E.cssHooks[n]=Fe(m.pixelPosition,function(e,t){if(t)return t=We(e,n),Ie.test(t)?E(e).position()[n]+"px":t})}),E.each({Height:"height",Width:"width"},function(a,s){E.each({padding:"inner"+a,content:s,"":"outer"+a},function(r,o){E.fn[o]=function(e,t){var n=arguments.length&&(r||"boolean"!=typeof e),i=r||(!0===e||!0===t?"margin":"border");return $(this,function(e,t,n){var r;return x(e)?0===o.indexOf("outer")?e["inner"+a]:e.document.documentElement["client"+a]:9===e.nodeType?(r=e.documentElement,Math.max(e.body["scroll"+a],r["scroll"+a],e.body["offset"+a],r["offset"+a],r["client"+a])):void 0===n?E.css(e,t,i):E.style(e,t,n,i)},s,n?e:void 0,n)}})}),E.fn.extend({bind:function(e,t,n){return this.on(e,null,t,n)},unbind:function(e,t){return this.off(e,null,t)},delegate:function(e,t,n,r){return this.on(t,e,n,r)},undelegate:function(e,t,n){return 1===arguments.length?this.off(e,"**"):this.off(t,e||"**",n)},hover:function(e,t){return this.mouseenter(e).mouseleave(t||e)}}),E.each("blur focus focusin focusout resize scroll click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup contextmenu".split(" "),function(e,n){E.fn[n]=function(e,t){return 0=0&&n0&&t-1 in e)}var E=function(e){var t,n,r,i,o,a,s,u,l,c,f,p,d,h,g,y,v,m,x,b="sizzle"+1*new Date,w=e.document,T=0,C=0,E=ae(),k=ae(),S=ae(),D=function(e,t){return e===t&&(f=!0),0},N={}.hasOwnProperty,A=[],j=A.pop,q=A.push,L=A.push,H=A.slice,O=function(e,t){for(var n=0,r=e.length;n+~]|"+M+")"+M+"*"),z=new RegExp("="+M+"*([^\\]'\"]*?)"+M+"*\\]","g"),X=new RegExp(W),U=new RegExp("^"+R+"$"),V={ID:new RegExp("^#("+R+")"),CLASS:new RegExp("^\\.("+R+")"),TAG:new RegExp("^("+R+"|[*])"),ATTR:new RegExp("^"+I),PSEUDO:new RegExp("^"+W),CHILD:new RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+M+"*(even|odd|(([+-]|)(\\d*)n|)"+M+"*(?:([+-]|)"+M+"*(\\d+)|))"+M+"*\\)|)","i"),bool:new RegExp("^(?:"+P+")$","i"),needsContext:new RegExp("^"+M+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+M+"*((?:-\\d)?\\d*)"+M+"*\\)|)(?=[^-]|$)","i")},G=/^(?:input|select|textarea|button)$/i,Y=/^h\d$/i,Q=/^[^{]+\{\s*\[native \w/,J=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,K=/[+~]/,Z=new RegExp("\\\\([\\da-f]{1,6}"+M+"?|("+M+")|.)","ig"),ee=function(e,t,n){var r="0x"+t-65536;return r!==r||n?t:r<0?String.fromCharCode(r+65536):String.fromCharCode(r>>10|55296,1023&r|56320)},te=/([\0-\x1f\x7f]|^-?\d)|^-$|[^\0-\x1f\x7f-\uFFFF\w-]/g,ne=function(e,t){return t?"\0"===e?"\ufffd":e.slice(0,-1)+"\\"+e.charCodeAt(e.length-1).toString(16)+" ":"\\"+e},re=function(){p()},ie=me(function(e){return!0===e.disabled&&("form"in e||"label"in e)},{dir:"parentNode",next:"legend"});try{L.apply(A=H.call(w.childNodes),w.childNodes),A[w.childNodes.length].nodeType}catch(e){L={apply:A.length?function(e,t){q.apply(e,H.call(t))}:function(e,t){var n=e.length,r=0;while(e[n++]=t[r++]);e.length=n-1}}}function oe(e,t,r,i){var o,s,l,c,f,h,v,m=t&&t.ownerDocument,T=t?t.nodeType:9;if(r=r||[],"string"!=typeof e||!e||1!==T&&9!==T&&11!==T)return r;if(!i&&((t?t.ownerDocument||t:w)!==d&&p(t),t=t||d,g)){if(11!==T&&(f=J.exec(e)))if(o=f[1]){if(9===T){if(!(l=t.getElementById(o)))return r;if(l.id===o)return r.push(l),r}else if(m&&(l=m.getElementById(o))&&x(t,l)&&l.id===o)return r.push(l),r}else{if(f[2])return L.apply(r,t.getElementsByTagName(e)),r;if((o=f[3])&&n.getElementsByClassName&&t.getElementsByClassName)return L.apply(r,t.getElementsByClassName(o)),r}if(n.qsa&&!S[e+" "]&&(!y||!y.test(e))){if(1!==T)m=t,v=e;else if("object"!==t.nodeName.toLowerCase()){(c=t.getAttribute("id"))?c=c.replace(te,ne):t.setAttribute("id",c=b),s=(h=a(e)).length;while(s--)h[s]="#"+c+" "+ve(h[s]);v=h.join(","),m=K.test(e)&&ge(t.parentNode)||t}if(v)try{return L.apply(r,m.querySelectorAll(v)),r}catch(e){}finally{c===b&&t.removeAttribute("id")}}}return u(e.replace(B,"$1"),t,r,i)}function ae(){var e=[];function t(n,i){return e.push(n+" ")>r.cacheLength&&delete t[e.shift()],t[n+" "]=i}return t}function se(e){return e[b]=!0,e}function ue(e){var t=d.createElement("fieldset");try{return!!e(t)}catch(e){return!1}finally{t.parentNode&&t.parentNode.removeChild(t),t=null}}function le(e,t){var n=e.split("|"),i=n.length;while(i--)r.attrHandle[n[i]]=t}function ce(e,t){var n=t&&e,r=n&&1===e.nodeType&&1===t.nodeType&&e.sourceIndex-t.sourceIndex;if(r)return r;if(n)while(n=n.nextSibling)if(n===t)return-1;return e?1:-1}function fe(e){return function(t){return"input"===t.nodeName.toLowerCase()&&t.type===e}}function pe(e){return function(t){var n=t.nodeName.toLowerCase();return("input"===n||"button"===n)&&t.type===e}}function de(e){return function(t){return"form"in t?t.parentNode&&!1===t.disabled?"label"in t?"label"in t.parentNode?t.parentNode.disabled===e:t.disabled===e:t.isDisabled===e||t.isDisabled!==!e&&ie(t)===e:t.disabled===e:"label"in t&&t.disabled===e}}function he(e){return se(function(t){return t=+t,se(function(n,r){var i,o=e([],n.length,t),a=o.length;while(a--)n[i=o[a]]&&(n[i]=!(r[i]=n[i]))})})}function ge(e){return e&&"undefined"!=typeof e.getElementsByTagName&&e}n=oe.support={},o=oe.isXML=function(e){var t=e&&(e.ownerDocument||e).documentElement;return!!t&&"HTML"!==t.nodeName},p=oe.setDocument=function(e){var t,i,a=e?e.ownerDocument||e:w;return a!==d&&9===a.nodeType&&a.documentElement?(d=a,h=d.documentElement,g=!o(d),w!==d&&(i=d.defaultView)&&i.top!==i&&(i.addEventListener?i.addEventListener("unload",re,!1):i.attachEvent&&i.attachEvent("onunload",re)),n.attributes=ue(function(e){return e.className="i",!e.getAttribute("className")}),n.getElementsByTagName=ue(function(e){return e.appendChild(d.createComment("")),!e.getElementsByTagName("*").length}),n.getElementsByClassName=Q.test(d.getElementsByClassName),n.getById=ue(function(e){return h.appendChild(e).id=b,!d.getElementsByName||!d.getElementsByName(b).length}),n.getById?(r.filter.ID=function(e){var t=e.replace(Z,ee);return function(e){return e.getAttribute("id")===t}},r.find.ID=function(e,t){if("undefined"!=typeof t.getElementById&&g){var n=t.getElementById(e);return n?[n]:[]}}):(r.filter.ID=function(e){var t=e.replace(Z,ee);return function(e){var n="undefined"!=typeof e.getAttributeNode&&e.getAttributeNode("id");return n&&n.value===t}},r.find.ID=function(e,t){if("undefined"!=typeof t.getElementById&&g){var n,r,i,o=t.getElementById(e);if(o){if((n=o.getAttributeNode("id"))&&n.value===e)return[o];i=t.getElementsByName(e),r=0;while(o=i[r++])if((n=o.getAttributeNode("id"))&&n.value===e)return[o]}return[]}}),r.find.TAG=n.getElementsByTagName?function(e,t){return"undefined"!=typeof t.getElementsByTagName?t.getElementsByTagName(e):n.qsa?t.querySelectorAll(e):void 0}:function(e,t){var n,r=[],i=0,o=t.getElementsByTagName(e);if("*"===e){while(n=o[i++])1===n.nodeType&&r.push(n);return r}return o},r.find.CLASS=n.getElementsByClassName&&function(e,t){if("undefined"!=typeof t.getElementsByClassName&&g)return t.getElementsByClassName(e)},v=[],y=[],(n.qsa=Q.test(d.querySelectorAll))&&(ue(function(e){h.appendChild(e).innerHTML="",e.querySelectorAll("[msallowcapture^='']").length&&y.push("[*^$]="+M+"*(?:''|\"\")"),e.querySelectorAll("[selected]").length||y.push("\\["+M+"*(?:value|"+P+")"),e.querySelectorAll("[id~="+b+"-]").length||y.push("~="),e.querySelectorAll(":checked").length||y.push(":checked"),e.querySelectorAll("a#"+b+"+*").length||y.push(".#.+[+~]")}),ue(function(e){e.innerHTML="";var t=d.createElement("input");t.setAttribute("type","hidden"),e.appendChild(t).setAttribute("name","D"),e.querySelectorAll("[name=d]").length&&y.push("name"+M+"*[*^$|!~]?="),2!==e.querySelectorAll(":enabled").length&&y.push(":enabled",":disabled"),h.appendChild(e).disabled=!0,2!==e.querySelectorAll(":disabled").length&&y.push(":enabled",":disabled"),e.querySelectorAll("*,:x"),y.push(",.*:")})),(n.matchesSelector=Q.test(m=h.matches||h.webkitMatchesSelector||h.mozMatchesSelector||h.oMatchesSelector||h.msMatchesSelector))&&ue(function(e){n.disconnectedMatch=m.call(e,"*"),m.call(e,"[s!='']:x"),v.push("!=",W)}),y=y.length&&new RegExp(y.join("|")),v=v.length&&new RegExp(v.join("|")),t=Q.test(h.compareDocumentPosition),x=t||Q.test(h.contains)?function(e,t){var n=9===e.nodeType?e.documentElement:e,r=t&&t.parentNode;return e===r||!(!r||1!==r.nodeType||!(n.contains?n.contains(r):e.compareDocumentPosition&&16&e.compareDocumentPosition(r)))}:function(e,t){if(t)while(t=t.parentNode)if(t===e)return!0;return!1},D=t?function(e,t){if(e===t)return f=!0,0;var r=!e.compareDocumentPosition-!t.compareDocumentPosition;return r||(1&(r=(e.ownerDocument||e)===(t.ownerDocument||t)?e.compareDocumentPosition(t):1)||!n.sortDetached&&t.compareDocumentPosition(e)===r?e===d||e.ownerDocument===w&&x(w,e)?-1:t===d||t.ownerDocument===w&&x(w,t)?1:c?O(c,e)-O(c,t):0:4&r?-1:1)}:function(e,t){if(e===t)return f=!0,0;var n,r=0,i=e.parentNode,o=t.parentNode,a=[e],s=[t];if(!i||!o)return e===d?-1:t===d?1:i?-1:o?1:c?O(c,e)-O(c,t):0;if(i===o)return ce(e,t);n=e;while(n=n.parentNode)a.unshift(n);n=t;while(n=n.parentNode)s.unshift(n);while(a[r]===s[r])r++;return r?ce(a[r],s[r]):a[r]===w?-1:s[r]===w?1:0},d):d},oe.matches=function(e,t){return oe(e,null,null,t)},oe.matchesSelector=function(e,t){if((e.ownerDocument||e)!==d&&p(e),t=t.replace(z,"='$1']"),n.matchesSelector&&g&&!S[t+" "]&&(!v||!v.test(t))&&(!y||!y.test(t)))try{var r=m.call(e,t);if(r||n.disconnectedMatch||e.document&&11!==e.document.nodeType)return r}catch(e){}return oe(t,d,null,[e]).length>0},oe.contains=function(e,t){return(e.ownerDocument||e)!==d&&p(e),x(e,t)},oe.attr=function(e,t){(e.ownerDocument||e)!==d&&p(e);var i=r.attrHandle[t.toLowerCase()],o=i&&N.call(r.attrHandle,t.toLowerCase())?i(e,t,!g):void 0;return void 0!==o?o:n.attributes||!g?e.getAttribute(t):(o=e.getAttributeNode(t))&&o.specified?o.value:null},oe.escape=function(e){return(e+"").replace(te,ne)},oe.error=function(e){throw new Error("Syntax error, unrecognized expression: "+e)},oe.uniqueSort=function(e){var t,r=[],i=0,o=0;if(f=!n.detectDuplicates,c=!n.sortStable&&e.slice(0),e.sort(D),f){while(t=e[o++])t===e[o]&&(i=r.push(o));while(i--)e.splice(r[i],1)}return c=null,e},i=oe.getText=function(e){var t,n="",r=0,o=e.nodeType;if(o){if(1===o||9===o||11===o){if("string"==typeof e.textContent)return e.textContent;for(e=e.firstChild;e;e=e.nextSibling)n+=i(e)}else if(3===o||4===o)return e.nodeValue}else while(t=e[r++])n+=i(t);return n},(r=oe.selectors={cacheLength:50,createPseudo:se,match:V,attrHandle:{},find:{},relative:{">":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(e){return e[1]=e[1].replace(Z,ee),e[3]=(e[3]||e[4]||e[5]||"").replace(Z,ee),"~="===e[2]&&(e[3]=" "+e[3]+" "),e.slice(0,4)},CHILD:function(e){return e[1]=e[1].toLowerCase(),"nth"===e[1].slice(0,3)?(e[3]||oe.error(e[0]),e[4]=+(e[4]?e[5]+(e[6]||1):2*("even"===e[3]||"odd"===e[3])),e[5]=+(e[7]+e[8]||"odd"===e[3])):e[3]&&oe.error(e[0]),e},PSEUDO:function(e){var t,n=!e[6]&&e[2];return V.CHILD.test(e[0])?null:(e[3]?e[2]=e[4]||e[5]||"":n&&X.test(n)&&(t=a(n,!0))&&(t=n.indexOf(")",n.length-t)-n.length)&&(e[0]=e[0].slice(0,t),e[2]=n.slice(0,t)),e.slice(0,3))}},filter:{TAG:function(e){var t=e.replace(Z,ee).toLowerCase();return"*"===e?function(){return!0}:function(e){return e.nodeName&&e.nodeName.toLowerCase()===t}},CLASS:function(e){var t=E[e+" "];return t||(t=new RegExp("(^|"+M+")"+e+"("+M+"|$)"))&&E(e,function(e){return t.test("string"==typeof e.className&&e.className||"undefined"!=typeof e.getAttribute&&e.getAttribute("class")||"")})},ATTR:function(e,t,n){return function(r){var i=oe.attr(r,e);return null==i?"!="===t:!t||(i+="","="===t?i===n:"!="===t?i!==n:"^="===t?n&&0===i.indexOf(n):"*="===t?n&&i.indexOf(n)>-1:"$="===t?n&&i.slice(-n.length)===n:"~="===t?(" "+i.replace($," ")+" ").indexOf(n)>-1:"|="===t&&(i===n||i.slice(0,n.length+1)===n+"-"))}},CHILD:function(e,t,n,r,i){var o="nth"!==e.slice(0,3),a="last"!==e.slice(-4),s="of-type"===t;return 1===r&&0===i?function(e){return!!e.parentNode}:function(t,n,u){var l,c,f,p,d,h,g=o!==a?"nextSibling":"previousSibling",y=t.parentNode,v=s&&t.nodeName.toLowerCase(),m=!u&&!s,x=!1;if(y){if(o){while(g){p=t;while(p=p[g])if(s?p.nodeName.toLowerCase()===v:1===p.nodeType)return!1;h=g="only"===e&&!h&&"nextSibling"}return!0}if(h=[a?y.firstChild:y.lastChild],a&&m){x=(d=(l=(c=(f=(p=y)[b]||(p[b]={}))[p.uniqueID]||(f[p.uniqueID]={}))[e]||[])[0]===T&&l[1])&&l[2],p=d&&y.childNodes[d];while(p=++d&&p&&p[g]||(x=d=0)||h.pop())if(1===p.nodeType&&++x&&p===t){c[e]=[T,d,x];break}}else if(m&&(x=d=(l=(c=(f=(p=t)[b]||(p[b]={}))[p.uniqueID]||(f[p.uniqueID]={}))[e]||[])[0]===T&&l[1]),!1===x)while(p=++d&&p&&p[g]||(x=d=0)||h.pop())if((s?p.nodeName.toLowerCase()===v:1===p.nodeType)&&++x&&(m&&((c=(f=p[b]||(p[b]={}))[p.uniqueID]||(f[p.uniqueID]={}))[e]=[T,x]),p===t))break;return(x-=i)===r||x%r==0&&x/r>=0}}},PSEUDO:function(e,t){var n,i=r.pseudos[e]||r.setFilters[e.toLowerCase()]||oe.error("unsupported pseudo: "+e);return i[b]?i(t):i.length>1?(n=[e,e,"",t],r.setFilters.hasOwnProperty(e.toLowerCase())?se(function(e,n){var r,o=i(e,t),a=o.length;while(a--)e[r=O(e,o[a])]=!(n[r]=o[a])}):function(e){return i(e,0,n)}):i}},pseudos:{not:se(function(e){var t=[],n=[],r=s(e.replace(B,"$1"));return r[b]?se(function(e,t,n,i){var o,a=r(e,null,i,[]),s=e.length;while(s--)(o=a[s])&&(e[s]=!(t[s]=o))}):function(e,i,o){return t[0]=e,r(t,null,o,n),t[0]=null,!n.pop()}}),has:se(function(e){return function(t){return oe(e,t).length>0}}),contains:se(function(e){return e=e.replace(Z,ee),function(t){return(t.textContent||t.innerText||i(t)).indexOf(e)>-1}}),lang:se(function(e){return U.test(e||"")||oe.error("unsupported lang: "+e),e=e.replace(Z,ee).toLowerCase(),function(t){var n;do{if(n=g?t.lang:t.getAttribute("xml:lang")||t.getAttribute("lang"))return(n=n.toLowerCase())===e||0===n.indexOf(e+"-")}while((t=t.parentNode)&&1===t.nodeType);return!1}}),target:function(t){var n=e.location&&e.location.hash;return n&&n.slice(1)===t.id},root:function(e){return e===h},focus:function(e){return e===d.activeElement&&(!d.hasFocus||d.hasFocus())&&!!(e.type||e.href||~e.tabIndex)},enabled:de(!1),disabled:de(!0),checked:function(e){var t=e.nodeName.toLowerCase();return"input"===t&&!!e.checked||"option"===t&&!!e.selected},selected:function(e){return e.parentNode&&e.parentNode.selectedIndex,!0===e.selected},empty:function(e){for(e=e.firstChild;e;e=e.nextSibling)if(e.nodeType<6)return!1;return!0},parent:function(e){return!r.pseudos.empty(e)},header:function(e){return Y.test(e.nodeName)},input:function(e){return G.test(e.nodeName)},button:function(e){var t=e.nodeName.toLowerCase();return"input"===t&&"button"===e.type||"button"===t},text:function(e){var t;return"input"===e.nodeName.toLowerCase()&&"text"===e.type&&(null==(t=e.getAttribute("type"))||"text"===t.toLowerCase())},first:he(function(){return[0]}),last:he(function(e,t){return[t-1]}),eq:he(function(e,t,n){return[n<0?n+t:n]}),even:he(function(e,t){for(var n=0;n=0;)e.push(r);return e}),gt:he(function(e,t,n){for(var r=n<0?n+t:n;++r1?function(t,n,r){var i=e.length;while(i--)if(!e[i](t,n,r))return!1;return!0}:e[0]}function be(e,t,n){for(var r=0,i=t.length;r-1&&(o[l]=!(a[l]=f))}}else v=we(v===a?v.splice(h,v.length):v),i?i(null,a,v,u):L.apply(a,v)})}function Ce(e){for(var t,n,i,o=e.length,a=r.relative[e[0].type],s=a||r.relative[" "],u=a?1:0,c=me(function(e){return e===t},s,!0),f=me(function(e){return O(t,e)>-1},s,!0),p=[function(e,n,r){var i=!a&&(r||n!==l)||((t=n).nodeType?c(e,n,r):f(e,n,r));return t=null,i}];u1&&xe(p),u>1&&ve(e.slice(0,u-1).concat({value:" "===e[u-2].type?"*":""})).replace(B,"$1"),n,u0,i=e.length>0,o=function(o,a,s,u,c){var f,h,y,v=0,m="0",x=o&&[],b=[],w=l,C=o||i&&r.find.TAG("*",c),E=T+=null==w?1:Math.random()||.1,k=C.length;for(c&&(l=a===d||a||c);m!==k&&null!=(f=C[m]);m++){if(i&&f){h=0,a||f.ownerDocument===d||(p(f),s=!g);while(y=e[h++])if(y(f,a||d,s)){u.push(f);break}c&&(T=E)}n&&((f=!y&&f)&&v--,o&&x.push(f))}if(v+=m,n&&m!==v){h=0;while(y=t[h++])y(x,b,a,s);if(o){if(v>0)while(m--)x[m]||b[m]||(b[m]=j.call(u));b=we(b)}L.apply(u,b),c&&!o&&b.length>0&&v+t.length>1&&oe.uniqueSort(u)}return c&&(T=E,l=w),x};return n?se(o):o}return s=oe.compile=function(e,t){var n,r=[],i=[],o=S[e+" "];if(!o){t||(t=a(e)),n=t.length;while(n--)(o=Ce(t[n]))[b]?r.push(o):i.push(o);(o=S(e,Ee(i,r))).selector=e}return o},u=oe.select=function(e,t,n,i){var o,u,l,c,f,p="function"==typeof e&&e,d=!i&&a(e=p.selector||e);if(n=n||[],1===d.length){if((u=d[0]=d[0].slice(0)).length>2&&"ID"===(l=u[0]).type&&9===t.nodeType&&g&&r.relative[u[1].type]){if(!(t=(r.find.ID(l.matches[0].replace(Z,ee),t)||[])[0]))return n;p&&(t=t.parentNode),e=e.slice(u.shift().value.length)}o=V.needsContext.test(e)?0:u.length;while(o--){if(l=u[o],r.relative[c=l.type])break;if((f=r.find[c])&&(i=f(l.matches[0].replace(Z,ee),K.test(u[0].type)&&ge(t.parentNode)||t))){if(u.splice(o,1),!(e=i.length&&ve(u)))return L.apply(n,i),n;break}}}return(p||s(e,d))(i,t,!g,n,!t||K.test(e)&&ge(t.parentNode)||t),n},n.sortStable=b.split("").sort(D).join("")===b,n.detectDuplicates=!!f,p(),n.sortDetached=ue(function(e){return 1&e.compareDocumentPosition(d.createElement("fieldset"))}),ue(function(e){return e.innerHTML="","#"===e.firstChild.getAttribute("href")})||le("type|href|height|width",function(e,t,n){if(!n)return e.getAttribute(t,"type"===t.toLowerCase()?1:2)}),n.attributes&&ue(function(e){return e.innerHTML="",e.firstChild.setAttribute("value",""),""===e.firstChild.getAttribute("value")})||le("value",function(e,t,n){if(!n&&"input"===e.nodeName.toLowerCase())return e.defaultValue}),ue(function(e){return null==e.getAttribute("disabled")})||le(P,function(e,t,n){var r;if(!n)return!0===e[t]?t.toLowerCase():(r=e.getAttributeNode(t))&&r.specified?r.value:null}),oe}(e);w.find=E,w.expr=E.selectors,w.expr[":"]=w.expr.pseudos,w.uniqueSort=w.unique=E.uniqueSort,w.text=E.getText,w.isXMLDoc=E.isXML,w.contains=E.contains,w.escapeSelector=E.escape;var k=function(e,t,n){var r=[],i=void 0!==n;while((e=e[t])&&9!==e.nodeType)if(1===e.nodeType){if(i&&w(e).is(n))break;r.push(e)}return r},S=function(e,t){for(var n=[];e;e=e.nextSibling)1===e.nodeType&&e!==t&&n.push(e);return n},D=w.expr.match.needsContext;function N(e,t){return e.nodeName&&e.nodeName.toLowerCase()===t.toLowerCase()}var A=/^<([a-z][^\/\0>:\x20\t\r\n\f]*)[\x20\t\r\n\f]*\/?>(?:<\/\1>|)$/i;function j(e,t,n){return g(t)?w.grep(e,function(e,r){return!!t.call(e,r,e)!==n}):t.nodeType?w.grep(e,function(e){return e===t!==n}):"string"!=typeof t?w.grep(e,function(e){return u.call(t,e)>-1!==n}):w.filter(t,e,n)}w.filter=function(e,t,n){var r=t[0];return n&&(e=":not("+e+")"),1===t.length&&1===r.nodeType?w.find.matchesSelector(r,e)?[r]:[]:w.find.matches(e,w.grep(t,function(e){return 1===e.nodeType}))},w.fn.extend({find:function(e){var t,n,r=this.length,i=this;if("string"!=typeof e)return this.pushStack(w(e).filter(function(){for(t=0;t1?w.uniqueSort(n):n},filter:function(e){return this.pushStack(j(this,e||[],!1))},not:function(e){return this.pushStack(j(this,e||[],!0))},is:function(e){return!!j(this,"string"==typeof e&&D.test(e)?w(e):e||[],!1).length}});var q,L=/^(?:\s*(<[\w\W]+>)[^>]*|#([\w-]+))$/;(w.fn.init=function(e,t,n){var i,o;if(!e)return this;if(n=n||q,"string"==typeof e){if(!(i="<"===e[0]&&">"===e[e.length-1]&&e.length>=3?[null,e,null]:L.exec(e))||!i[1]&&t)return!t||t.jquery?(t||n).find(e):this.constructor(t).find(e);if(i[1]){if(t=t instanceof w?t[0]:t,w.merge(this,w.parseHTML(i[1],t&&t.nodeType?t.ownerDocument||t:r,!0)),A.test(i[1])&&w.isPlainObject(t))for(i in t)g(this[i])?this[i](t[i]):this.attr(i,t[i]);return this}return(o=r.getElementById(i[2]))&&(this[0]=o,this.length=1),this}return e.nodeType?(this[0]=e,this.length=1,this):g(e)?void 0!==n.ready?n.ready(e):e(w):w.makeArray(e,this)}).prototype=w.fn,q=w(r);var H=/^(?:parents|prev(?:Until|All))/,O={children:!0,contents:!0,next:!0,prev:!0};w.fn.extend({has:function(e){var t=w(e,this),n=t.length;return this.filter(function(){for(var e=0;e-1:1===n.nodeType&&w.find.matchesSelector(n,e))){o.push(n);break}return this.pushStack(o.length>1?w.uniqueSort(o):o)},index:function(e){return e?"string"==typeof e?u.call(w(e),this[0]):u.call(this,e.jquery?e[0]:e):this[0]&&this[0].parentNode?this.first().prevAll().length:-1},add:function(e,t){return this.pushStack(w.uniqueSort(w.merge(this.get(),w(e,t))))},addBack:function(e){return this.add(null==e?this.prevObject:this.prevObject.filter(e))}});function P(e,t){while((e=e[t])&&1!==e.nodeType);return e}w.each({parent:function(e){var t=e.parentNode;return t&&11!==t.nodeType?t:null},parents:function(e){return k(e,"parentNode")},parentsUntil:function(e,t,n){return k(e,"parentNode",n)},next:function(e){return P(e,"nextSibling")},prev:function(e){return P(e,"previousSibling")},nextAll:function(e){return k(e,"nextSibling")},prevAll:function(e){return k(e,"previousSibling")},nextUntil:function(e,t,n){return k(e,"nextSibling",n)},prevUntil:function(e,t,n){return k(e,"previousSibling",n)},siblings:function(e){return S((e.parentNode||{}).firstChild,e)},children:function(e){return S(e.firstChild)},contents:function(e){return N(e,"iframe")?e.contentDocument:(N(e,"template")&&(e=e.content||e),w.merge([],e.childNodes))}},function(e,t){w.fn[e]=function(n,r){var i=w.map(this,t,n);return"Until"!==e.slice(-5)&&(r=n),r&&"string"==typeof r&&(i=w.filter(r,i)),this.length>1&&(O[e]||w.uniqueSort(i),H.test(e)&&i.reverse()),this.pushStack(i)}});var M=/[^\x20\t\r\n\f]+/g;function R(e){var t={};return w.each(e.match(M)||[],function(e,n){t[n]=!0}),t}w.Callbacks=function(e){e="string"==typeof e?R(e):w.extend({},e);var t,n,r,i,o=[],a=[],s=-1,u=function(){for(i=i||e.once,r=t=!0;a.length;s=-1){n=a.shift();while(++s-1)o.splice(n,1),n<=s&&s--}),this},has:function(e){return e?w.inArray(e,o)>-1:o.length>0},empty:function(){return o&&(o=[]),this},disable:function(){return i=a=[],o=n="",this},disabled:function(){return!o},lock:function(){return i=a=[],n||t||(o=n=""),this},locked:function(){return!!i},fireWith:function(e,n){return i||(n=[e,(n=n||[]).slice?n.slice():n],a.push(n),t||u()),this},fire:function(){return l.fireWith(this,arguments),this},fired:function(){return!!r}};return l};function I(e){return e}function W(e){throw e}function $(e,t,n,r){var i;try{e&&g(i=e.promise)?i.call(e).done(t).fail(n):e&&g(i=e.then)?i.call(e,t,n):t.apply(void 0,[e].slice(r))}catch(e){n.apply(void 0,[e])}}w.extend({Deferred:function(t){var n=[["notify","progress",w.Callbacks("memory"),w.Callbacks("memory"),2],["resolve","done",w.Callbacks("once memory"),w.Callbacks("once memory"),0,"resolved"],["reject","fail",w.Callbacks("once memory"),w.Callbacks("once memory"),1,"rejected"]],r="pending",i={state:function(){return r},always:function(){return o.done(arguments).fail(arguments),this},"catch":function(e){return i.then(null,e)},pipe:function(){var e=arguments;return w.Deferred(function(t){w.each(n,function(n,r){var i=g(e[r[4]])&&e[r[4]];o[r[1]](function(){var e=i&&i.apply(this,arguments);e&&g(e.promise)?e.promise().progress(t.notify).done(t.resolve).fail(t.reject):t[r[0]+"With"](this,i?[e]:arguments)})}),e=null}).promise()},then:function(t,r,i){var o=0;function a(t,n,r,i){return function(){var s=this,u=arguments,l=function(){var e,l;if(!(t=o&&(r!==W&&(s=void 0,u=[e]),n.rejectWith(s,u))}};t?c():(w.Deferred.getStackHook&&(c.stackTrace=w.Deferred.getStackHook()),e.setTimeout(c))}}return w.Deferred(function(e){n[0][3].add(a(0,e,g(i)?i:I,e.notifyWith)),n[1][3].add(a(0,e,g(t)?t:I)),n[2][3].add(a(0,e,g(r)?r:W))}).promise()},promise:function(e){return null!=e?w.extend(e,i):i}},o={};return w.each(n,function(e,t){var a=t[2],s=t[5];i[t[1]]=a.add,s&&a.add(function(){r=s},n[3-e][2].disable,n[3-e][3].disable,n[0][2].lock,n[0][3].lock),a.add(t[3].fire),o[t[0]]=function(){return o[t[0]+"With"](this===o?void 0:this,arguments),this},o[t[0]+"With"]=a.fireWith}),i.promise(o),t&&t.call(o,o),o},when:function(e){var t=arguments.length,n=t,r=Array(n),i=o.call(arguments),a=w.Deferred(),s=function(e){return function(n){r[e]=this,i[e]=arguments.length>1?o.call(arguments):n,--t||a.resolveWith(r,i)}};if(t<=1&&($(e,a.done(s(n)).resolve,a.reject,!t),"pending"===a.state()||g(i[n]&&i[n].then)))return a.then();while(n--)$(i[n],s(n),a.reject);return a.promise()}});var B=/^(Eval|Internal|Range|Reference|Syntax|Type|URI)Error$/;w.Deferred.exceptionHook=function(t,n){e.console&&e.console.warn&&t&&B.test(t.name)&&e.console.warn("jQuery.Deferred exception: "+t.message,t.stack,n)},w.readyException=function(t){e.setTimeout(function(){throw t})};var F=w.Deferred();w.fn.ready=function(e){return F.then(e)["catch"](function(e){w.readyException(e)}),this},w.extend({isReady:!1,readyWait:1,ready:function(e){(!0===e?--w.readyWait:w.isReady)||(w.isReady=!0,!0!==e&&--w.readyWait>0||F.resolveWith(r,[w]))}}),w.ready.then=F.then;function _(){r.removeEventListener("DOMContentLoaded",_),e.removeEventListener("load",_),w.ready()}"complete"===r.readyState||"loading"!==r.readyState&&!r.documentElement.doScroll?e.setTimeout(w.ready):(r.addEventListener("DOMContentLoaded",_),e.addEventListener("load",_));var z=function(e,t,n,r,i,o,a){var s=0,u=e.length,l=null==n;if("object"===x(n)){i=!0;for(s in n)z(e,t,s,n[s],!0,o,a)}else if(void 0!==r&&(i=!0,g(r)||(a=!0),l&&(a?(t.call(e,r),t=null):(l=t,t=function(e,t,n){return l.call(w(e),n)})),t))for(;s1,null,!0)},removeData:function(e){return this.each(function(){K.remove(this,e)})}}),w.extend({queue:function(e,t,n){var r;if(e)return t=(t||"fx")+"queue",r=J.get(e,t),n&&(!r||Array.isArray(n)?r=J.access(e,t,w.makeArray(n)):r.push(n)),r||[]},dequeue:function(e,t){t=t||"fx";var n=w.queue(e,t),r=n.length,i=n.shift(),o=w._queueHooks(e,t),a=function(){w.dequeue(e,t)};"inprogress"===i&&(i=n.shift(),r--),i&&("fx"===t&&n.unshift("inprogress"),delete o.stop,i.call(e,a,o)),!r&&o&&o.empty.fire()},_queueHooks:function(e,t){var n=t+"queueHooks";return J.get(e,n)||J.access(e,n,{empty:w.Callbacks("once memory").add(function(){J.remove(e,[t+"queue",n])})})}}),w.fn.extend({queue:function(e,t){var n=2;return"string"!=typeof e&&(t=e,e="fx",n--),arguments.length\x20\t\r\n\f]+)/i,he=/^$|^module$|\/(?:java|ecma)script/i,ge={option:[1,""],thead:[1,"","
"],col:[2,"","
"],tr:[2,"","
"],td:[3,"","
"],_default:[0,"",""]};ge.optgroup=ge.option,ge.tbody=ge.tfoot=ge.colgroup=ge.caption=ge.thead,ge.th=ge.td;function ye(e,t){var n;return n="undefined"!=typeof e.getElementsByTagName?e.getElementsByTagName(t||"*"):"undefined"!=typeof e.querySelectorAll?e.querySelectorAll(t||"*"):[],void 0===t||t&&N(e,t)?w.merge([e],n):n}function ve(e,t){for(var n=0,r=e.length;n-1)i&&i.push(o);else if(l=w.contains(o.ownerDocument,o),a=ye(f.appendChild(o),"script"),l&&ve(a),n){c=0;while(o=a[c++])he.test(o.type||"")&&n.push(o)}return f}!function(){var e=r.createDocumentFragment().appendChild(r.createElement("div")),t=r.createElement("input");t.setAttribute("type","radio"),t.setAttribute("checked","checked"),t.setAttribute("name","t"),e.appendChild(t),h.checkClone=e.cloneNode(!0).cloneNode(!0).lastChild.checked,e.innerHTML="",h.noCloneChecked=!!e.cloneNode(!0).lastChild.defaultValue}();var be=r.documentElement,we=/^key/,Te=/^(?:mouse|pointer|contextmenu|drag|drop)|click/,Ce=/^([^.]*)(?:\.(.+)|)/;function Ee(){return!0}function ke(){return!1}function Se(){try{return r.activeElement}catch(e){}}function De(e,t,n,r,i,o){var a,s;if("object"==typeof t){"string"!=typeof n&&(r=r||n,n=void 0);for(s in t)De(e,s,n,r,t[s],o);return e}if(null==r&&null==i?(i=n,r=n=void 0):null==i&&("string"==typeof n?(i=r,r=void 0):(i=r,r=n,n=void 0)),!1===i)i=ke;else if(!i)return e;return 1===o&&(a=i,(i=function(e){return w().off(e),a.apply(this,arguments)}).guid=a.guid||(a.guid=w.guid++)),e.each(function(){w.event.add(this,t,i,r,n)})}w.event={global:{},add:function(e,t,n,r,i){var o,a,s,u,l,c,f,p,d,h,g,y=J.get(e);if(y){n.handler&&(n=(o=n).handler,i=o.selector),i&&w.find.matchesSelector(be,i),n.guid||(n.guid=w.guid++),(u=y.events)||(u=y.events={}),(a=y.handle)||(a=y.handle=function(t){return"undefined"!=typeof w&&w.event.triggered!==t.type?w.event.dispatch.apply(e,arguments):void 0}),l=(t=(t||"").match(M)||[""]).length;while(l--)d=g=(s=Ce.exec(t[l])||[])[1],h=(s[2]||"").split(".").sort(),d&&(f=w.event.special[d]||{},d=(i?f.delegateType:f.bindType)||d,f=w.event.special[d]||{},c=w.extend({type:d,origType:g,data:r,handler:n,guid:n.guid,selector:i,needsContext:i&&w.expr.match.needsContext.test(i),namespace:h.join(".")},o),(p=u[d])||((p=u[d]=[]).delegateCount=0,f.setup&&!1!==f.setup.call(e,r,h,a)||e.addEventListener&&e.addEventListener(d,a)),f.add&&(f.add.call(e,c),c.handler.guid||(c.handler.guid=n.guid)),i?p.splice(p.delegateCount++,0,c):p.push(c),w.event.global[d]=!0)}},remove:function(e,t,n,r,i){var o,a,s,u,l,c,f,p,d,h,g,y=J.hasData(e)&&J.get(e);if(y&&(u=y.events)){l=(t=(t||"").match(M)||[""]).length;while(l--)if(s=Ce.exec(t[l])||[],d=g=s[1],h=(s[2]||"").split(".").sort(),d){f=w.event.special[d]||{},p=u[d=(r?f.delegateType:f.bindType)||d]||[],s=s[2]&&new RegExp("(^|\\.)"+h.join("\\.(?:.*\\.|)")+"(\\.|$)"),a=o=p.length;while(o--)c=p[o],!i&&g!==c.origType||n&&n.guid!==c.guid||s&&!s.test(c.namespace)||r&&r!==c.selector&&("**"!==r||!c.selector)||(p.splice(o,1),c.selector&&p.delegateCount--,f.remove&&f.remove.call(e,c));a&&!p.length&&(f.teardown&&!1!==f.teardown.call(e,h,y.handle)||w.removeEvent(e,d,y.handle),delete u[d])}else for(d in u)w.event.remove(e,d+t[l],n,r,!0);w.isEmptyObject(u)&&J.remove(e,"handle events")}},dispatch:function(e){var t=w.event.fix(e),n,r,i,o,a,s,u=new Array(arguments.length),l=(J.get(this,"events")||{})[t.type]||[],c=w.event.special[t.type]||{};for(u[0]=t,n=1;n=1))for(;l!==this;l=l.parentNode||this)if(1===l.nodeType&&("click"!==e.type||!0!==l.disabled)){for(o=[],a={},n=0;n-1:w.find(i,this,null,[l]).length),a[i]&&o.push(r);o.length&&s.push({elem:l,handlers:o})}return l=this,u\x20\t\r\n\f]*)[^>]*)\/>/gi,Ae=/\s*$/g;function Le(e,t){return N(e,"table")&&N(11!==t.nodeType?t:t.firstChild,"tr")?w(e).children("tbody")[0]||e:e}function He(e){return e.type=(null!==e.getAttribute("type"))+"/"+e.type,e}function Oe(e){return"true/"===(e.type||"").slice(0,5)?e.type=e.type.slice(5):e.removeAttribute("type"),e}function Pe(e,t){var n,r,i,o,a,s,u,l;if(1===t.nodeType){if(J.hasData(e)&&(o=J.access(e),a=J.set(t,o),l=o.events)){delete a.handle,a.events={};for(i in l)for(n=0,r=l[i].length;n1&&"string"==typeof y&&!h.checkClone&&je.test(y))return e.each(function(i){var o=e.eq(i);v&&(t[0]=y.call(this,i,o.html())),Re(o,t,n,r)});if(p&&(i=xe(t,e[0].ownerDocument,!1,e,r),o=i.firstChild,1===i.childNodes.length&&(i=o),o||r)){for(u=(s=w.map(ye(i,"script"),He)).length;f")},clone:function(e,t,n){var r,i,o,a,s=e.cloneNode(!0),u=w.contains(e.ownerDocument,e);if(!(h.noCloneChecked||1!==e.nodeType&&11!==e.nodeType||w.isXMLDoc(e)))for(a=ye(s),r=0,i=(o=ye(e)).length;r0&&ve(a,!u&&ye(e,"script")),s},cleanData:function(e){for(var t,n,r,i=w.event.special,o=0;void 0!==(n=e[o]);o++)if(Y(n)){if(t=n[J.expando]){if(t.events)for(r in t.events)i[r]?w.event.remove(n,r):w.removeEvent(n,r,t.handle);n[J.expando]=void 0}n[K.expando]&&(n[K.expando]=void 0)}}}),w.fn.extend({detach:function(e){return Ie(this,e,!0)},remove:function(e){return Ie(this,e)},text:function(e){return z(this,function(e){return void 0===e?w.text(this):this.empty().each(function(){1!==this.nodeType&&11!==this.nodeType&&9!==this.nodeType||(this.textContent=e)})},null,e,arguments.length)},append:function(){return Re(this,arguments,function(e){1!==this.nodeType&&11!==this.nodeType&&9!==this.nodeType||Le(this,e).appendChild(e)})},prepend:function(){return Re(this,arguments,function(e){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var t=Le(this,e);t.insertBefore(e,t.firstChild)}})},before:function(){return Re(this,arguments,function(e){this.parentNode&&this.parentNode.insertBefore(e,this)})},after:function(){return Re(this,arguments,function(e){this.parentNode&&this.parentNode.insertBefore(e,this.nextSibling)})},empty:function(){for(var e,t=0;null!=(e=this[t]);t++)1===e.nodeType&&(w.cleanData(ye(e,!1)),e.textContent="");return this},clone:function(e,t){return e=null!=e&&e,t=null==t?e:t,this.map(function(){return w.clone(this,e,t)})},html:function(e){return z(this,function(e){var t=this[0]||{},n=0,r=this.length;if(void 0===e&&1===t.nodeType)return t.innerHTML;if("string"==typeof e&&!Ae.test(e)&&!ge[(de.exec(e)||["",""])[1].toLowerCase()]){e=w.htmlPrefilter(e);try{for(;n=0&&(u+=Math.max(0,Math.ceil(e["offset"+t[0].toUpperCase()+t.slice(1)]-o-u-s-.5))),u}function et(e,t,n){var r=$e(e),i=Fe(e,t,r),o="border-box"===w.css(e,"boxSizing",!1,r),a=o;if(We.test(i)){if(!n)return i;i="auto"}return a=a&&(h.boxSizingReliable()||i===e.style[t]),("auto"===i||!parseFloat(i)&&"inline"===w.css(e,"display",!1,r))&&(i=e["offset"+t[0].toUpperCase()+t.slice(1)],a=!0),(i=parseFloat(i)||0)+Ze(e,t,n||(o?"border":"content"),a,r,i)+"px"}w.extend({cssHooks:{opacity:{get:function(e,t){if(t){var n=Fe(e,"opacity");return""===n?"1":n}}}},cssNumber:{animationIterationCount:!0,columnCount:!0,fillOpacity:!0,flexGrow:!0,flexShrink:!0,fontWeight:!0,lineHeight:!0,opacity:!0,order:!0,orphans:!0,widows:!0,zIndex:!0,zoom:!0},cssProps:{},style:function(e,t,n,r){if(e&&3!==e.nodeType&&8!==e.nodeType&&e.style){var i,o,a,s=G(t),u=Xe.test(t),l=e.style;if(u||(t=Je(s)),a=w.cssHooks[t]||w.cssHooks[s],void 0===n)return a&&"get"in a&&void 0!==(i=a.get(e,!1,r))?i:l[t];"string"==(o=typeof n)&&(i=ie.exec(n))&&i[1]&&(n=ue(e,t,i),o="number"),null!=n&&n===n&&("number"===o&&(n+=i&&i[3]||(w.cssNumber[s]?"":"px")),h.clearCloneStyle||""!==n||0!==t.indexOf("background")||(l[t]="inherit"),a&&"set"in a&&void 0===(n=a.set(e,n,r))||(u?l.setProperty(t,n):l[t]=n))}},css:function(e,t,n,r){var i,o,a,s=G(t);return Xe.test(t)||(t=Je(s)),(a=w.cssHooks[t]||w.cssHooks[s])&&"get"in a&&(i=a.get(e,!0,n)),void 0===i&&(i=Fe(e,t,r)),"normal"===i&&t in Ve&&(i=Ve[t]),""===n||n?(o=parseFloat(i),!0===n||isFinite(o)?o||0:i):i}}),w.each(["height","width"],function(e,t){w.cssHooks[t]={get:function(e,n,r){if(n)return!ze.test(w.css(e,"display"))||e.getClientRects().length&&e.getBoundingClientRect().width?et(e,t,r):se(e,Ue,function(){return et(e,t,r)})},set:function(e,n,r){var i,o=$e(e),a="border-box"===w.css(e,"boxSizing",!1,o),s=r&&Ze(e,t,r,a,o);return a&&h.scrollboxSize()===o.position&&(s-=Math.ceil(e["offset"+t[0].toUpperCase()+t.slice(1)]-parseFloat(o[t])-Ze(e,t,"border",!1,o)-.5)),s&&(i=ie.exec(n))&&"px"!==(i[3]||"px")&&(e.style[t]=n,n=w.css(e,t)),Ke(e,n,s)}}}),w.cssHooks.marginLeft=_e(h.reliableMarginLeft,function(e,t){if(t)return(parseFloat(Fe(e,"marginLeft"))||e.getBoundingClientRect().left-se(e,{marginLeft:0},function(){return e.getBoundingClientRect().left}))+"px"}),w.each({margin:"",padding:"",border:"Width"},function(e,t){w.cssHooks[e+t]={expand:function(n){for(var r=0,i={},o="string"==typeof n?n.split(" "):[n];r<4;r++)i[e+oe[r]+t]=o[r]||o[r-2]||o[0];return i}},"margin"!==e&&(w.cssHooks[e+t].set=Ke)}),w.fn.extend({css:function(e,t){return z(this,function(e,t,n){var r,i,o={},a=0;if(Array.isArray(t)){for(r=$e(e),i=t.length;a1)}});function tt(e,t,n,r,i){return new tt.prototype.init(e,t,n,r,i)}w.Tween=tt,tt.prototype={constructor:tt,init:function(e,t,n,r,i,o){this.elem=e,this.prop=n,this.easing=i||w.easing._default,this.options=t,this.start=this.now=this.cur(),this.end=r,this.unit=o||(w.cssNumber[n]?"":"px")},cur:function(){var e=tt.propHooks[this.prop];return e&&e.get?e.get(this):tt.propHooks._default.get(this)},run:function(e){var t,n=tt.propHooks[this.prop];return this.options.duration?this.pos=t=w.easing[this.easing](e,this.options.duration*e,0,1,this.options.duration):this.pos=t=e,this.now=(this.end-this.start)*t+this.start,this.options.step&&this.options.step.call(this.elem,this.now,this),n&&n.set?n.set(this):tt.propHooks._default.set(this),this}},tt.prototype.init.prototype=tt.prototype,tt.propHooks={_default:{get:function(e){var t;return 1!==e.elem.nodeType||null!=e.elem[e.prop]&&null==e.elem.style[e.prop]?e.elem[e.prop]:(t=w.css(e.elem,e.prop,""))&&"auto"!==t?t:0},set:function(e){w.fx.step[e.prop]?w.fx.step[e.prop](e):1!==e.elem.nodeType||null==e.elem.style[w.cssProps[e.prop]]&&!w.cssHooks[e.prop]?e.elem[e.prop]=e.now:w.style(e.elem,e.prop,e.now+e.unit)}}},tt.propHooks.scrollTop=tt.propHooks.scrollLeft={set:function(e){e.elem.nodeType&&e.elem.parentNode&&(e.elem[e.prop]=e.now)}},w.easing={linear:function(e){return e},swing:function(e){return.5-Math.cos(e*Math.PI)/2},_default:"swing"},w.fx=tt.prototype.init,w.fx.step={};var nt,rt,it=/^(?:toggle|show|hide)$/,ot=/queueHooks$/;function at(){rt&&(!1===r.hidden&&e.requestAnimationFrame?e.requestAnimationFrame(at):e.setTimeout(at,w.fx.interval),w.fx.tick())}function st(){return e.setTimeout(function(){nt=void 0}),nt=Date.now()}function ut(e,t){var n,r=0,i={height:e};for(t=t?1:0;r<4;r+=2-t)i["margin"+(n=oe[r])]=i["padding"+n]=e;return t&&(i.opacity=i.width=e),i}function lt(e,t,n){for(var r,i=(pt.tweeners[t]||[]).concat(pt.tweeners["*"]),o=0,a=i.length;o1)},removeAttr:function(e){return this.each(function(){w.removeAttr(this,e)})}}),w.extend({attr:function(e,t,n){var r,i,o=e.nodeType;if(3!==o&&8!==o&&2!==o)return"undefined"==typeof e.getAttribute?w.prop(e,t,n):(1===o&&w.isXMLDoc(e)||(i=w.attrHooks[t.toLowerCase()]||(w.expr.match.bool.test(t)?dt:void 0)),void 0!==n?null===n?void w.removeAttr(e,t):i&&"set"in i&&void 0!==(r=i.set(e,n,t))?r:(e.setAttribute(t,n+""),n):i&&"get"in i&&null!==(r=i.get(e,t))?r:null==(r=w.find.attr(e,t))?void 0:r)},attrHooks:{type:{set:function(e,t){if(!h.radioValue&&"radio"===t&&N(e,"input")){var n=e.value;return e.setAttribute("type",t),n&&(e.value=n),t}}}},removeAttr:function(e,t){var n,r=0,i=t&&t.match(M);if(i&&1===e.nodeType)while(n=i[r++])e.removeAttribute(n)}}),dt={set:function(e,t,n){return!1===t?w.removeAttr(e,n):e.setAttribute(n,n),n}},w.each(w.expr.match.bool.source.match(/\w+/g),function(e,t){var n=ht[t]||w.find.attr;ht[t]=function(e,t,r){var i,o,a=t.toLowerCase();return r||(o=ht[a],ht[a]=i,i=null!=n(e,t,r)?a:null,ht[a]=o),i}});var gt=/^(?:input|select|textarea|button)$/i,yt=/^(?:a|area)$/i;w.fn.extend({prop:function(e,t){return z(this,w.prop,e,t,arguments.length>1)},removeProp:function(e){return this.each(function(){delete this[w.propFix[e]||e]})}}),w.extend({prop:function(e,t,n){var r,i,o=e.nodeType;if(3!==o&&8!==o&&2!==o)return 1===o&&w.isXMLDoc(e)||(t=w.propFix[t]||t,i=w.propHooks[t]),void 0!==n?i&&"set"in i&&void 0!==(r=i.set(e,n,t))?r:e[t]=n:i&&"get"in i&&null!==(r=i.get(e,t))?r:e[t]},propHooks:{tabIndex:{get:function(e){var t=w.find.attr(e,"tabindex");return t?parseInt(t,10):gt.test(e.nodeName)||yt.test(e.nodeName)&&e.href?0:-1}}},propFix:{"for":"htmlFor","class":"className"}}),h.optSelected||(w.propHooks.selected={get:function(e){var t=e.parentNode;return t&&t.parentNode&&t.parentNode.selectedIndex,null},set:function(e){var t=e.parentNode;t&&(t.selectedIndex,t.parentNode&&t.parentNode.selectedIndex)}}),w.each(["tabIndex","readOnly","maxLength","cellSpacing","cellPadding","rowSpan","colSpan","useMap","frameBorder","contentEditable"],function(){w.propFix[this.toLowerCase()]=this});function vt(e){return(e.match(M)||[]).join(" ")}function mt(e){return e.getAttribute&&e.getAttribute("class")||""}function xt(e){return Array.isArray(e)?e:"string"==typeof e?e.match(M)||[]:[]}w.fn.extend({addClass:function(e){var t,n,r,i,o,a,s,u=0;if(g(e))return this.each(function(t){w(this).addClass(e.call(this,t,mt(this)))});if((t=xt(e)).length)while(n=this[u++])if(i=mt(n),r=1===n.nodeType&&" "+vt(i)+" "){a=0;while(o=t[a++])r.indexOf(" "+o+" ")<0&&(r+=o+" ");i!==(s=vt(r))&&n.setAttribute("class",s)}return this},removeClass:function(e){var t,n,r,i,o,a,s,u=0;if(g(e))return this.each(function(t){w(this).removeClass(e.call(this,t,mt(this)))});if(!arguments.length)return this.attr("class","");if((t=xt(e)).length)while(n=this[u++])if(i=mt(n),r=1===n.nodeType&&" "+vt(i)+" "){a=0;while(o=t[a++])while(r.indexOf(" "+o+" ")>-1)r=r.replace(" "+o+" "," ");i!==(s=vt(r))&&n.setAttribute("class",s)}return this},toggleClass:function(e,t){var n=typeof e,r="string"===n||Array.isArray(e);return"boolean"==typeof t&&r?t?this.addClass(e):this.removeClass(e):g(e)?this.each(function(n){w(this).toggleClass(e.call(this,n,mt(this),t),t)}):this.each(function(){var t,i,o,a;if(r){i=0,o=w(this),a=xt(e);while(t=a[i++])o.hasClass(t)?o.removeClass(t):o.addClass(t)}else void 0!==e&&"boolean"!==n||((t=mt(this))&&J.set(this,"__className__",t),this.setAttribute&&this.setAttribute("class",t||!1===e?"":J.get(this,"__className__")||""))})},hasClass:function(e){var t,n,r=0;t=" "+e+" ";while(n=this[r++])if(1===n.nodeType&&(" "+vt(mt(n))+" ").indexOf(t)>-1)return!0;return!1}});var bt=/\r/g;w.fn.extend({val:function(e){var t,n,r,i=this[0];{if(arguments.length)return r=g(e),this.each(function(n){var i;1===this.nodeType&&(null==(i=r?e.call(this,n,w(this).val()):e)?i="":"number"==typeof i?i+="":Array.isArray(i)&&(i=w.map(i,function(e){return null==e?"":e+""})),(t=w.valHooks[this.type]||w.valHooks[this.nodeName.toLowerCase()])&&"set"in t&&void 0!==t.set(this,i,"value")||(this.value=i))});if(i)return(t=w.valHooks[i.type]||w.valHooks[i.nodeName.toLowerCase()])&&"get"in t&&void 0!==(n=t.get(i,"value"))?n:"string"==typeof(n=i.value)?n.replace(bt,""):null==n?"":n}}}),w.extend({valHooks:{option:{get:function(e){var t=w.find.attr(e,"value");return null!=t?t:vt(w.text(e))}},select:{get:function(e){var t,n,r,i=e.options,o=e.selectedIndex,a="select-one"===e.type,s=a?null:[],u=a?o+1:i.length;for(r=o<0?u:a?o:0;r-1)&&(n=!0);return n||(e.selectedIndex=-1),o}}}}),w.each(["radio","checkbox"],function(){w.valHooks[this]={set:function(e,t){if(Array.isArray(t))return e.checked=w.inArray(w(e).val(),t)>-1}},h.checkOn||(w.valHooks[this].get=function(e){return null===e.getAttribute("value")?"on":e.value})}),h.focusin="onfocusin"in e;var wt=/^(?:focusinfocus|focusoutblur)$/,Tt=function(e){e.stopPropagation()};w.extend(w.event,{trigger:function(t,n,i,o){var a,s,u,l,c,p,d,h,v=[i||r],m=f.call(t,"type")?t.type:t,x=f.call(t,"namespace")?t.namespace.split("."):[];if(s=h=u=i=i||r,3!==i.nodeType&&8!==i.nodeType&&!wt.test(m+w.event.triggered)&&(m.indexOf(".")>-1&&(m=(x=m.split(".")).shift(),x.sort()),c=m.indexOf(":")<0&&"on"+m,t=t[w.expando]?t:new w.Event(m,"object"==typeof t&&t),t.isTrigger=o?2:3,t.namespace=x.join("."),t.rnamespace=t.namespace?new RegExp("(^|\\.)"+x.join("\\.(?:.*\\.|)")+"(\\.|$)"):null,t.result=void 0,t.target||(t.target=i),n=null==n?[t]:w.makeArray(n,[t]),d=w.event.special[m]||{},o||!d.trigger||!1!==d.trigger.apply(i,n))){if(!o&&!d.noBubble&&!y(i)){for(l=d.delegateType||m,wt.test(l+m)||(s=s.parentNode);s;s=s.parentNode)v.push(s),u=s;u===(i.ownerDocument||r)&&v.push(u.defaultView||u.parentWindow||e)}a=0;while((s=v[a++])&&!t.isPropagationStopped())h=s,t.type=a>1?l:d.bindType||m,(p=(J.get(s,"events")||{})[t.type]&&J.get(s,"handle"))&&p.apply(s,n),(p=c&&s[c])&&p.apply&&Y(s)&&(t.result=p.apply(s,n),!1===t.result&&t.preventDefault());return t.type=m,o||t.isDefaultPrevented()||d._default&&!1!==d._default.apply(v.pop(),n)||!Y(i)||c&&g(i[m])&&!y(i)&&((u=i[c])&&(i[c]=null),w.event.triggered=m,t.isPropagationStopped()&&h.addEventListener(m,Tt),i[m](),t.isPropagationStopped()&&h.removeEventListener(m,Tt),w.event.triggered=void 0,u&&(i[c]=u)),t.result}},simulate:function(e,t,n){var r=w.extend(new w.Event,n,{type:e,isSimulated:!0});w.event.trigger(r,null,t)}}),w.fn.extend({trigger:function(e,t){return this.each(function(){w.event.trigger(e,t,this)})},triggerHandler:function(e,t){var n=this[0];if(n)return w.event.trigger(e,t,n,!0)}}),h.focusin||w.each({focus:"focusin",blur:"focusout"},function(e,t){var n=function(e){w.event.simulate(t,e.target,w.event.fix(e))};w.event.special[t]={setup:function(){var r=this.ownerDocument||this,i=J.access(r,t);i||r.addEventListener(e,n,!0),J.access(r,t,(i||0)+1)},teardown:function(){var r=this.ownerDocument||this,i=J.access(r,t)-1;i?J.access(r,t,i):(r.removeEventListener(e,n,!0),J.remove(r,t))}}});var Ct=e.location,Et=Date.now(),kt=/\?/;w.parseXML=function(t){var n;if(!t||"string"!=typeof t)return null;try{n=(new e.DOMParser).parseFromString(t,"text/xml")}catch(e){n=void 0}return n&&!n.getElementsByTagName("parsererror").length||w.error("Invalid XML: "+t),n};var St=/\[\]$/,Dt=/\r?\n/g,Nt=/^(?:submit|button|image|reset|file)$/i,At=/^(?:input|select|textarea|keygen)/i;function jt(e,t,n,r){var i;if(Array.isArray(t))w.each(t,function(t,i){n||St.test(e)?r(e,i):jt(e+"["+("object"==typeof i&&null!=i?t:"")+"]",i,n,r)});else if(n||"object"!==x(t))r(e,t);else for(i in t)jt(e+"["+i+"]",t[i],n,r)}w.param=function(e,t){var n,r=[],i=function(e,t){var n=g(t)?t():t;r[r.length]=encodeURIComponent(e)+"="+encodeURIComponent(null==n?"":n)};if(Array.isArray(e)||e.jquery&&!w.isPlainObject(e))w.each(e,function(){i(this.name,this.value)});else for(n in e)jt(n,e[n],t,i);return r.join("&")},w.fn.extend({serialize:function(){return w.param(this.serializeArray())},serializeArray:function(){return this.map(function(){var e=w.prop(this,"elements");return e?w.makeArray(e):this}).filter(function(){var e=this.type;return this.name&&!w(this).is(":disabled")&&At.test(this.nodeName)&&!Nt.test(e)&&(this.checked||!pe.test(e))}).map(function(e,t){var n=w(this).val();return null==n?null:Array.isArray(n)?w.map(n,function(e){return{name:t.name,value:e.replace(Dt,"\r\n")}}):{name:t.name,value:n.replace(Dt,"\r\n")}}).get()}});var qt=/%20/g,Lt=/#.*$/,Ht=/([?&])_=[^&]*/,Ot=/^(.*?):[ \t]*([^\r\n]*)$/gm,Pt=/^(?:about|app|app-storage|.+-extension|file|res|widget):$/,Mt=/^(?:GET|HEAD)$/,Rt=/^\/\//,It={},Wt={},$t="*/".concat("*"),Bt=r.createElement("a");Bt.href=Ct.href;function Ft(e){return function(t,n){"string"!=typeof t&&(n=t,t="*");var r,i=0,o=t.toLowerCase().match(M)||[];if(g(n))while(r=o[i++])"+"===r[0]?(r=r.slice(1)||"*",(e[r]=e[r]||[]).unshift(n)):(e[r]=e[r]||[]).push(n)}}function _t(e,t,n,r){var i={},o=e===Wt;function a(s){var u;return i[s]=!0,w.each(e[s]||[],function(e,s){var l=s(t,n,r);return"string"!=typeof l||o||i[l]?o?!(u=l):void 0:(t.dataTypes.unshift(l),a(l),!1)}),u}return a(t.dataTypes[0])||!i["*"]&&a("*")}function zt(e,t){var n,r,i=w.ajaxSettings.flatOptions||{};for(n in t)void 0!==t[n]&&((i[n]?e:r||(r={}))[n]=t[n]);return r&&w.extend(!0,e,r),e}function Xt(e,t,n){var r,i,o,a,s=e.contents,u=e.dataTypes;while("*"===u[0])u.shift(),void 0===r&&(r=e.mimeType||t.getResponseHeader("Content-Type"));if(r)for(i in s)if(s[i]&&s[i].test(r)){u.unshift(i);break}if(u[0]in n)o=u[0];else{for(i in n){if(!u[0]||e.converters[i+" "+u[0]]){o=i;break}a||(a=i)}o=o||a}if(o)return o!==u[0]&&u.unshift(o),n[o]}function Ut(e,t,n,r){var i,o,a,s,u,l={},c=e.dataTypes.slice();if(c[1])for(a in e.converters)l[a.toLowerCase()]=e.converters[a];o=c.shift();while(o)if(e.responseFields[o]&&(n[e.responseFields[o]]=t),!u&&r&&e.dataFilter&&(t=e.dataFilter(t,e.dataType)),u=o,o=c.shift())if("*"===o)o=u;else if("*"!==u&&u!==o){if(!(a=l[u+" "+o]||l["* "+o]))for(i in l)if((s=i.split(" "))[1]===o&&(a=l[u+" "+s[0]]||l["* "+s[0]])){!0===a?a=l[i]:!0!==l[i]&&(o=s[0],c.unshift(s[1]));break}if(!0!==a)if(a&&e["throws"])t=a(t);else try{t=a(t)}catch(e){return{state:"parsererror",error:a?e:"No conversion from "+u+" to "+o}}}return{state:"success",data:t}}w.extend({active:0,lastModified:{},etag:{},ajaxSettings:{url:Ct.href,type:"GET",isLocal:Pt.test(Ct.protocol),global:!0,processData:!0,async:!0,contentType:"application/x-www-form-urlencoded; charset=UTF-8",accepts:{"*":$t,text:"text/plain",html:"text/html",xml:"application/xml, text/xml",json:"application/json, text/javascript"},contents:{xml:/\bxml\b/,html:/\bhtml/,json:/\bjson\b/},responseFields:{xml:"responseXML",text:"responseText",json:"responseJSON"},converters:{"* text":String,"text html":!0,"text json":JSON.parse,"text xml":w.parseXML},flatOptions:{url:!0,context:!0}},ajaxSetup:function(e,t){return t?zt(zt(e,w.ajaxSettings),t):zt(w.ajaxSettings,e)},ajaxPrefilter:Ft(It),ajaxTransport:Ft(Wt),ajax:function(t,n){"object"==typeof t&&(n=t,t=void 0),n=n||{};var i,o,a,s,u,l,c,f,p,d,h=w.ajaxSetup({},n),g=h.context||h,y=h.context&&(g.nodeType||g.jquery)?w(g):w.event,v=w.Deferred(),m=w.Callbacks("once memory"),x=h.statusCode||{},b={},T={},C="canceled",E={readyState:0,getResponseHeader:function(e){var t;if(c){if(!s){s={};while(t=Ot.exec(a))s[t[1].toLowerCase()]=t[2]}t=s[e.toLowerCase()]}return null==t?null:t},getAllResponseHeaders:function(){return c?a:null},setRequestHeader:function(e,t){return null==c&&(e=T[e.toLowerCase()]=T[e.toLowerCase()]||e,b[e]=t),this},overrideMimeType:function(e){return null==c&&(h.mimeType=e),this},statusCode:function(e){var t;if(e)if(c)E.always(e[E.status]);else for(t in e)x[t]=[x[t],e[t]];return this},abort:function(e){var t=e||C;return i&&i.abort(t),k(0,t),this}};if(v.promise(E),h.url=((t||h.url||Ct.href)+"").replace(Rt,Ct.protocol+"//"),h.type=n.method||n.type||h.method||h.type,h.dataTypes=(h.dataType||"*").toLowerCase().match(M)||[""],null==h.crossDomain){l=r.createElement("a");try{l.href=h.url,l.href=l.href,h.crossDomain=Bt.protocol+"//"+Bt.host!=l.protocol+"//"+l.host}catch(e){h.crossDomain=!0}}if(h.data&&h.processData&&"string"!=typeof h.data&&(h.data=w.param(h.data,h.traditional)),_t(It,h,n,E),c)return E;(f=w.event&&h.global)&&0==w.active++&&w.event.trigger("ajaxStart"),h.type=h.type.toUpperCase(),h.hasContent=!Mt.test(h.type),o=h.url.replace(Lt,""),h.hasContent?h.data&&h.processData&&0===(h.contentType||"").indexOf("application/x-www-form-urlencoded")&&(h.data=h.data.replace(qt,"+")):(d=h.url.slice(o.length),h.data&&(h.processData||"string"==typeof h.data)&&(o+=(kt.test(o)?"&":"?")+h.data,delete h.data),!1===h.cache&&(o=o.replace(Ht,"$1"),d=(kt.test(o)?"&":"?")+"_="+Et+++d),h.url=o+d),h.ifModified&&(w.lastModified[o]&&E.setRequestHeader("If-Modified-Since",w.lastModified[o]),w.etag[o]&&E.setRequestHeader("If-None-Match",w.etag[o])),(h.data&&h.hasContent&&!1!==h.contentType||n.contentType)&&E.setRequestHeader("Content-Type",h.contentType),E.setRequestHeader("Accept",h.dataTypes[0]&&h.accepts[h.dataTypes[0]]?h.accepts[h.dataTypes[0]]+("*"!==h.dataTypes[0]?", "+$t+"; q=0.01":""):h.accepts["*"]);for(p in h.headers)E.setRequestHeader(p,h.headers[p]);if(h.beforeSend&&(!1===h.beforeSend.call(g,E,h)||c))return E.abort();if(C="abort",m.add(h.complete),E.done(h.success),E.fail(h.error),i=_t(Wt,h,n,E)){if(E.readyState=1,f&&y.trigger("ajaxSend",[E,h]),c)return E;h.async&&h.timeout>0&&(u=e.setTimeout(function(){E.abort("timeout")},h.timeout));try{c=!1,i.send(b,k)}catch(e){if(c)throw e;k(-1,e)}}else k(-1,"No Transport");function k(t,n,r,s){var l,p,d,b,T,C=n;c||(c=!0,u&&e.clearTimeout(u),i=void 0,a=s||"",E.readyState=t>0?4:0,l=t>=200&&t<300||304===t,r&&(b=Xt(h,E,r)),b=Ut(h,b,E,l),l?(h.ifModified&&((T=E.getResponseHeader("Last-Modified"))&&(w.lastModified[o]=T),(T=E.getResponseHeader("etag"))&&(w.etag[o]=T)),204===t||"HEAD"===h.type?C="nocontent":304===t?C="notmodified":(C=b.state,p=b.data,l=!(d=b.error))):(d=C,!t&&C||(C="error",t<0&&(t=0))),E.status=t,E.statusText=(n||C)+"",l?v.resolveWith(g,[p,C,E]):v.rejectWith(g,[E,C,d]),E.statusCode(x),x=void 0,f&&y.trigger(l?"ajaxSuccess":"ajaxError",[E,h,l?p:d]),m.fireWith(g,[E,C]),f&&(y.trigger("ajaxComplete",[E,h]),--w.active||w.event.trigger("ajaxStop")))}return E},getJSON:function(e,t,n){return w.get(e,t,n,"json")},getScript:function(e,t){return w.get(e,void 0,t,"script")}}),w.each(["get","post"],function(e,t){w[t]=function(e,n,r,i){return g(n)&&(i=i||r,r=n,n=void 0),w.ajax(w.extend({url:e,type:t,dataType:i,data:n,success:r},w.isPlainObject(e)&&e))}}),w._evalUrl=function(e){return w.ajax({url:e,type:"GET",dataType:"script",cache:!0,async:!1,global:!1,"throws":!0})},w.fn.extend({wrapAll:function(e){var t;return this[0]&&(g(e)&&(e=e.call(this[0])),t=w(e,this[0].ownerDocument).eq(0).clone(!0),this[0].parentNode&&t.insertBefore(this[0]),t.map(function(){var e=this;while(e.firstElementChild)e=e.firstElementChild;return e}).append(this)),this},wrapInner:function(e){return g(e)?this.each(function(t){w(this).wrapInner(e.call(this,t))}):this.each(function(){var t=w(this),n=t.contents();n.length?n.wrapAll(e):t.append(e)})},wrap:function(e){var t=g(e);return this.each(function(n){w(this).wrapAll(t?e.call(this,n):e)})},unwrap:function(e){return this.parent(e).not("body").each(function(){w(this).replaceWith(this.childNodes)}),this}}),w.expr.pseudos.hidden=function(e){return!w.expr.pseudos.visible(e)},w.expr.pseudos.visible=function(e){return!!(e.offsetWidth||e.offsetHeight||e.getClientRects().length)},w.ajaxSettings.xhr=function(){try{return new e.XMLHttpRequest}catch(e){}};var Vt={0:200,1223:204},Gt=w.ajaxSettings.xhr();h.cors=!!Gt&&"withCredentials"in Gt,h.ajax=Gt=!!Gt,w.ajaxTransport(function(t){var n,r;if(h.cors||Gt&&!t.crossDomain)return{send:function(i,o){var a,s=t.xhr();if(s.open(t.type,t.url,t.async,t.username,t.password),t.xhrFields)for(a in t.xhrFields)s[a]=t.xhrFields[a];t.mimeType&&s.overrideMimeType&&s.overrideMimeType(t.mimeType),t.crossDomain||i["X-Requested-With"]||(i["X-Requested-With"]="XMLHttpRequest");for(a in i)s.setRequestHeader(a,i[a]);n=function(e){return function(){n&&(n=r=s.onload=s.onerror=s.onabort=s.ontimeout=s.onreadystatechange=null,"abort"===e?s.abort():"error"===e?"number"!=typeof s.status?o(0,"error"):o(s.status,s.statusText):o(Vt[s.status]||s.status,s.statusText,"text"!==(s.responseType||"text")||"string"!=typeof s.responseText?{binary:s.response}:{text:s.responseText},s.getAllResponseHeaders()))}},s.onload=n(),r=s.onerror=s.ontimeout=n("error"),void 0!==s.onabort?s.onabort=r:s.onreadystatechange=function(){4===s.readyState&&e.setTimeout(function(){n&&r()})},n=n("abort");try{s.send(t.hasContent&&t.data||null)}catch(e){if(n)throw e}},abort:function(){n&&n()}}}),w.ajaxPrefilter(function(e){e.crossDomain&&(e.contents.script=!1)}),w.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/\b(?:java|ecma)script\b/},converters:{"text script":function(e){return w.globalEval(e),e}}}),w.ajaxPrefilter("script",function(e){void 0===e.cache&&(e.cache=!1),e.crossDomain&&(e.type="GET")}),w.ajaxTransport("script",function(e){if(e.crossDomain){var t,n;return{send:function(i,o){t=w(" + diff --git a/flask_admin/templates/bootstrap3/admin/base.html b/flask_admin/templates/bootstrap3/admin/base.html index 823df51776..9aefc8ba9f 100644 --- a/flask_admin/templates/bootstrap3/admin/base.html +++ b/flask_admin/templates/bootstrap3/admin/base.html @@ -80,7 +80,7 @@ {% endblock %} {% block tail_js %} - + diff --git a/flask_admin/templates/bootstrap4/admin/base.html b/flask_admin/templates/bootstrap4/admin/base.html index 23175fe87b..fa5ff5c3a2 100644 --- a/flask_admin/templates/bootstrap4/admin/base.html +++ b/flask_admin/templates/bootstrap4/admin/base.html @@ -77,7 +77,7 @@ {% endblock %} {% block tail_js %} - + From efbd258dc80a312b0718a071fced2ce6e06646ee Mon Sep 17 00:00:00 2001 From: Brandon Ingli Date: Thu, 29 Jul 2021 19:24:54 -0500 Subject: [PATCH 49/69] Update bool_formatter for FA5 --- flask_admin/model/typefmt.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/flask_admin/model/typefmt.py b/flask_admin/model/typefmt.py index c941749d85..0013e50d04 100755 --- a/flask_admin/model/typefmt.py +++ b/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 = 'check-circle' if value else 'circle-o' - return Markup('' % (fa, glyph, glyph)) + fa = 'fa fa-check-circle' if value else 'far facircle' + return Markup('' % (fa, glyph, glyph)) def list_formatter(view, values): From feb0601ed9310aa665ef7efafaf7c90c03f46022 Mon Sep 17 00:00:00 2001 From: Brandon Ingli Date: Thu, 29 Jul 2021 19:25:54 -0500 Subject: [PATCH 50/69] Add missing hyphen --- flask_admin/model/typefmt.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flask_admin/model/typefmt.py b/flask_admin/model/typefmt.py index 0013e50d04..fe72cb212d 100755 --- a/flask_admin/model/typefmt.py +++ b/flask_admin/model/typefmt.py @@ -36,7 +36,7 @@ def bool_formatter(view, value): Value to check """ glyph = 'ok-circle' if value else 'minus-sign' - fa = 'fa fa-check-circle' if value else 'far facircle' + fa = 'fa fa-check-circle' if value else 'far fa-circle' return Markup('' % (fa, glyph, glyph)) From 2cd4263b41c49adbfdba88e8f1e99a4c4ce3705c Mon Sep 17 00:00:00 2001 From: Brandon Ingli Date: Thu, 29 Jul 2021 19:34:54 -0500 Subject: [PATCH 51/69] Use fas instead of deprecated fa --- flask_admin/model/typefmt.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flask_admin/model/typefmt.py b/flask_admin/model/typefmt.py index fe72cb212d..34035f933d 100755 --- a/flask_admin/model/typefmt.py +++ b/flask_admin/model/typefmt.py @@ -36,7 +36,7 @@ def bool_formatter(view, value): Value to check """ glyph = 'ok-circle' if value else 'minus-sign' - fa = 'fa fa-check-circle' if value else 'far fa-circle' + fa = 'fas fa-check-circle' if value else 'far fa-circle' return Markup('' % (fa, glyph, glyph)) From 00abc4df5e55e383243fed301561fe16cc2650ab Mon Sep 17 00:00:00 2001 From: cgaunet Date: Fri, 30 Jul 2021 14:26:56 +0200 Subject: [PATCH 52/69] Fix extra args missing in bootstrap4 --- flask_admin/templates/bootstrap4/admin/model/layout.html | 3 +++ 1 file changed, 3 insertions(+) diff --git a/flask_admin/templates/bootstrap4/admin/model/layout.html b/flask_admin/templates/bootstrap4/admin/model/layout.html index 00e6977a68..37667010a3 100644 --- a/flask_admin/templates/bootstrap4/admin/model/layout.html +++ b/flask_admin/templates/bootstrap4/admin/model/layout.html @@ -62,6 +62,9 @@ {% if page_size != default_page_size %} {% endif %} + {% for arg_name, arg_value in extra_args.items() %} + + {% endfor %} {% if sort_column is not none %} {% endif %} From b7602916bbf9390f1243979533c281be58e4c773 Mon Sep 17 00:00:00 2001 From: iburakov Date: Sun, 1 Aug 2021 00:11:50 +0300 Subject: [PATCH 53/69] Fix `el is not defined` in x-editable-combodate popover handler See flask-admin#2022 for more info. --- flask_admin/static/admin/js/form.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/flask_admin/static/admin/js/form.js b/flask_admin/static/admin/js/form.js index 51001c5888..ee66028ba9 100644 --- a/flask_admin/static/admin/js/form.js +++ b/flask_admin/static/admin/js/form.js @@ -465,8 +465,10 @@ }); return true; case 'x-editable-combodate': - let template = $el.data('template') - el.removeAttribute('data-template') + // Fixes bootstrap4 issue where data-template breaks bs4 popover. + // https://github.com/flask-admin/flask-admin/issues/2022 + let template = $el.data('template'); + $el.removeAttr('data-template'); $el.editable({ params: overrideXeditableParams, template: template, From 9100f3fb776ecf25b80384475709e6c449c711a0 Mon Sep 17 00:00:00 2001 From: Jae Joon Kim Date: Wed, 25 Aug 2021 14:46:45 +0900 Subject: [PATCH 54/69] Fix JSONField when the value is empty json Previously it returned empty string instead of empty json --- flask_admin/form/fields.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flask_admin/form/fields.py b/flask_admin/form/fields.py index 83dccd014f..605fbf7f36 100644 --- a/flask_admin/form/fields.py +++ b/flask_admin/form/fields.py @@ -187,7 +187,7 @@ class JSONField(fields.TextAreaField): def _value(self): if self.raw_data: return self.raw_data[0] - elif self.data: + elif self.data is not None: # prevent utf8 characters from being converted to ascii return as_unicode(json.dumps(self.data, ensure_ascii=False)) else: From 733cfac63a674c897be857877c316595c592f4d1 Mon Sep 17 00:00:00 2001 From: Sean McCarthy Date: Thu, 9 Sep 2021 12:56:51 -0600 Subject: [PATCH 55/69] fixes issue #2144 where X-editable combodate doesn't show up in Bootstrap 4 --- flask_admin/model/widgets.py | 1 + 1 file changed, 1 insertion(+) diff --git a/flask_admin/model/widgets.py b/flask_admin/model/widgets.py index 075092d36c..e906790dca 100644 --- a/flask_admin/model/widgets.py +++ b/flask_admin/model/widgets.py @@ -131,6 +131,7 @@ def get_kwargs(self, field, kwargs): kwargs['data-type'] = 'combodate' kwargs['data-format'] = 'YYYY-MM-DD' kwargs['data-template'] = 'YYYY-MM-DD' + kwargs['data-role'] = 'x-editable-combodate' elif field.type == 'DateTimeField': kwargs['data-type'] = 'combodate' kwargs['data-format'] = 'YYYY-MM-DD HH:mm:ss' From 883636203c7a789a09e4f333a313b11f1463442b Mon Sep 17 00:00:00 2001 From: Michael Hill Date: Fri, 15 Oct 2021 21:19:59 -0400 Subject: [PATCH 56/69] Fixed editable column fields showing "Empty" bs4 Added logic to grab items either id or value to fix #2130 --- flask_admin/static/admin/js/form.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/flask_admin/static/admin/js/form.js b/flask_admin/static/admin/js/form.js index 5f685859b2..6dfbd68238 100644 --- a/flask_admin/static/admin/js/form.js +++ b/flask_admin/static/admin/js/form.js @@ -492,7 +492,9 @@ display: function(value) { // override to display text instead of ids on list view var html = []; - var data = $.fn.editableutils.itemsByValue(value, $el.data('source'), 'id'); + // temporary patch to provide bs3 & bs4 compatibility + var data = $.fn.editableutils.itemsByValue(value, $el.data('source'), 'id') + + $.fn.editableutils.itemsByValue(value, $el.data('source'), 'value'); if(data.length) { $.each(data, function(i, v) { html.push($.fn.editableutils.escape(v.text)); }); From c9ef5da5522f8ce2cdedd6e193a7c2fa57a277f5 Mon Sep 17 00:00:00 2001 From: Mike Hill Date: Mon, 18 Oct 2021 09:53:02 -0400 Subject: [PATCH 57/69] Updated upload fields to conditionally utilize new extra_filters argument in process function based on wtforms version --- flask_admin/form/__init__.py | 2 +- flask_admin/form/upload.py | 12 +++++++++--- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/flask_admin/form/__init__.py b/flask_admin/form/__init__.py index 9db32c5a44..915811b67f 100644 --- a/flask_admin/form/__init__.py +++ b/flask_admin/form/__init__.py @@ -40,7 +40,7 @@ def recreate_field(unbound): return unbound.field_class(*unbound.args, **unbound.kwargs) -if int(wtforms_version[0]) > 1: +if int(float(wtforms_version[0])) > 1: # only WTForms 2+ has built-in CSRF functionality from os import urandom from flask import session, current_app diff --git a/flask_admin/form/upload.py b/flask_admin/form/upload.py index e10544e694..5be0c7153f 100644 --- a/flask_admin/form/upload.py +++ b/flask_admin/form/upload.py @@ -4,7 +4,7 @@ from werkzeug.utils import secure_filename from werkzeug.datastructures import FileStorage -from wtforms import ValidationError, fields +from wtforms import ValidationError, fields, __version__ as wtforms_version from wtforms.widgets import html_params try: @@ -186,6 +186,9 @@ class MyForm(BaseForm): self._should_delete = False + if int(float(wtforms_version[0])) < 3: + kwargs.pop('extra_filters', None) + super(FileUploadField, self).__init__(label, validators, **kwargs) def is_file_allowed(self, filename): @@ -216,13 +219,16 @@ def pre_validate(self, form): if not self._allow_overwrite and os.path.exists(self._get_path(self.data.filename)): raise ValidationError(gettext('File "%s" already exists.' % self.data.filename)) - def process(self, formdata, data=unset_value): + def process(self, formdata, data=unset_value, extra_filters=None): if formdata: marker = '_%s-delete' % self.name if marker in formdata: self._should_delete = True - return super(FileUploadField, self).process(formdata, data) + if int(float(wtforms_version[0])) < 3: + return super(FileUploadField, self).process(formdata, data) + else: + return super(FileUploadField, self).process(formdata, data, extra_filters) # noqa def process_formdata(self, valuelist): if self._should_delete: From 20ff6c7f9e6e59f84fb52f2448739f7b19ac1c17 Mon Sep 17 00:00:00 2001 From: Mike Hill Date: Mon, 18 Oct 2021 10:22:26 -0400 Subject: [PATCH 58/69] Removed float() left over from testing --- flask_admin/form/__init__.py | 2 +- flask_admin/form/upload.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/flask_admin/form/__init__.py b/flask_admin/form/__init__.py index 915811b67f..9db32c5a44 100644 --- a/flask_admin/form/__init__.py +++ b/flask_admin/form/__init__.py @@ -40,7 +40,7 @@ def recreate_field(unbound): return unbound.field_class(*unbound.args, **unbound.kwargs) -if int(float(wtforms_version[0])) > 1: +if int(wtforms_version[0]) > 1: # only WTForms 2+ has built-in CSRF functionality from os import urandom from flask import session, current_app diff --git a/flask_admin/form/upload.py b/flask_admin/form/upload.py index 5be0c7153f..009a79f3e2 100644 --- a/flask_admin/form/upload.py +++ b/flask_admin/form/upload.py @@ -186,7 +186,7 @@ class MyForm(BaseForm): self._should_delete = False - if int(float(wtforms_version[0])) < 3: + if int(wtforms_version[0]) < 3: kwargs.pop('extra_filters', None) super(FileUploadField, self).__init__(label, validators, **kwargs) @@ -225,7 +225,7 @@ def process(self, formdata, data=unset_value, extra_filters=None): if marker in formdata: self._should_delete = True - if int(float(wtforms_version[0])) < 3: + if int(wtforms_version[0]) < 3: return super(FileUploadField, self).process(formdata, data) else: return super(FileUploadField, self).process(formdata, data, extra_filters) # noqa From d30a84edfc753eb685a825e0ff69704afbe9e851 Mon Sep 17 00:00:00 2001 From: Michael Hill Date: Mon, 18 Oct 2021 19:12:48 -0400 Subject: [PATCH 59/69] Added additional check to is_editable Fixes #2129 --- flask_admin/model/base.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flask_admin/model/base.py b/flask_admin/model/base.py index 65cde80daa..1fc9fdc2f1 100755 --- a/flask_admin/model/base.py +++ b/flask_admin/model/base.py @@ -1466,7 +1466,7 @@ def is_editable(self, name): :param name: Column name. """ - return name in self.column_editable_list + return name in self.column_editable_list and self.can_edit def _get_column_by_idx(self, idx): """ From 7b0046560c66a07873659fa895906ab93a3eea69 Mon Sep 17 00:00:00 2001 From: Jae Joon Kim Date: Thu, 21 Oct 2021 09:54:56 +0900 Subject: [PATCH 60/69] Update JSONField to return empty dict --- flask_admin/form/fields.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/flask_admin/form/fields.py b/flask_admin/form/fields.py index 605fbf7f36..8cc61ebe87 100644 --- a/flask_admin/form/fields.py +++ b/flask_admin/form/fields.py @@ -187,11 +187,11 @@ class JSONField(fields.TextAreaField): def _value(self): if self.raw_data: return self.raw_data[0] - elif self.data is not None: + elif self.data: # prevent utf8 characters from being converted to ascii return as_unicode(json.dumps(self.data, ensure_ascii=False)) else: - return '' + return '{}' def process_formdata(self, valuelist): if valuelist: From 5f2b4d3dd2a24e335fd9e5f805f38e3856a9cfa8 Mon Sep 17 00:00:00 2001 From: Ram Mehta Date: Sun, 14 Jul 2019 23:16:39 -0400 Subject: [PATCH 61/69] Add flask_debugtoolbar for peewee to flask-admin. --- .../contrib/peewee/flask_debugtoolbar.py | 136 ++++++++++++++++++ 1 file changed, 136 insertions(+) create mode 100644 flask_admin/contrib/peewee/flask_debugtoolbar.py diff --git a/flask_admin/contrib/peewee/flask_debugtoolbar.py b/flask_admin/contrib/peewee/flask_debugtoolbar.py new file mode 100644 index 0000000000..2ea2243651 --- /dev/null +++ b/flask_admin/contrib/peewee/flask_debugtoolbar.py @@ -0,0 +1,136 @@ +# From: https://github.com/klen/flask-pw/blob/develop/flask_pw/debugtoolbar.py +# The MIT License (MIT) + +# Copyright (c) 2015, Kirill Klenov + +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to deal +# in the Software without restriction, including without limitation the rights +# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +# copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: + +# The above copyright notice and this permission notice shall be included in all +# copies or substantial portions of the Software. + +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +# SOFTWARE. + +import logging +import time + +import itsdangerous +from flask import current_app, request, abort, g +from flask_debugtoolbar import module +from flask_debugtoolbar.panels import DebugPanel +from flask_debugtoolbar.utils import format_sql +from peewee import SqliteDatabase + + +peewee = logging.getLogger('peewee') + + +def query_signer(): + return itsdangerous.URLSafeSerializer(current_app.config['SECRET_KEY'], salt='fdt-sql-query') + + +def load_query(data): + try: + return query_signer().loads(request.args['query']) + except (itsdangerous.BadSignature, TypeError): + abort(406) + + +def dump_query(query, params): + try: + return query_signer().dumps((query, params)) + except TypeError: + return None + + +class AmountHandler(logging.Handler): + + def __init__(self, *args): + super(AmountHandler, self).__init__(*args) + self.records = [] + + def emit(self, record): + self.records.append((time.time() - self.time, record)) + self.time = time.time() + + @property + def amount(self): + return len(self.records) + + +class PeeweeDebugPanel(DebugPanel): + + name = 'Peewee' + has_content = True + + def __init__(self, *args, **kwargs): + self.handler = AmountHandler() + peewee.setLevel('DEBUG') + peewee.handlers = [] + peewee.addHandler(self.handler) + super(PeeweeDebugPanel, self).__init__(*args, **kwargs) + + @property + def has_content(self): + return bool(self.handler.amount) + + def url(self): + return '' + + def title(self): + return 'Peewee ORM queries' + + def nav_title(self): + return 'Peewee ORM %s' % self.handler.amount + + def process_request(self, request): + self.handler.time = time.time() + + def content(self): + data = [] + for duration, record in self.handler.records: + + sql, params = record.msg + + data.append({ + 'signed_query': dump_query(sql, params), + 'sql': sql, + 'duration': duration, + }) + + return self.render('panels/sqlalchemy.html', {'queries': data}) + + +@module.route('/sqlalchemy/sql_select', methods=['GET', 'POST']) +@module.route('/sqlalchemy/sql_explain', methods=['GET', 'POST'], defaults=dict(explain=True)) +def sql_select(explain=False): + statement, params = load_query(request.args['query']) + database = current_app.extensions.get('peewee').database.obj + + if explain: + if isinstance(database, SqliteDatabase): + statement = 'EXPLAIN QUERY PLAN\n%s' % statement + else: + statement = 'EXPLAIN\n%s' % statement + + result = database.execute_sql(statement, params) + headers = [] + data = list(result.fetchall()) + if data: + headers = ['' for _ in range(len(data[0]))] + return g.debug_toolbar.render('panels/sqlalchemy_select.html', { + 'result': data, + 'headers': headers, + 'sql': format_sql(statement, params), + 'duration': float(request.args['duration']), + }) From a6d1356fcf5d6e9b6055ba12cc52641bc7acd110 Mon Sep 17 00:00:00 2001 From: Ram Mehta Date: Sun, 14 Jul 2019 23:30:38 -0400 Subject: [PATCH 62/69] Move debugtoolbar. --- .../contrib/peewee/{flask_debugtoolbar.py => debugtoolbar.py} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename flask_admin/contrib/peewee/{flask_debugtoolbar.py => debugtoolbar.py} (100%) diff --git a/flask_admin/contrib/peewee/flask_debugtoolbar.py b/flask_admin/contrib/peewee/debugtoolbar.py similarity index 100% rename from flask_admin/contrib/peewee/flask_debugtoolbar.py rename to flask_admin/contrib/peewee/debugtoolbar.py From 553f62ca3b7796eefbcb3cbfef6f56cccb45f5f3 Mon Sep 17 00:00:00 2001 From: Ram Mehta Date: Thu, 31 Oct 2019 03:14:44 -0400 Subject: [PATCH 63/69] Update debugtoolbar.py --- flask_admin/contrib/peewee/debugtoolbar.py | 1 + 1 file changed, 1 insertion(+) diff --git a/flask_admin/contrib/peewee/debugtoolbar.py b/flask_admin/contrib/peewee/debugtoolbar.py index 2ea2243651..8c2928d113 100644 --- a/flask_admin/contrib/peewee/debugtoolbar.py +++ b/flask_admin/contrib/peewee/debugtoolbar.py @@ -58,6 +58,7 @@ class AmountHandler(logging.Handler): def __init__(self, *args): super(AmountHandler, self).__init__(*args) self.records = [] + self.time = time.time() def emit(self, record): self.records.append((time.time() - self.time, record)) From ee6385af7be05fa621f8944f8124b9c8e920b4a1 Mon Sep 17 00:00:00 2001 From: Ram Mehta Date: Sun, 14 Jul 2019 23:16:39 -0400 Subject: [PATCH 64/69] Add flask_debugtoolbar for peewee to flask-admin. --- .../contrib/peewee/flask_debugtoolbar.py | 136 ++++++++++++++++++ 1 file changed, 136 insertions(+) create mode 100644 flask_admin/contrib/peewee/flask_debugtoolbar.py diff --git a/flask_admin/contrib/peewee/flask_debugtoolbar.py b/flask_admin/contrib/peewee/flask_debugtoolbar.py new file mode 100644 index 0000000000..2ea2243651 --- /dev/null +++ b/flask_admin/contrib/peewee/flask_debugtoolbar.py @@ -0,0 +1,136 @@ +# From: https://github.com/klen/flask-pw/blob/develop/flask_pw/debugtoolbar.py +# The MIT License (MIT) + +# Copyright (c) 2015, Kirill Klenov + +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to deal +# in the Software without restriction, including without limitation the rights +# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +# copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: + +# The above copyright notice and this permission notice shall be included in all +# copies or substantial portions of the Software. + +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +# SOFTWARE. + +import logging +import time + +import itsdangerous +from flask import current_app, request, abort, g +from flask_debugtoolbar import module +from flask_debugtoolbar.panels import DebugPanel +from flask_debugtoolbar.utils import format_sql +from peewee import SqliteDatabase + + +peewee = logging.getLogger('peewee') + + +def query_signer(): + return itsdangerous.URLSafeSerializer(current_app.config['SECRET_KEY'], salt='fdt-sql-query') + + +def load_query(data): + try: + return query_signer().loads(request.args['query']) + except (itsdangerous.BadSignature, TypeError): + abort(406) + + +def dump_query(query, params): + try: + return query_signer().dumps((query, params)) + except TypeError: + return None + + +class AmountHandler(logging.Handler): + + def __init__(self, *args): + super(AmountHandler, self).__init__(*args) + self.records = [] + + def emit(self, record): + self.records.append((time.time() - self.time, record)) + self.time = time.time() + + @property + def amount(self): + return len(self.records) + + +class PeeweeDebugPanel(DebugPanel): + + name = 'Peewee' + has_content = True + + def __init__(self, *args, **kwargs): + self.handler = AmountHandler() + peewee.setLevel('DEBUG') + peewee.handlers = [] + peewee.addHandler(self.handler) + super(PeeweeDebugPanel, self).__init__(*args, **kwargs) + + @property + def has_content(self): + return bool(self.handler.amount) + + def url(self): + return '' + + def title(self): + return 'Peewee ORM queries' + + def nav_title(self): + return 'Peewee ORM %s' % self.handler.amount + + def process_request(self, request): + self.handler.time = time.time() + + def content(self): + data = [] + for duration, record in self.handler.records: + + sql, params = record.msg + + data.append({ + 'signed_query': dump_query(sql, params), + 'sql': sql, + 'duration': duration, + }) + + return self.render('panels/sqlalchemy.html', {'queries': data}) + + +@module.route('/sqlalchemy/sql_select', methods=['GET', 'POST']) +@module.route('/sqlalchemy/sql_explain', methods=['GET', 'POST'], defaults=dict(explain=True)) +def sql_select(explain=False): + statement, params = load_query(request.args['query']) + database = current_app.extensions.get('peewee').database.obj + + if explain: + if isinstance(database, SqliteDatabase): + statement = 'EXPLAIN QUERY PLAN\n%s' % statement + else: + statement = 'EXPLAIN\n%s' % statement + + result = database.execute_sql(statement, params) + headers = [] + data = list(result.fetchall()) + if data: + headers = ['' for _ in range(len(data[0]))] + return g.debug_toolbar.render('panels/sqlalchemy_select.html', { + 'result': data, + 'headers': headers, + 'sql': format_sql(statement, params), + 'duration': float(request.args['duration']), + }) From 8623302725e12a47d1c0879f64f3ce33b40d951b Mon Sep 17 00:00:00 2001 From: Ram Mehta Date: Sun, 14 Jul 2019 23:30:38 -0400 Subject: [PATCH 65/69] Move debugtoolbar. --- .../contrib/peewee/flask_debugtoolbar.py | 136 ------------------ 1 file changed, 136 deletions(-) delete mode 100644 flask_admin/contrib/peewee/flask_debugtoolbar.py diff --git a/flask_admin/contrib/peewee/flask_debugtoolbar.py b/flask_admin/contrib/peewee/flask_debugtoolbar.py deleted file mode 100644 index 2ea2243651..0000000000 --- a/flask_admin/contrib/peewee/flask_debugtoolbar.py +++ /dev/null @@ -1,136 +0,0 @@ -# From: https://github.com/klen/flask-pw/blob/develop/flask_pw/debugtoolbar.py -# The MIT License (MIT) - -# Copyright (c) 2015, Kirill Klenov - -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documentation files (the "Software"), to deal -# in the Software without restriction, including without limitation the rights -# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -# copies of the Software, and to permit persons to whom the Software is -# furnished to do so, subject to the following conditions: - -# The above copyright notice and this permission notice shall be included in all -# copies or substantial portions of the Software. - -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -# SOFTWARE. - -import logging -import time - -import itsdangerous -from flask import current_app, request, abort, g -from flask_debugtoolbar import module -from flask_debugtoolbar.panels import DebugPanel -from flask_debugtoolbar.utils import format_sql -from peewee import SqliteDatabase - - -peewee = logging.getLogger('peewee') - - -def query_signer(): - return itsdangerous.URLSafeSerializer(current_app.config['SECRET_KEY'], salt='fdt-sql-query') - - -def load_query(data): - try: - return query_signer().loads(request.args['query']) - except (itsdangerous.BadSignature, TypeError): - abort(406) - - -def dump_query(query, params): - try: - return query_signer().dumps((query, params)) - except TypeError: - return None - - -class AmountHandler(logging.Handler): - - def __init__(self, *args): - super(AmountHandler, self).__init__(*args) - self.records = [] - - def emit(self, record): - self.records.append((time.time() - self.time, record)) - self.time = time.time() - - @property - def amount(self): - return len(self.records) - - -class PeeweeDebugPanel(DebugPanel): - - name = 'Peewee' - has_content = True - - def __init__(self, *args, **kwargs): - self.handler = AmountHandler() - peewee.setLevel('DEBUG') - peewee.handlers = [] - peewee.addHandler(self.handler) - super(PeeweeDebugPanel, self).__init__(*args, **kwargs) - - @property - def has_content(self): - return bool(self.handler.amount) - - def url(self): - return '' - - def title(self): - return 'Peewee ORM queries' - - def nav_title(self): - return 'Peewee ORM %s' % self.handler.amount - - def process_request(self, request): - self.handler.time = time.time() - - def content(self): - data = [] - for duration, record in self.handler.records: - - sql, params = record.msg - - data.append({ - 'signed_query': dump_query(sql, params), - 'sql': sql, - 'duration': duration, - }) - - return self.render('panels/sqlalchemy.html', {'queries': data}) - - -@module.route('/sqlalchemy/sql_select', methods=['GET', 'POST']) -@module.route('/sqlalchemy/sql_explain', methods=['GET', 'POST'], defaults=dict(explain=True)) -def sql_select(explain=False): - statement, params = load_query(request.args['query']) - database = current_app.extensions.get('peewee').database.obj - - if explain: - if isinstance(database, SqliteDatabase): - statement = 'EXPLAIN QUERY PLAN\n%s' % statement - else: - statement = 'EXPLAIN\n%s' % statement - - result = database.execute_sql(statement, params) - headers = [] - data = list(result.fetchall()) - if data: - headers = ['' for _ in range(len(data[0]))] - return g.debug_toolbar.render('panels/sqlalchemy_select.html', { - 'result': data, - 'headers': headers, - 'sql': format_sql(statement, params), - 'duration': float(request.args['duration']), - }) From 7c0df8f7bc546d04065dc30d913f9117dc432cf6 Mon Sep 17 00:00:00 2001 From: Ram Mehta Date: Wed, 26 Aug 2020 01:26:12 -0400 Subject: [PATCH 66/69] Upgrade bootstrap4 icons to font awesome 5. --- flask_admin/templates/bootstrap4/admin/file/list.html | 8 ++++---- .../templates/bootstrap4/admin/model/row_actions.html | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/flask_admin/templates/bootstrap4/admin/file/list.html b/flask_admin/templates/bootstrap4/admin/file/list.html index bd9f3458ce..328b13b138 100644 --- a/flask_admin/templates/bootstrap4/admin/file/list.html +++ b/flask_admin/templates/bootstrap4/admin/file/list.html @@ -74,10 +74,10 @@ {%- if admin_view.rename_modal -%} {{ lib.add_modal_button(url=get_url('.rename', path=path, modal=True), title=_gettext('Rename File'), - content='') }} + content='') }} {% else %} - + {%- endif -%} {% endif %} @@ -97,7 +97,7 @@ {{ delete_form.path(value=path) }} {{ delete_form.csrf_token }} {% endif %} @@ -107,7 +107,7 @@ {% if is_dir %} - {{ name }} + {{ name }} {% else %} diff --git a/flask_admin/templates/bootstrap4/admin/model/row_actions.html b/flask_admin/templates/bootstrap4/admin/model/row_actions.html index 74d65ca438..1cead027e3 100644 --- a/flask_admin/templates/bootstrap4/admin/model/row_actions.html +++ b/flask_admin/templates/bootstrap4/admin/model/row_actions.html @@ -15,11 +15,11 @@ {% endmacro %} {% macro edit_row(action, row_id, row) %} - {{ link(action, get_url('.edit_view', id=row_id, url=return_url), 'fa fa-pencil glyphicon glyphicon-pencil') }} + {{ link(action, get_url('.edit_view', id=row_id, url=return_url), 'fas fa-pencil-alt glyphicon glyphicon-pencil') }} {% endmacro %} {% macro edit_row_popup(action, row_id, row) %} - {{ lib.add_modal_button(url=get_url('.edit_view', id=row_id, url=return_url, modal=True), title=action.title, content='') }} + {{ lib.add_modal_button(url=get_url('.edit_view', id=row_id, url=return_url, modal=True), title=action.title, content='') }} {% endmacro %} {% macro delete_row(action, row_id, row) %} @@ -32,7 +32,7 @@ {% endif %} {% endmacro %} From c1bfb0ed2736b01ada1b5be8005fb929b33ebb3d Mon Sep 17 00:00:00 2001 From: Ram Mehta Date: Tue, 1 Sep 2020 00:24:57 -0400 Subject: [PATCH 67/69] Fix minor css issues and change default popover placement. --- flask_admin/static/admin/js/form.js | 1 + 1 file changed, 1 insertion(+) diff --git a/flask_admin/static/admin/js/form.js b/flask_admin/static/admin/js/form.js index 6dfbd68238..51949c2089 100644 --- a/flask_admin/static/admin/js/form.js +++ b/flask_admin/static/admin/js/form.js @@ -457,6 +457,7 @@ case 'x-editable': $el.editable({ params: overrideXeditableParams, + placement: 'left', combodate: { // prevent minutes from showing in 5 minute increments minuteStep: 1, From 8552be5b4c3818453a378928f78ce56f36d85f08 Mon Sep 17 00:00:00 2001 From: Ram Mehta Date: Sat, 23 Oct 2021 09:30:10 -0400 Subject: [PATCH 68/69] Fix bug where filters don't work. --- flask_admin/static/admin/js/form.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flask_admin/static/admin/js/form.js b/flask_admin/static/admin/js/form.js index 51949c2089..c67373ad4d 100644 --- a/flask_admin/static/admin/js/form.js +++ b/flask_admin/static/admin/js/form.js @@ -637,10 +637,10 @@ // Expose faForm globally var faForm = window.faForm = new AdminForm(); - $(document).trigger('adminFormReady') // Apply global styles for current page after page loaded $(function() { + $(document).trigger('adminFormReady'); faForm.applyGlobalStyles(document); }); })(); From 16b66dfc5fddcf01fc01fd995da199491d3cf312 Mon Sep 17 00:00:00 2001 From: Ram Mehta Date: Sat, 23 Oct 2021 10:09:42 -0400 Subject: [PATCH 69/69] Remove useless change. --- flask_admin/static/admin/js/form.js | 1 - 1 file changed, 1 deletion(-) diff --git a/flask_admin/static/admin/js/form.js b/flask_admin/static/admin/js/form.js index c67373ad4d..57bdbc0171 100644 --- a/flask_admin/static/admin/js/form.js +++ b/flask_admin/static/admin/js/form.js @@ -457,7 +457,6 @@ case 'x-editable': $el.editable({ params: overrideXeditableParams, - placement: 'left', combodate: { // prevent minutes from showing in 5 minute increments minuteStep: 1,