prepare 0.5.6; django-mptt support; python 3 fixes

.gitignore

@@ -43,4 +43,4 @@ fobi/fobi.migrations.rst
 /scripts/install_django_1_7_wagtail.sh
 /scripts/reinstall_django_1_7_wagtail.sh
 /src/fobi/contrib/apps/wagtail_integration/
-/src/fobi/contrib/plugins/form_elements/fields/select_mptt_model_object/
+

CHANGELOG.rst

@@ -15,6 +15,14 @@ are used for versioning (schema follows below):
   0.3.4 to 0.4).
 - All backwards incompatible changes are mentioned in this document.
 
+0.5.6
+-----
+2015-07-31
+
+- `django-mptt` support through `select_mptt_model_object` and
+  `select_multiple_mptt_model_objects` plugins.
+- Python 3 fixes.
+
 0.5.5
 -----
 2015-06-30

CREDITS.rst

@@ -1,11 +1,11 @@
 Credits
-======================
+=======
 Authors
-----------------------
+-------
 - `Artur Barseghyan <https://github.com/barseghyanartur/>`_.
 
 Contributors
-----------------------
+------------
 - `Maximilian Kindshofer
   <https://github.com/barseghyanartur/django-fobi/commits/master?author=MaximilianKindshofer>`_
   for German translations.

README.rst

@@ -1338,6 +1338,13 @@ Security
   `Anti-spam honeypot <http://en.wikipedia.org/wiki/Anti-spam_techniques#Honeypots>`_
   field.
 
+MPTT fields
+~~~~~~~~~~~
+- `Select MPTT model object (drop-down)
+  <https://github.com/barseghyanartur/django-fobi/tree/stable/src/fobi/contrib/plugins/form_elements/fields/select_mptt_model_object/>`_
+- `Select multiple MPTT model objects (drop-down)
+  <https://github.com/barseghyanartur/django-fobi/tree/stable/src/fobi/contrib/plugins/form_elements/fields/select_multiple_mptt_model_objects/>`_
+
 Test
 ~~~~
 Test plugins are made for dev purposes only.
@@ -1445,10 +1452,14 @@ See the README.rst in each of the following plugins for more information.
   <https://github.com/barseghyanartur/django-fobi/tree/stable/src/fobi/contrib/plugins/form_elements/fields/select/>`__
 - `Select model object (drop-down)
   <https://github.com/barseghyanartur/django-fobi/tree/stable/src/fobi/contrib/plugins/form_elements/fields/select_model_object/>`__
+- `Select MPTT model object (drop-down)
+  <https://github.com/barseghyanartur/django-fobi/tree/stable/src/fobi/contrib/plugins/form_elements/fields/select_mptt_model_object/>`__
 - `Select multiple (drop-down)
   <https://github.com/barseghyanartur/django-fobi/tree/stable/src/fobi/contrib/plugins/form_elements/fields/select_multiple/>`__
 - `Select multiple model objects (drop-down)
   <https://github.com/barseghyanartur/django-fobi/tree/stable/src/fobi/contrib/plugins/form_elements/fields/select_multiple_model_objects/>`__
+- `Select multiple MPTT model objects (drop-down)
+  <https://github.com/barseghyanartur/django-fobi/tree/stable/src/fobi/contrib/plugins/form_elements/fields/select_multiple_mptt_model_objects/>`__
 
 Rendering forms using third-party libraries
 ===========================================

ROADMAP.rst

@@ -23,15 +23,13 @@ change of the name of the "simple" theme into "django_admin_style" theme.
 - Internally, make a date when form has been created. Also keep track of when
   the form has been last edited.
 
-0.5.6
+0.5.7
 -----
 yyyy-mm-dd (upcoming).
 
 - Export/import forms saved as JSON. Validate the imports and mention that
   some plugins are not installed if there are plugins that should be installed
   first.
-- `django-mptt` form- and model- fields (`select_mptt_model_object` and
-  `select_multiple_mptt_model_objects`).
 - Made it possible to define dynamic fields and use then in the form. Let
   developers themselves define what should be in there and the contents of it
   (pluggable and replaceable).

SCREENSHOTS.rst

@@ -1,26 +1,26 @@
 
 Screenshots
-===============================================
+===========
 Bootstrap3 theme
------------------------------------------------
+----------------
 Dashboard
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+~~~~~~~~~
 .. [1.1] Dashboard
 
 .. image:: _static/bootstrap3/01_dashboard.png
     :scale: 80 %
 
 Create a form
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+~~~~~~~~~~~~~
 .. [1.2] Create a form
 
 .. image:: _static/bootstrap3/02_create_form.png
     :scale: 80 %
 
 View/edit form
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+~~~~~~~~~~~~~~
 Form elements
-+++++++++++++++++++++++++++++++++++++++++++++++
++++++++++++++
 .. [1.3] Edit form - form elements tab active, no elements yet
 
 .. image:: _static/bootstrap3/03_edit_form_-_form_elements_tab_active_-_no_elements_yet.png
@@ -42,7 +42,7 @@ Form elements
     :scale: 80 %
 
 Form handlers
-+++++++++++++++++++++++++++++++++++++++++++++++
++++++++++++++
 
 .. [1.7] Edit form - form handlers tab active, no handlers yet
 
@@ -100,9 +100,9 @@ Form handlers
     :scale: 80 %
 
 Simple theme
------------------------------------------------
+------------
 View/edit form
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+~~~~~~~~~~~~~~
 .. [2.1] Edit form - form elements tab active, with form elements
 
 .. image:: _static/simple/01_edit_form_-_form_elements_tab_active_with_elements.png

TODOS.rst

@@ -228,6 +228,17 @@ Must haves
 + Take default values provided in the `plugin_data_fields` of the plugin
   form into consideration (provide as initial on in the form element creation
   form).
++ `django-mptt` fields.
++ Move the `NoneField` and `NoneWidget` into a separate package.
++ Check if `action` is a valid URL. Make `fobi.models.FormEntry.action` a URL
+  field. Make sure relative URLs work as well.
++ Create a error page for the heroku demo, warning that perhaps user had
+  chosen a wrong `action`.
++ In the heroku demo app, make a real error page saying - page can't e found.
+  Can it be that you mistyped the action URL?
++ Make sure, that theme specific theme javascripts, css and other assets,
+  are defined in the theme itself. Follow the ``django-dash``
+  example as much as possible.
 - Since tests have been made quite general, create them for all contrib
   form elements and handlers (not yet for things like CAPTCHA).
 - Translate German and Russian URLs.
@@ -249,10 +260,7 @@ Must haves
   part).
 - Split the ``FOBI_RESTRICT_PLUGIN_ACCESS`` into two: one for form elements
   and one for form handlers.
-- Make sure, that theme specific theme javascripts, css and other assets,
-  are defined in the theme itself. Follow the ``django-dash``
-  example as much as possible.
-- Improve the "simple" theme for Django 1.6 and Django 1.7 (tiny bits of 
+- Improve the "simple" theme for Django 1.6 and Django 1.7 (tiny bits of
   styling).
 - Edit form test.
 - Edit form element tests.
@@ -263,19 +271,11 @@ Must haves
 - Move reusable parts (for example, the `get_form_field_type` and
   `get_form_hidden_fields_errors` template tags into another template tag
   library or product to reuse it in Django-dash as well. Move the permission
-  code from `decorators` into a separate package. Move the `NoneField` and
-  `NoneWidget` into a separate package.
-- Check if `action` is a valid URL. Make `fobi.models.FormEntry.action` a URL
-  field. Make sure relative URLs work as well.
-- Create a error page for the heroku demo, warning that perhaps user had
-  chosen a wrong `action`.
-- `django-mptt` form field and model field.
+  code from `decorators` into a separate package.
 - Make it possible to define dynamic values and use then in the form. Let
   developers themselves define what should be in there (some sort of
   register in global scope, maybe just a context processor).
   Make it pluggable and replaceable.
-- In the heroku demo app, make a real error page saying - page can't e found.
-  Can it be that you mistyped the action URL?
 
 Should haves
 ============
@@ -323,6 +323,8 @@ Should haves
   set to True tests fail).
 + Fix the issue with `initial` for `select_multiple` plugin. At the moment,
   setting initial doesn't seem to work.
+- Make it possible to export form to JSON format. It should be possible to
+  re-created form from saved JSON sa well.
 - Wagtail integration.
 - Document the changes.
 - Find out why subclassing the ``select_model_object`` plugin didn't work.

docs/Makefile

@@ -30,7 +30,6 @@ help:
 	@echo "  json       to make JSON files"
 	@echo "  htmlhelp   to make HTML files and a HTML help project"
 	@echo "  qthelp     to make HTML files and a qthelp project"
-	@echo "  applehelp  to make an Apple Help Book"
 	@echo "  devhelp    to make HTML files and a Devhelp project"
 	@echo "  epub       to make an epub"
 	@echo "  latex      to make LaTeX files, you can set PAPER=a4 or PAPER=letter"
@@ -91,14 +90,6 @@ qthelp:
 	@echo "To view the help file:"
 	@echo "# assistant -collectionFile $(BUILDDIR)/qthelp/django-fobi.qhc"
 
-applehelp:
-	$(SPHINXBUILD) -b applehelp $(ALLSPHINXOPTS) $(BUILDDIR)/applehelp
-	@echo
-	@echo "Build finished. The help book is in $(BUILDDIR)/applehelp."
-	@echo "N.B. You won't be able to view it unless you put it in" \
-	      "~/Library/Documentation/Help or install it in your application" \
-	      "bundle."
-
 devhelp:
 	$(SPHINXBUILD) -b devhelp $(ALLSPHINXOPTS) $(BUILDDIR)/devhelp
 	@echo

docs/fobi.contrib.apps.rst

@@ -9,6 +9,7 @@ Subpackages
     fobi.contrib.apps.djangocms_integration
     fobi.contrib.apps.feincms_integration
     fobi.contrib.apps.mezzanine_integration
+    fobi.contrib.apps.wagtail_integration
 
 Module contents
 ---------------

docs/fobi.contrib.apps.wagtail_integration.rst

@@ -0,0 +1,62 @@
+fobi.contrib.apps.wagtail_integration package
+=============================================
+
+Submodules
+----------
+
+fobi.contrib.apps.wagtail_integration.apps module
+-------------------------------------------------
+
+.. automodule:: fobi.contrib.apps.wagtail_integration.apps
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
+fobi.contrib.apps.wagtail_integration.conf module
+-------------------------------------------------
+
+.. automodule:: fobi.contrib.apps.wagtail_integration.conf
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
+fobi.contrib.apps.wagtail_integration.defaults module
+-----------------------------------------------------
+
+.. automodule:: fobi.contrib.apps.wagtail_integration.defaults
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
+fobi.contrib.apps.wagtail_integration.helpers module
+----------------------------------------------------
+
+.. automodule:: fobi.contrib.apps.wagtail_integration.helpers
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
+fobi.contrib.apps.wagtail_integration.models module
+---------------------------------------------------
+
+.. automodule:: fobi.contrib.apps.wagtail_integration.models
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
+fobi.contrib.apps.wagtail_integration.settings module
+-----------------------------------------------------
+
+.. automodule:: fobi.contrib.apps.wagtail_integration.settings
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
+
+Module contents
+---------------
+
+.. automodule:: fobi.contrib.apps.wagtail_integration
+    :members:
+    :undoc-members:
+    :show-inheritance:

docs/fobi.contrib.plugins.form_elements.fields.rst

@@ -26,8 +26,10 @@ Subpackages
     fobi.contrib.plugins.form_elements.fields.regex
     fobi.contrib.plugins.form_elements.fields.select
     fobi.contrib.plugins.form_elements.fields.select_model_object
+    fobi.contrib.plugins.form_elements.fields.select_mptt_model_object
     fobi.contrib.plugins.form_elements.fields.select_multiple
     fobi.contrib.plugins.form_elements.fields.select_multiple_model_objects
+    fobi.contrib.plugins.form_elements.fields.select_multiple_mptt_model_objects
     fobi.contrib.plugins.form_elements.fields.slug
     fobi.contrib.plugins.form_elements.fields.text
     fobi.contrib.plugins.form_elements.fields.textarea

docs/fobi.contrib.plugins.form_elements.fields.select_mptt_model_object.rst

@@ -0,0 +1,62 @@
+fobi.contrib.plugins.form_elements.fields.select_mptt_model_object package
+==========================================================================
+
+Submodules
+----------
+
+fobi.contrib.plugins.form_elements.fields.select_mptt_model_object.apps module
+------------------------------------------------------------------------------
+
+.. automodule:: fobi.contrib.plugins.form_elements.fields.select_mptt_model_object.apps
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
+fobi.contrib.plugins.form_elements.fields.select_mptt_model_object.conf module
+------------------------------------------------------------------------------
+
+.. automodule:: fobi.contrib.plugins.form_elements.fields.select_mptt_model_object.conf
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
+fobi.contrib.plugins.form_elements.fields.select_mptt_model_object.defaults module
+----------------------------------------------------------------------------------
+
+.. automodule:: fobi.contrib.plugins.form_elements.fields.select_mptt_model_object.defaults
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
+fobi.contrib.plugins.form_elements.fields.select_mptt_model_object.fobi_form_elements module
+--------------------------------------------------------------------------------------------
+
+.. automodule:: fobi.contrib.plugins.form_elements.fields.select_mptt_model_object.fobi_form_elements
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
+fobi.contrib.plugins.form_elements.fields.select_mptt_model_object.forms module
+-------------------------------------------------------------------------------
+
+.. automodule:: fobi.contrib.plugins.form_elements.fields.select_mptt_model_object.forms
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
+fobi.contrib.plugins.form_elements.fields.select_mptt_model_object.settings module
+----------------------------------------------------------------------------------
+
+.. automodule:: fobi.contrib.plugins.form_elements.fields.select_mptt_model_object.settings
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
+
+Module contents
+---------------
+
+.. automodule:: fobi.contrib.plugins.form_elements.fields.select_mptt_model_object
+    :members:
+    :undoc-members:
+    :show-inheritance: