Hopiu/django-fobi
1
0
Fork 0
mirror of https://github.com/Hopiu/django-fobi.git synced 2026-05-11 14:23:09 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

prepare 0.8.2; minor fixes

Browse source
This commit is contained in:
Artur Barseghyan 2016-10-18 02:34:07 +02:00
parent c9dbb2ffd3
commit 8a9f53b434
8 changed files with 53 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
CHANGELOG.rst
View file

@ -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.8.2
-----
2016-10-18
- Minor fixes.
0.8.1
-----
2016-10-17

2
setup.py
View file

@ -138,7 +138,7 @@ for locale_dir in locale_dirs:
for f
in os.listdir(locale_dir)]
version = '0.8.1'
version = '0.8.2'
install_requires = [
'Pillow>=2.0.0',

4
src/fobi/__init__.py
View file

@ -1,6 +1,6 @@
__title__ = 'django-fobi'
__version__ = '0.8.1'
__build__ = 0x000058
__version__ = '0.8.2'
__build__ = 0x000059
__author__ = 'Artur Barseghyan <artur.barseghyan@gmail.com>'
__copyright__ = '2014-2016 Artur Barseghyan'
__license__ = 'GPL 2.0/LGPL 2.1'

14
src/fobi/contrib/plugins/form_elements/fields/select_model_object/fobi_form_elements.py
View file

@ -8,7 +8,11 @@ from fobi.base import FormFieldPlugin, form_element_plugin_registry, get_theme
from fobi.constants import (
SUBMIT_VALUE_AS_VAL, SUBMIT_VALUE_AS_REPR
)
from fobi.helpers import safe_text, get_app_label_and_model_name
from fobi.helpers import (
safe_text,
get_app_label_and_model_name,
get_model_name_for_object
)
from . import UID
from .forms import SelectModelObjectInputForm
@ -77,17 +81,17 @@ class SelectModelObjectInputPlugin(FormFieldPlugin):
elif SUBMIT_VALUE_AS == SUBMIT_VALUE_AS_VAL:
value = '{0}.{1}.{2}'.format(
obj._meta.app_label,
obj._meta.module_name,
get_model_name_for_object(obj),
obj.pk
)
)
else:
# Handle the submitted form value
value = '{0}.{1}.{2}.{3}'.format(
obj._meta.app_label,
obj._meta.module_name,
get_model_name_for_object(obj),
obj.pk,
safe_text(obj)
)
)
# Overwrite ``cleaned_data`` of the ``form`` with object
# qualifier.

14
src/fobi/contrib/plugins/form_elements/fields/select_mptt_model_object/fobi_form_elements.py
View file

@ -7,7 +7,11 @@ from fobi.base import FormFieldPlugin, form_element_plugin_registry, get_theme
from fobi.constants import (
SUBMIT_VALUE_AS_VAL, SUBMIT_VALUE_AS_REPR
)
from fobi.helpers import safe_text, get_app_label_and_model_name
from fobi.helpers import (
safe_text,
get_app_label_and_model_name,
get_model_name_for_object
)
from nine.versions import DJANGO_GTE_1_7
@ -78,17 +82,17 @@ class SelectMPTTModelObjectInputPlugin(FormFieldPlugin):
elif SUBMIT_VALUE_AS == SUBMIT_VALUE_AS_VAL:
value = '{0}.{1}.{2}'.format(
obj._meta.app_label,
obj._meta.module_name,
get_model_name_for_object(obj),
obj.pk
)
)
else:
# Handle the submitted form value
value = '{0}.{1}.{2}.{3}'.format(
obj._meta.app_label,
obj._meta.module_name,
get_model_name_for_object(obj),
obj.pk,
safe_text(obj)
)
)
# Overwrite ``cleaned_data`` of the ``form`` with object qualifier.
form.cleaned_data[self.data.name] = value

14
src/fobi/contrib/plugins/form_elements/fields/select_multiple_model_objects/fobi_form_elements.py
View file

@ -8,7 +8,11 @@ from fobi.base import FormFieldPlugin, form_element_plugin_registry, get_theme
from fobi.constants import (
SUBMIT_VALUE_AS_VAL, SUBMIT_VALUE_AS_REPR
)
from fobi.helpers import safe_text, get_app_label_and_model_name
from fobi.helpers import (
safe_text,
get_app_label_and_model_name,
get_model_name_for_object
)
from nine.versions import DJANGO_GTE_1_7
@ -85,17 +89,17 @@ class SelectMultipleModelObjectsInputPlugin(FormFieldPlugin):
elif SUBMIT_VALUE_AS == SUBMIT_VALUE_AS_VAL:
value = '{0}.{1}.{2}'.format(
obj._meta.app_label,
obj._meta.module_name,
get_model_name_for_object(obj),
obj.pk
)
)
else:
# Handle the submitted form value
value = '{0}.{1}.{2}.{3}'.format(
obj._meta.app_label,
obj._meta.module_name,
get_model_name_for_object(obj),
obj.pk,
safe_text(obj)
)
)
values.append(value)
# Overwrite ``cleaned_data`` of the ``form`` with object qualifier.

14
src/fobi/contrib/plugins/form_elements/fields/select_multiple_mptt_model_objects/fobi_form_elements.py
View file

@ -9,7 +9,11 @@ from fobi.base import FormFieldPlugin, form_element_plugin_registry, get_theme
from fobi.constants import (
SUBMIT_VALUE_AS_VAL, SUBMIT_VALUE_AS_REPR
)
from fobi.helpers import safe_text, get_app_label_and_model_name
from fobi.helpers import (
safe_text,
get_app_label_and_model_name,
get_model_name_for_object
)
from nine.versions import DJANGO_GTE_1_7
@ -85,17 +89,17 @@ class SelectMultipleMPTTModelObjectsInputPlugin(FormFieldPlugin):
elif SUBMIT_VALUE_AS == SUBMIT_VALUE_AS_VAL:
value = '{0}.{1}.{2}'.format(
obj._meta.app_label,
obj._meta.module_name,
get_model_name_for_object(obj),
obj.pk
)
)
else:
# Handle the submitted form value
value = '{0}.{1}.{2}.{3}'.format(
obj._meta.app_label,
obj._meta.module_name,
get_model_name_for_object(obj),
obj.pk,
safe_text(obj)
)
)
values.append(value)
# Overwrite ``cleaned_data`` of the ``form`` with object qualifier.

8
src/fobi/helpers.py
View file

@ -52,6 +52,7 @@ __all__ = (
'ensure_unique_filename',
'get_app_label_and_model_name',
'get_form_element_entries_for_form_wizard_entry',
'get_model_name_for_object',
'get_registered_models',
'get_select_field_choices',
'handle_uploaded_file',
@ -194,6 +195,13 @@ def get_ignorable_form_values():
"""
return [None, empty_string]
def get_model_name_for_object(obj):
"""Get model name for object.
Django version agnostic."""
return obj._meta.model_name if DJANGO_GTE_1_7 else obj._meta.module_name
# *****************************************************************************
# *****************************************************************************
# ****************************** File helpers *********************************