From 81231a150cdabc2db7c2887c74b33b772161ea00 Mon Sep 17 00:00:00 2001 From: Artur Barseghyan Date: Sat, 10 Jun 2017 02:53:08 +0200 Subject: [PATCH 1/2] ignore pattern updated --- .hgignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgignore b/.hgignore index 82425ef6..42834cf8 100644 --- a/.hgignore +++ b/.hgignore @@ -4,6 +4,7 @@ syntax: regexp \.gitignore~ \ghostdriver\.log \.git/ +\.git_/ \.tox/ \.cache/ \.coverage$ From 8097d146b4f943d56357fe8b253e715e4ab7e3ad Mon Sep 17 00:00:00 2001 From: Artur Barseghyan Date: Tue, 13 Jun 2017 00:19:13 +0200 Subject: [PATCH 2/2] switch to simple registration with captcha for example project; update docs --- README.rst | 7 ++----- docs/index.rst | 11 ++++++----- examples/simple/registration_addons/__init__.py | 0 examples/simple/registration_addons/forms.py | 9 +++++++++ examples/simple/settings/base.py | 4 ++++ .../simple/settings/bootstrap3_theme_captcha.py | 12 ++++++++---- .../settings/bootstrap3_theme_captcha_feincms.py | 15 +++++++++++---- examples/simple/urls.py | 2 +- src/fobi/contrib/apps/drf_integration/README.rst | 4 ++++ 9 files changed, 45 insertions(+), 19 deletions(-) create mode 100644 examples/simple/registration_addons/__init__.py create mode 100644 examples/simple/registration_addons/forms.py diff --git a/README.rst b/README.rst index e0d1e4a6..92f7ef37 100644 --- 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. `_ - `Decimal `_ +- `Duration + `_ - `Email* `_ - `File diff --git a/docs/index.rst b/docs/index.rst index bd8a78ce..1d59ebf1 100644 --- 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. `_ - `Decimal `_ +- `Duration + `_ - `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', diff --git a/examples/simple/registration_addons/__init__.py b/examples/simple/registration_addons/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/examples/simple/registration_addons/forms.py b/examples/simple/registration_addons/forms.py new file mode 100644 index 00000000..cec6f04a --- /dev/null +++ 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() diff --git a/examples/simple/settings/base.py b/examples/simple/settings/base.py index de29bde6..9188dc80 100644 --- 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 *********************** diff --git a/examples/simple/settings/bootstrap3_theme_captcha.py b/examples/simple/settings/bootstrap3_theme_captcha.py index 2d8ed0dd..c938d3aa 100644 --- 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 diff --git a/examples/simple/settings/bootstrap3_theme_captcha_feincms.py b/examples/simple/settings/bootstrap3_theme_captcha_feincms.py index d8ac44e5..dad0d18b 100644 --- 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 diff --git a/examples/simple/urls.py b/examples/simple/urls.py index 03d02935..1dd5029e 100644 --- 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')), diff --git a/src/fobi/contrib/apps/drf_integration/README.rst b/src/fobi/contrib/apps/drf_integration/README.rst index 081414b0..f1aafc4e 100644 --- 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',