Skip to content

Commit

Permalink
prepare 0.6.3; minor fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
barseghyanartur committed Dec 22, 2015
1 parent 91a880c commit 13fec3e
Show file tree
Hide file tree
Showing 8 changed files with 156 additions and 124 deletions.
6 changes: 6 additions & 0 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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.3
-----
2015-12-23

- Minor fixes.

0.6.2
-----
2015-12-22
Expand Down
10 changes: 0 additions & 10 deletions examples/requirements_docs.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,8 @@ MySQL-python
mailchimp
Sphinx
django-admin-tools>=0.5.2
django-autoslug>=1.7.1
django-debug-toolbar>=0.11.0
django-localeurl>=2.0.2
Pillow>=2.0.0
requests>=1.0.0
django-autoslug>=1.3.0
django-nonefield>=0.1
ordereddict>=1.1
six>=1.4.1
easy-thumbnails>=1.4
vishap>=0.1.3,<2.0
Unidecode>=0.04.1
django-nine>=0.1.6
django-registration-redux>=1.1
docutils
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@
for locale_dir in locale_dirs:
locale_files += [os.path.join(locale_dir, f) for f in os.listdir(locale_dir)]

version = '0.6.2'
version = '0.6.3'

install_requires = [
'Pillow>=2.0.0',
Expand Down
4 changes: 2 additions & 2 deletions src/fobi/__init__.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
__title__ = 'django-fobi'
__version__ = '0.6.2'
__build__ = 0x00004b
__version__ = '0.6.3'
__build__ = 0x00004c
__author__ = 'Artur Barseghyan <artur.barseghyan@gmail.com>'
__copyright__ = '2014-2015 Artur Barseghyan'
__license__ = 'GPL 2.0/LGPL 2.1'
Expand Down
2 changes: 2 additions & 0 deletions src/fobi/form_importers.py
Original file line number Diff line number Diff line change
Expand Up @@ -152,13 +152,15 @@ def ensure_autodiscover():
if not (form_importer_plugin_registry._registry):
autodiscover()


def get_form_importer_plugin_uids():
"""
"""
ensure_autodiscover()
return list(form_importer_plugin_registry._registry.keys())


def get_form_impoter_plugin_urls():
"""
Gets the form importers as a list of tuples.
Expand Down
2 changes: 2 additions & 0 deletions src/fobi/form_utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@

from django.utils.encoding import force_text


class ErrorDict(DjangoErrorDict):
"""
A better ErrorDict.
Expand All @@ -29,6 +30,7 @@ def as_text(self):
for k, v in self.items()]
)


class ErrorList(DjangoErrorList):
"""
A better ErrorList.
Expand Down
20 changes: 9 additions & 11 deletions src/fobi/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,6 @@ def base_sync_plugins(get_plugin_uids_func, PluginModel):
# ****************************************************************************
# ****************************************************************************


def get_allowed_plugin_uids(PluginModel, user):
"""
Gets allowed plugins uids for user given.
Expand All @@ -106,10 +105,10 @@ def get_allowed_plugin_uids(PluginModel, user):
try:
queryset_groups = PluginModel._default_manager.filter(
groups__in = user.groups.all()
).distinct()
).distinct()
queryset_users = PluginModel._default_manager.filter(
users = user
).distinct()
).distinct()
queryset = queryset_groups | queryset_users
queryset = queryset.only('plugin_uid')
return [p.plugin_uid for p in queryset]
Expand Down Expand Up @@ -190,10 +189,10 @@ def get_user_plugins_grouped(get_allowed_plugin_uids_func,
else:
plugin_name = force_text(
plugin.name, encoding='utf-8'
).encode('utf-8')
).encode('utf-8')
plugin_group = force_text(
plugin.group, encoding='utf-8'
).encode('utf-8')
).encode('utf-8')

if not plugin_group in registered_plugins:
registered_plugins[plugin_group] = []
Expand Down Expand Up @@ -242,7 +241,6 @@ def get_user_plugin_uids(get_allowed_plugin_uids_func,
# ****************************************************************************
# ****************************************************************************


def get_allowed_form_element_plugin_uids(user):
"""
"""
Expand Down Expand Up @@ -279,7 +277,7 @@ def get_user_form_field_plugin_uids(user):
get_registered_form_element_plugin_uids,
form_element_plugin_registry,
user
)
)

# ****************************************************************************
# ****************************************************************************
Expand Down Expand Up @@ -310,7 +308,7 @@ def get_user_form_handler_plugins(user,
get_registered_form_handler_plugins,
form_handler_plugin_registry,
user
)
)
user_form_handler_plugin_uids = [plugin_uid
for (plugin_uid, plugin_name)
in user_form_handler_plugins]
Expand All @@ -335,7 +333,7 @@ def get_user_form_handler_plugins(user,
plugin_name = safe_text(plugin.name)
user_form_handler_plugins.remove(
(plugin.uid, plugin_name)
)
)

return user_form_handler_plugins

Expand All @@ -348,7 +346,7 @@ def get_user_form_handler_plugins_grouped(user):
get_registered_form_handler_plugins,
form_handler_plugin_registry,
user
)
)


def get_user_form_handler_plugin_uids(user):
Expand All @@ -359,7 +357,7 @@ def get_user_form_handler_plugin_uids(user):
get_registered_form_handler_plugin_uids,
form_handler_plugin_registry,
user
)
)

# ****************************************************************************
# ****************************************************************************
Expand Down

0 comments on commit 13fec3e

Please sign in to comment.