diff --git a/CHANGELOG.rst b/CHANGELOG.rst index dd0b291b..5bcee0fb 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -15,6 +15,12 @@ are used for versioning (schema follows below): 0.3.4 to 0.4). - All backwards incompatible changes are mentioned in this document. +0.6.4 +----- +2015-12-24 + +- Minor fixes. + 0.6.3 ----- 2015-12-23 diff --git a/examples/requirements_django_1_9.txt b/examples/requirements_django_1_9.txt index 8913d0bc..d0d2789c 100644 --- a/examples/requirements_django_1_9.txt +++ b/examples/requirements_django_1_9.txt @@ -9,7 +9,7 @@ django-formtools==1.0 django-localeurl==2.0.2 django-nine==0.1.6 django-nonefield==0.1 -django-registration-redux==1.3a0 +django-registration-redux>=1.3a0 docopt==0.4.0 docutils==0.12 easy-thumbnails==2.3 diff --git a/examples/requirements_docs.txt b/examples/requirements_docs.txt index e67d0194..68cadb94 100644 --- a/examples/requirements_docs.txt +++ b/examples/requirements_docs.txt @@ -10,7 +10,7 @@ django-debug-toolbar>=0.11.0 django-formtools django-localeurl>=2.0.2 django-nine>=0.1.6 -django-registration-redux>=1.1 +django-registration-redux>=1.3a0 docutils ipdb ipython diff --git a/setup.py b/setup.py index 39d38459..93bd81ca 100644 --- a/setup.py +++ b/setup.py @@ -69,7 +69,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.6.3' +version = '0.6.4' install_requires = [ 'Pillow>=2.0.0', diff --git a/src/fobi/__init__.py b/src/fobi/__init__.py index 7abf11ec..dbab70c3 100644 --- a/src/fobi/__init__.py +++ b/src/fobi/__init__.py @@ -1,6 +1,6 @@ __title__ = 'django-fobi' -__version__ = '0.6.3' -__build__ = 0x00004c +__version__ = '0.6.4' +__build__ = 0x00004d __author__ = 'Artur Barseghyan ' __copyright__ = '2014-2015 Artur Barseghyan' __license__ = 'GPL 2.0/LGPL 2.1' diff --git a/src/fobi/contrib/plugins/form_handlers/db_store/models.py b/src/fobi/contrib/plugins/form_handlers/db_store/models.py index e6184867..c00433db 100644 --- a/src/fobi/contrib/plugins/form_handlers/db_store/models.py +++ b/src/fobi/contrib/plugins/form_handlers/db_store/models.py @@ -51,15 +51,18 @@ class SavedFormDataEntry(models.Model): :return string: """ - headers = json.loads(self.form_data_headers) - data = json.loads(self.saved_data) - for key, value in data.items(): - if isinstance(value, string_types) and \ - (value.startswith(settings.MEDIA_URL) or \ - value.startswith('http://') or value.startswith('https://')): + try: + headers = json.loads(self.form_data_headers) + data = json.loads(self.saved_data) + for key, value in data.items(): + if isinstance(value, string_types) and \ + (value.startswith(settings.MEDIA_URL) or \ + value.startswith('http://') or value.startswith('https://')): - data[key] = '{value}'.format(value=value) + data[key] = '{value}'.format(value=value) - return two_dicts_to_string(headers, data) + return two_dicts_to_string(headers, data) + except (ValueError, json.decoder.JSONDecodeError as err): + return '' formatted_saved_data.allow_tags = True formatted_saved_data.short_description = _("Saved data")