Merge branch 'master' into wagtail/integration

2026-05-10 22:03:09 +00:00 · 2017-06-13 00:19:31 +02:00 · 2017-06-13 00:19:31 +02:00 · a7a4f4def7
commit a7a4f4def7
parent 7c71c9dbba 8097d146b4
9 changed files with 45 additions and 19 deletions
--- a/README.rst
+++ b/README.rst
@ -15,11 +15,6 @@ Present
 - Django 1.8, 1.9, 1.10 and 1.11.
 - Python 2.7, 3.4, 3.5, 3.6 and PyPy.

-Note, that Django 1.11 is not yet proclaimed to be flawlessly supported. The
-core and contrib packages have been tested against the Django 1.11.
-All tests have successfully passed, although it's yet too early
-to claim that Django 1.11 is fully supported.
-
 Past
 ----
 - Dropping support of Django 1.5, 1.6 has been announced in version
@ -1804,6 +1799,8 @@ It's possible to provide `Dynamic initial values`_ for text elements.
  <https://github.com/barseghyanartur/django-fobi/tree/stable/src/fobi/contrib/plugins/form_elements/fields/date_drop_down/>`_
 - `Decimal
  <https://github.com/barseghyanartur/django-fobi/tree/master/src/fobi/contrib/plugins/form_elements/fields/decimal>`_
+- `Duration
+  <https://github.com/barseghyanartur/django-fobi/tree/master/src/fobi/contrib/plugins/form_elements/fields/duration>`_
 - `Email*
  <https://github.com/barseghyanartur/django-fobi/tree/stable/src/fobi/contrib/plugins/form_elements/fields/email/>`_
 - `File
--- a/docs/index.rst
+++ b/docs/index.rst
@ -15,11 +15,6 @@ Present
 - Django 1.8, 1.9, 1.10 and 1.11.
 - Python 2.7, 3.4, 3.5, 3.6 and PyPy.

-Note, that Django 1.11 is not yet proclaimed to be flawlessly supported. The
-core and contrib packages have been tested against the Django 1.11.
-All tests have successfully passed, although it's yet too early
-to claim that Django 1.11 is fully supported.
-
 Past
 ----
 - Dropping support of Django 1.5, 1.6 has been announced in version
@ -1804,6 +1799,8 @@ It's possible to provide `Dynamic initial values`_ for text elements.
  <https://github.com/barseghyanartur/django-fobi/tree/stable/src/fobi/contrib/plugins/form_elements/fields/date_drop_down/>`_
 - `Decimal
  <https://github.com/barseghyanartur/django-fobi/tree/master/src/fobi/contrib/plugins/form_elements/fields/decimal>`_
+- `Duration
+  <https://github.com/barseghyanartur/django-fobi/tree/master/src/fobi/contrib/plugins/form_elements/fields/duration>`_
 - `Email*
  <https://github.com/barseghyanartur/django-fobi/tree/stable/src/fobi/contrib/plugins/form_elements/fields/email/>`_
 - `File
@ -2733,6 +2730,7 @@ Fields
 - date_drop_down
 - datetime
 - decimal
+- duration
 - email
 - file
 - float
@ -2785,6 +2783,7 @@ the core plugins:
 - fobi.contrib.plugins.form_elements.fields.date_drop_down
 - fobi.contrib.plugins.form_elements.fields.datetime
 - fobi.contrib.plugins.form_elements.fields.decimal
+- fobi.contrib.plugins.form_elements.fields.duration
 - fobi.contrib.plugins.form_elements.fields.email
 - fobi.contrib.plugins.form_elements.fields.file
 - fobi.contrib.plugins.form_elements.fields.float
@ -2823,6 +2822,7 @@ in the ``INSTALLED_APPS`` as well:
 - fobi.contrib.apps.drf_integration.form_elements.fields.date_drop_down
 - fobi.contrib.apps.drf_integration.form_elements.fields.datetime
 - fobi.contrib.apps.drf_integration.form_elements.fields.decimal
+- fobi.contrib.apps.drf_integration.form_elements.fields.duration
 - fobi.contrib.apps.drf_integration.form_elements.fields.email
 - fobi.contrib.apps.drf_integration.form_elements.fields.file
 - fobi.contrib.apps.drf_integration.form_elements.fields.float
@ -2886,6 +2886,7 @@ See the `example settings file
        'fobi.contrib.apps.drf_integration.form_elements.fields.date',
        'fobi.contrib.apps.drf_integration.form_elements.fields.datetime',
        'fobi.contrib.apps.drf_integration.form_elements.fields.decimal',
+        'fobi.contrib.apps.drf_integration.form_elements.fields.duration',
        'fobi.contrib.apps.drf_integration.form_elements.fields.email',
        'fobi.contrib.apps.drf_integration.form_elements.fields.file',
        'fobi.contrib.apps.drf_integration.form_elements.fields.float',
--- a/examples/simple/registration_addons/init.py
+++ b/examples/simple/registration_addons/init.py
--- a/examples/simple/registration_addons/forms.py
+++ b/examples/simple/registration_addons/forms.py
@ -0,0 +1,9 @@
+from captcha.fields import CaptchaField
+
+from registration.forms import RegistrationForm
+
+
+class CaptchaRegistrationForm(RegistrationForm):
+    """Captcha registration form."""
+
+    captcha = CaptchaField()
--- a/examples/simple/settings/base.py
+++ b/examples/simple/settings/base.py
@ -265,6 +265,7 @@ INSTALLED_APPS = [
    # 'tinymce',  # TinyMCE
    'easy_thumbnails',  # Thumbnailer
    'registration',  # Auth views and registration app
+    'captcha',

    # ***********************************************************************
    # ***********************************************************************
@ -484,7 +485,10 @@ PACKAGE_NAME_GRAPPELLI = "grappelli_safe"  # Just for tests
 # ********************* Registration settings ******************
 # **************************************************************

+
 ACCOUNT_ACTIVATION_DAYS = 7
+REGISTRATION_FORM = 'registration_addons.forms.CaptchaRegistrationForm'
+SIMPLE_BACKEND_REDIRECT_URL = '/en/'

 # **************************************************************
 # ************************ Fobi settings ***********************
--- a/examples/simple/settings/bootstrap3_theme_captcha.py
+++ b/examples/simple/settings/bootstrap3_theme_captcha.py
@ -3,10 +3,14 @@ from .base import *
 INSTALLED_APPS = list(INSTALLED_APPS)

 try:
-    INSTALLED_APPS.append('captcha')
-    INSTALLED_APPS.append(
-        'fobi.contrib.plugins.form_elements.security.captcha'
-    )
+    if 'captcha' not in INSTALLED_APPS:
+        INSTALLED_APPS.append('captcha')
+
+    if 'fobi.contrib.plugins.form_elements.security.captcha' \
+            not in INSTALLED_APPS:
+        INSTALLED_APPS.append(
+            'fobi.contrib.plugins.form_elements.security.captcha'
+        )
 except Exception as e:
    pass

--- a/examples/simple/settings/bootstrap3_theme_captcha_feincms.py
+++ b/examples/simple/settings/bootstrap3_theme_captcha_feincms.py
@ -1,10 +1,17 @@
 from .bootstrap3_theme_feincms import *

+INSTALLED_APPS = list(INSTALLED_APPS)
+
 try:

-    INSTALLED_APPS += [
-        'captcha',
-        'fobi.contrib.plugins.form_elements.security.captcha',
-    ]
+    if 'captcha' not in INSTALLED_APPS:
+        INSTALLED_APPS.append('captcha')
+
+    if 'fobi.contrib.plugins.form_elements.security.captcha' \
+            not in INSTALLED_APPS:
+        INSTALLED_APPS.append(
+            'fobi.contrib.plugins.form_elements.security.captcha'
+        )
+
 except Exception as err:
    pass
--- a/examples/simple/urls.py
+++ b/examples/simple/urls.py
@ -52,7 +52,7 @@ url_patterns_args = [
    url(r'^admin/', include(admin.site.urls)),

    # django-registration URLs:
-    url(r'^accounts/', include('registration.backends.default.urls')),
+    url(r'^accounts/', include('registration.backends.simple.urls')),

    # foo URLs:
    url(r'^foo/', include('foo.urls')),
--- a/src/fobi/contrib/apps/drf_integration/README.rst
+++ b/src/fobi/contrib/apps/drf_integration/README.rst
@ -40,6 +40,7 @@ Fields
 - date_drop_down
 - datetime
 - decimal
+- duration
 - email
 - file
 - float
@ -92,6 +93,7 @@ the core plugins:
 - fobi.contrib.plugins.form_elements.fields.date_drop_down
 - fobi.contrib.plugins.form_elements.fields.datetime
 - fobi.contrib.plugins.form_elements.fields.decimal
+- fobi.contrib.plugins.form_elements.fields.duration
 - fobi.contrib.plugins.form_elements.fields.email
 - fobi.contrib.plugins.form_elements.fields.file
 - fobi.contrib.plugins.form_elements.fields.float
@ -130,6 +132,7 @@ in the ``INSTALLED_APPS`` as well:
 - fobi.contrib.apps.drf_integration.form_elements.fields.date_drop_down
 - fobi.contrib.apps.drf_integration.form_elements.fields.datetime
 - fobi.contrib.apps.drf_integration.form_elements.fields.decimal
+- fobi.contrib.apps.drf_integration.form_elements.fields.duration
 - fobi.contrib.apps.drf_integration.form_elements.fields.email
 - fobi.contrib.apps.drf_integration.form_elements.fields.file
 - fobi.contrib.apps.drf_integration.form_elements.fields.float
@ -193,6 +196,7 @@ See the `example settings file
        'fobi.contrib.apps.drf_integration.form_elements.fields.date',
        'fobi.contrib.apps.drf_integration.form_elements.fields.datetime',
        'fobi.contrib.apps.drf_integration.form_elements.fields.decimal',
+        'fobi.contrib.apps.drf_integration.form_elements.fields.duration',
        'fobi.contrib.apps.drf_integration.form_elements.fields.email',
        'fobi.contrib.apps.drf_integration.form_elements.fields.file',
        'fobi.contrib.apps.drf_integration.form_elements.fields.float',