From bc899b8b76db8a0ff774012412a57a7caba393e4 Mon Sep 17 00:00:00 2001 From: Artur Barseghyan Date: Tue, 3 Mar 2015 23:04:10 +0100 Subject: [PATCH] prepare 0.4.23; fix improper initial value validation for select-like plugins --- CHANGELOG.rst | 7 +++++++ scripts/{install_django16.bat => install_django_1_6.bat} | 0 scripts/{install_django16.sh => install_django_1_6.sh} | 0 scripts/{install_django17.sh => install_django_1_7.sh} | 0 scripts/{install_django18.sh => install_django_1_8.sh} | 0 scripts/{install3.sh => install_python_3.sh} | 0 scripts/reinstall3.sh | 3 --- scripts/reinstall_django16.bat | 3 --- scripts/reinstall_django16.sh | 3 --- scripts/reinstall_django17.sh | 3 --- scripts/reinstall_django18.sh | 3 --- scripts/reinstall_django_1_6.bat | 3 +++ scripts/reinstall_django_1_6.sh | 3 +++ scripts/reinstall_django_1_7.sh | 3 +++ scripts/reinstall_django_1_8.sh | 3 +++ scripts/reinstall_python_3.sh | 3 +++ scripts/test_django_1_6.sh | 6 ++++++ scripts/{test_django17.sh => test_django_1_7.sh} | 2 +- scripts/{test_django18.sh => test_django_1_8.sh} | 2 +- scripts/{test3.sh => test_python_3.sh} | 2 +- setup.py | 2 +- src/fobi/__init__.py | 4 ++-- src/fobi/discover.py | 5 +++-- src/fobi/helpers.py | 4 ++-- 24 files changed, 39 insertions(+), 25 deletions(-) rename scripts/{install_django16.bat => install_django_1_6.bat} (100%) rename scripts/{install_django16.sh => install_django_1_6.sh} (100%) rename scripts/{install_django17.sh => install_django_1_7.sh} (100%) rename scripts/{install_django18.sh => install_django_1_8.sh} (100%) rename scripts/{install3.sh => install_python_3.sh} (100%) delete mode 100755 scripts/reinstall3.sh delete mode 100644 scripts/reinstall_django16.bat delete mode 100755 scripts/reinstall_django16.sh delete mode 100755 scripts/reinstall_django17.sh delete mode 100755 scripts/reinstall_django18.sh create mode 100644 scripts/reinstall_django_1_6.bat create mode 100755 scripts/reinstall_django_1_6.sh create mode 100755 scripts/reinstall_django_1_7.sh create mode 100755 scripts/reinstall_django_1_8.sh create mode 100755 scripts/reinstall_python_3.sh create mode 100644 scripts/test_django_1_6.sh rename scripts/{test_django17.sh => test_django_1_7.sh} (82%) rename scripts/{test_django18.sh => test_django_1_8.sh} (82%) rename scripts/{test3.sh => test_python_3.sh} (77%) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 53f6dbcf..6fb6ceb6 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -15,6 +15,13 @@ are used for versioning (schema follows below): 0.3.4 to 0.4). - All backwards incompatible changes are mentioned in this document. +0.4.23 +------------------------------------- +2015-03-04 + +- Fix improper initial value validation for Select-like (`radio`, `select` and + `select_multiple`) plugins. + 0.4.22 ------------------------------------- 2015-03-03 diff --git a/scripts/install_django16.bat b/scripts/install_django_1_6.bat similarity index 100% rename from scripts/install_django16.bat rename to scripts/install_django_1_6.bat diff --git a/scripts/install_django16.sh b/scripts/install_django_1_6.sh similarity index 100% rename from scripts/install_django16.sh rename to scripts/install_django_1_6.sh diff --git a/scripts/install_django17.sh b/scripts/install_django_1_7.sh similarity index 100% rename from scripts/install_django17.sh rename to scripts/install_django_1_7.sh diff --git a/scripts/install_django18.sh b/scripts/install_django_1_8.sh similarity index 100% rename from scripts/install_django18.sh rename to scripts/install_django_1_8.sh diff --git a/scripts/install3.sh b/scripts/install_python_3.sh similarity index 100% rename from scripts/install3.sh rename to scripts/install_python_3.sh diff --git a/scripts/reinstall3.sh b/scripts/reinstall3.sh deleted file mode 100755 index 44b32439..00000000 --- a/scripts/reinstall3.sh +++ /dev/null @@ -1,3 +0,0 @@ -reset -./scripts/uninstall.sh -./scripts/install3.sh diff --git a/scripts/reinstall_django16.bat b/scripts/reinstall_django16.bat deleted file mode 100644 index 5c3546e2..00000000 --- a/scripts/reinstall_django16.bat +++ /dev/null @@ -1,3 +0,0 @@ -reset -.\scripts\uninstall.sh -.\scripts\install_django16.sh \ No newline at end of file diff --git a/scripts/reinstall_django16.sh b/scripts/reinstall_django16.sh deleted file mode 100755 index 4376355c..00000000 --- a/scripts/reinstall_django16.sh +++ /dev/null @@ -1,3 +0,0 @@ -reset -./scripts/uninstall.sh -./scripts/install_django16.sh \ No newline at end of file diff --git a/scripts/reinstall_django17.sh b/scripts/reinstall_django17.sh deleted file mode 100755 index fc00b0aa..00000000 --- a/scripts/reinstall_django17.sh +++ /dev/null @@ -1,3 +0,0 @@ -reset -./scripts/uninstall.sh -./scripts/install_django17.sh \ No newline at end of file diff --git a/scripts/reinstall_django18.sh b/scripts/reinstall_django18.sh deleted file mode 100755 index 94117a67..00000000 --- a/scripts/reinstall_django18.sh +++ /dev/null @@ -1,3 +0,0 @@ -reset -./scripts/uninstall.sh -./scripts/install_django18.sh \ No newline at end of file diff --git a/scripts/reinstall_django_1_6.bat b/scripts/reinstall_django_1_6.bat new file mode 100644 index 00000000..4d912f64 --- /dev/null +++ b/scripts/reinstall_django_1_6.bat @@ -0,0 +1,3 @@ +reset +.\scripts\uninstall.sh +.\scripts\install_django_1_6.sh \ No newline at end of file diff --git a/scripts/reinstall_django_1_6.sh b/scripts/reinstall_django_1_6.sh new file mode 100755 index 00000000..4b418306 --- /dev/null +++ b/scripts/reinstall_django_1_6.sh @@ -0,0 +1,3 @@ +reset +./scripts/uninstall.sh +./scripts/install_django_1_6.sh \ No newline at end of file diff --git a/scripts/reinstall_django_1_7.sh b/scripts/reinstall_django_1_7.sh new file mode 100755 index 00000000..08637ee3 --- /dev/null +++ b/scripts/reinstall_django_1_7.sh @@ -0,0 +1,3 @@ +reset +./scripts/uninstall.sh +./scripts/install_django_1_7.sh \ No newline at end of file diff --git a/scripts/reinstall_django_1_8.sh b/scripts/reinstall_django_1_8.sh new file mode 100755 index 00000000..fc8a8e26 --- /dev/null +++ b/scripts/reinstall_django_1_8.sh @@ -0,0 +1,3 @@ +reset +./scripts/uninstall.sh +./scripts/install_django_1_8.sh \ No newline at end of file diff --git a/scripts/reinstall_python_3.sh b/scripts/reinstall_python_3.sh new file mode 100755 index 00000000..9ada810a --- /dev/null +++ b/scripts/reinstall_python_3.sh @@ -0,0 +1,3 @@ +reset +./scripts/uninstall.sh +./scripts/install_python_3.sh diff --git a/scripts/test_django_1_6.sh b/scripts/test_django_1_6.sh new file mode 100644 index 00000000..b1f5d7ff --- /dev/null +++ b/scripts/test_django_1_6.sh @@ -0,0 +1,6 @@ +reset +./scripts/uninstall.sh +./scripts/install_django_1_6.sh +#cd .. +python examples/simple/manage.py test fobi --traceback -v 3 +#cd scripts \ No newline at end of file diff --git a/scripts/test_django17.sh b/scripts/test_django_1_7.sh similarity index 82% rename from scripts/test_django17.sh rename to scripts/test_django_1_7.sh index fbf18146..88fc23db 100755 --- a/scripts/test_django17.sh +++ b/scripts/test_django_1_7.sh @@ -1,6 +1,6 @@ reset ./scripts/uninstall.sh -./scripts/install_django17.sh +./scripts/install_django_1_7.sh #cd .. python examples/simple/manage.py test fobi --settings=settings_bootstrap3_theme_django17 --traceback -v 3 #cd scripts \ No newline at end of file diff --git a/scripts/test_django18.sh b/scripts/test_django_1_8.sh similarity index 82% rename from scripts/test_django18.sh rename to scripts/test_django_1_8.sh index cb627634..4d17aae2 100755 --- a/scripts/test_django18.sh +++ b/scripts/test_django_1_8.sh @@ -1,6 +1,6 @@ reset ./scripts/uninstall.sh -./scripts/install_django18.sh +./scripts/install_django_1_8.sh #cd .. python examples/simple/manage.py test fobi --settings=settings_bootstrap3_theme_django18 --traceback -v 3 #cd scripts \ No newline at end of file diff --git a/scripts/test3.sh b/scripts/test_python_3.sh similarity index 77% rename from scripts/test3.sh rename to scripts/test_python_3.sh index ac1f5bbd..12f52a72 100755 --- a/scripts/test3.sh +++ b/scripts/test_python_3.sh @@ -1,6 +1,6 @@ reset ./scripts/uninstall.sh -./scripts/install3.sh +./scripts/install_python_3.sh #cd .. python examples/simple/manage.py test fobi --traceback #cd scripts \ No newline at end of file diff --git a/setup.py b/setup.py index 2a54bbac..05e48e60 100644 --- a/setup.py +++ b/setup.py @@ -63,7 +63,7 @@ for static_dir in static_dirs: for locale_dir in locale_dirs: locale_files += [os.path.join(locale_dir, f) for f in os.listdir(locale_dir)] -version = '0.4.22' +version = '0.4.23' install_requires = [ 'Pillow>=2.0.0', diff --git a/src/fobi/__init__.py b/src/fobi/__init__.py index f57ffdd9..3a1acc07 100644 --- a/src/fobi/__init__.py +++ b/src/fobi/__init__.py @@ -1,6 +1,6 @@ __title__ = 'django-fobi' -__version__ = '0.4.22' -__build__ = 0x000025 +__version__ = '0.4.23' +__build__ = 0x000026 __author__ = 'Artur Barseghyan ' __copyright__ = '2014-2015 Artur Barseghyan' __license__ = 'GPL 2.0/LGPL 2.1' diff --git a/src/fobi/discover.py b/src/fobi/discover.py index 46c4b57e..c3ca5818 100644 --- a/src/fobi/discover.py +++ b/src/fobi/discover.py @@ -1,6 +1,6 @@ __title__ = 'fobi.discover' __author__ = 'Artur Barseghyan ' -__copyright__ = 'Copyright (c) 2014 Artur Barseghyan' +__copyright__ = 'Copyright (c) 2014-2015 Artur Barseghyan' __license__ = 'GPL 2.0/LGPL 2.1' __all__ = ('autodiscover',) @@ -18,10 +18,11 @@ def autodiscover(): """ FORM_ELEMENT_PLUGINS_MODULE_NAME = get_setting('FORM_ELEMENT_PLUGINS_MODULE_NAME') FORM_HANDLER_PLUGINS_MODULE_NAME = get_setting('FORM_HANDLER_PLUGINS_MODULE_NAME') - FORM_IMPORTER_PLUGINS_MODULE_NAME = get_setting('FORM_IMPORTER_PLUGINS_MODULE_NAME') THEMES_MODULE_NAME = get_setting('THEMES_MODULE_NAME') FORM_CALLBACKS_MODULE_NAME = get_setting('FORM_CALLBACKS_MODULE_NAME') + #FORM_IMPORTER_PLUGINS_MODULE_NAME = get_setting('FORM_IMPORTER_PLUGINS_MODULE_NAME') + def do_discover(module_name): for app in settings.INSTALLED_APPS: try: diff --git a/src/fobi/helpers.py b/src/fobi/helpers.py index 98b8c38c..f7205e2b 100644 --- a/src/fobi/helpers.py +++ b/src/fobi/helpers.py @@ -340,7 +340,7 @@ def validate_initial_for_choices(plugin_form, field_name_choices='choices', \ """ availalble_choices = dict( get_select_field_choices(plugin_form.cleaned_data[field_name_choices]) - ).values() + ).keys() if plugin_form.cleaned_data[field_name_initial] \ and not plugin_form.cleaned_data[field_name_initial] \ @@ -364,7 +364,7 @@ def validate_initial_for_multiple_choices(plugin_form, \ """ availalble_choices = dict( get_select_field_choices(plugin_form.cleaned_data[field_name_choices]) - ).values() + ).keys() if plugin_form.cleaned_data[field_name_initial]: for choice in plugin_form.cleaned_data[field_name_initial].split(','):