prepare 0.4.23; fix improper initial value validation for select-like plugins

2026-05-12 06:43:10 +00:00 · 2015-03-03 23:04:10 +01:00 · 2015-03-03 23:04:10 +01:00 · bc899b8b76
commit bc899b8b76
parent 26594cd19e
24 changed files with 39 additions and 25 deletions
--- 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
--- a/scripts/install_django_1_6.bat
+++ b/scripts/install_django_1_6.bat
--- a/scripts/install_django_1_6.sh
+++ b/scripts/install_django_1_6.sh
--- a/scripts/install_django_1_7.sh
+++ b/scripts/install_django_1_7.sh
--- a/scripts/install_django_1_8.sh
+++ b/scripts/install_django_1_8.sh
--- a/scripts/install_python_3.sh
+++ b/scripts/install_python_3.sh
--- a/scripts/reinstall3.sh
+++ b/scripts/reinstall3.sh
@ -1,3 +0,0 @@
-reset
-./scripts/uninstall.sh
-./scripts/install3.sh
--- a/scripts/reinstall_django16.bat
+++ b/scripts/reinstall_django16.bat
@ -1,3 +0,0 @@
-reset
-.\scripts\uninstall.sh
-.\scripts\install_django16.sh
--- a/scripts/reinstall_django16.sh
+++ b/scripts/reinstall_django16.sh
@ -1,3 +0,0 @@
-reset
-./scripts/uninstall.sh
-./scripts/install_django16.sh
--- a/scripts/reinstall_django17.sh
+++ b/scripts/reinstall_django17.sh
@ -1,3 +0,0 @@
-reset
-./scripts/uninstall.sh
-./scripts/install_django17.sh
--- a/scripts/reinstall_django18.sh
+++ b/scripts/reinstall_django18.sh
@ -1,3 +0,0 @@
-reset
-./scripts/uninstall.sh
-./scripts/install_django18.sh
--- a/scripts/reinstall_django_1_6.bat
+++ b/scripts/reinstall_django_1_6.bat
@ -0,0 +1,3 @@
+reset
+.\scripts\uninstall.sh
+.\scripts\install_django_1_6.sh
--- a/scripts/reinstall_django_1_6.sh
+++ b/scripts/reinstall_django_1_6.sh
@ -0,0 +1,3 @@
+reset
+./scripts/uninstall.sh
+./scripts/install_django_1_6.sh
--- a/scripts/reinstall_django_1_7.sh
+++ b/scripts/reinstall_django_1_7.sh
@ -0,0 +1,3 @@
+reset
+./scripts/uninstall.sh
+./scripts/install_django_1_7.sh
--- a/scripts/reinstall_django_1_8.sh
+++ b/scripts/reinstall_django_1_8.sh
@ -0,0 +1,3 @@
+reset
+./scripts/uninstall.sh
+./scripts/install_django_1_8.sh
--- a/scripts/reinstall_python_3.sh
+++ b/scripts/reinstall_python_3.sh
@ -0,0 +1,3 @@
+reset
+./scripts/uninstall.sh
+./scripts/install_python_3.sh
--- a/scripts/test_django_1_6.sh
+++ 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
--- a/scripts/test_django_1_7.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
--- a/scripts/test_django_1_8.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
--- a/scripts/test_python_3.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
--- 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',
--- 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 <artur.barseghyan@gmail.com>'
 __copyright__ = '2014-2015 Artur Barseghyan'
 __license__ = 'GPL 2.0/LGPL 2.1'
--- a/src/fobi/discover.py
+++ b/src/fobi/discover.py
@ -1,6 +1,6 @@
 __title__ = 'fobi.discover'
 __author__ = 'Artur Barseghyan <artur.barseghyan@gmail.com>'
-__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:
--- 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(','):