Merge pull request #2 from Raumkraut/master

Merge Raumkraut's updates

.gitignore

@@ -2,4 +2,5 @@
 .*
 dist
 MANIFEST
+*.egg-info
 

MANIFEST.in

@@ -1,5 +1,5 @@
 include AUTHORS
-include README.md
+include README.rst
 include LICENSE
 recursive-include form_designer/templates *.html *.txt
 recursive-include form_designer/static *.js

README.rst

@@ -24,7 +24,7 @@ This install guide assumes that you are familiar with Python and Django.
 
 - Install the module using pip::
 
-    $ pip install git://github.com/philomat/django-form-designer.git#egg=django-form-designer
+    $ pip install git+git://github.com/philomat/django-form-designer.git#egg=django-form-designer
 
   **or** download it from http://github.com/philomat/django-form-designer, and run the installation 
   script::
@@ -89,6 +89,13 @@ Using Django Form Designer with Django CMS
             'form_designer.contrib.cms_plugins.form_designer_form',
         )
 
+- Optionally add ``form_designer.middleware.RedirectMiddleware to MIDDLEWARE_CLASSES to handle redirects::
+
+        MIDDLEWARE_CLASSES = (
+            ...
+            'form_designer.middleware.RedirectMiddleware',
+        )
+
 - Set up the database tables using::
 
     $ manage.py syncdb

form_designer/admin.py

@@ -28,7 +28,7 @@ class FormDefinitionFieldInline(admin.StackedInline):
 class FormDefinitionAdmin(admin.ModelAdmin):
     fieldsets = [
         (_('Basic'), {'fields': ['name', 'require_hash', 'method', 'action', 'title', 'body']}),
-        (_('Settings'), {'fields': ['allow_get_initial', 'log_data', 'success_redirect', 'success_clear', 'display_logged', 'save_uploaded_files'], 'classes': ['collapse']}),
+        (_('Settings'), {'fields': ['allow_get_initial', 'log_data', 'success_redirect', 'redirection_url', 'success_clear', 'display_logged', 'save_uploaded_files'], 'classes': ['collapse']}),
         (_('Mail form'), {'fields': ['mail_to', 'mail_from', 'mail_subject', 'mail_uploaded_files'], 'classes': ['collapse']}),
         (_('Templates'), {'fields': ['message_template', 'form_template_name'], 'classes': ['collapse']}),
         (_('Messages'), {'fields': ['success_message', 'error_message', 'submit_label'], 'classes': ['collapse']}),

form_designer/contrib/cms_plugins/form_designer_form/cms_plugins.py

@@ -1,10 +1,13 @@
 from form_designer.contrib.cms_plugins.form_designer_form.models import CMSFormDefinition
+from form_designer.exceptions import HttpRedirectException
 from form_designer.views import process_form
 from form_designer import settings
 
 from cms.plugin_base import CMSPluginBase
 from cms.plugin_pool import plugin_pool
 
+from django.conf import settings as django_settings
+from django.http import HttpResponseRedirect
 from django.utils.translation import ugettext as _
 
 
@@ -20,8 +23,12 @@ def render(self, context, instance, placeholder):
         else:
             self.render_template = settings.DEFAULT_FORM_TEMPLATE
 
-        # Redirection does not work with CMS plugin, hence disable:
-        return process_form(context['request'], instance.form_definition, context, disable_redirection=True)
+        disable_redirection = 'form_designer.middleware.RedirectMiddleware' not in django_settings.MIDDLEWARE_CLASSES
+        response = process_form(context['request'], instance.form_definition, context, disable_redirection=disable_redirection)
+        if isinstance(response, HttpResponseRedirect):
+            raise HttpRedirectException(response, "Redirect")
+        return response
+
 
     def icon_src(self, instance):
         return "/static/plugin_icons/form.png"

form_designer/exceptions.py

@@ -0,0 +1,4 @@
+class HttpRedirectException(Exception):
+    def __init__(self, response, *args, **kwargs):
+        self.response = response
+        super(HttpRedirectException, self).__init__(*args, **kwargs)

form_designer/forms.py

@@ -1,5 +1,3 @@
-import os
-
 from django import forms
 from django.forms import widgets
 from django.conf import settings as django_settings
@@ -69,6 +67,6 @@ def _media(self):
         else:
             plugins = ['js/jquery.js'] + plugins
         js.extend(
-            [os.path.join(settings.STATIC_URL, path) for path in plugins])
+            ['/'.join((settings.STATIC_URL, path)) for path in plugins])
         return forms.Media(js=js)
     media = property(_media)

form_designer/locale/fr/LC_MESSAGES/django.po

@@ -7,31 +7,34 @@ msgstr ""
 "Project-Id-Version: 1\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2012-01-19 20:56-0500\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: SIMON CHARETTE <scharette@reptiletech.com>\n"
+"PO-Revision-Date: 2012-12-07 19:43+0100\n"
+"Last-Translator: David Marclay <david.marclay@reason-systems.com>\n"
 "Language-Team: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: \n"
 
-#: admin.py:27 admin.py:38
+#: admin.py:27
+#: admin.py:38
 msgid "Basic"
 msgstr "Base"
 
 #: admin.py:28
 msgid "Display"
 msgstr "Affichage"
 
-#: admin.py:29 settings.py:10
+#: admin.py:29
+#: settings.py:10
 msgid "Text"
 msgstr "Texte"
 
 #: admin.py:30
 msgid "Numbers"
 msgstr "Nombres"
 
-#: admin.py:31 settings.py:23
+#: admin.py:31
+#: settings.py:23
 msgid "Regex"
 msgstr "Expression régulière"
 
@@ -59,20 +62,28 @@ msgstr "Gabarits"
 msgid "Messages"
 msgstr "Messages"
 
-#: admin.py:63 admin.py:102 admin.py:147 models.py:60 models.py:173
+#: admin.py:63
+#: admin.py:102
+#: admin.py:147
+#: models.py:60
+#: models.py:173
 #: contrib/cms_plugins/form_designer_form/cms_plugins.py:14
 msgid "Form"
 msgstr "Formulaire"
 
-#: admin.py:78 models.py:174
+#: admin.py:78
+#: models.py:174
 msgid "Data"
 msgstr "Données"
 
-#: admin.py:104 admin.py:149 models.py:172
+#: admin.py:104
+#: admin.py:149
+#: models.py:172
 msgid "Created"
 msgstr "Créé"
 
-#: admin.py:106 admin.py:151
+#: admin.py:106
+#: admin.py:151
 msgid "ID"
 msgstr "ID"
 
@@ -102,7 +113,8 @@ msgstr "Ce type de champ necessite une expression régulière."
 msgid "This field class requires a model."
 msgstr "Cette classe de champ nécessite un modèle."
 
-#: models.py:35 models.py:187
+#: models.py:35
+#: models.py:187
 msgid "name"
 msgstr "Nom"
 
@@ -112,9 +124,7 @@ msgstr "Obscurcir l'URL vers ce formulaire"
 
 #: models.py:36
 msgid "If enabled, the form can only be reached via a secret URL."
-msgstr ""
-"Si activé, il sera seulement possible d'atteindre le formulaire via une URL "
-"secrète."
+msgstr "Si activé, il sera seulement possible d'atteindre le formulaire via une URL secrète."
 
 #: models.py:39
 msgid "title"
@@ -129,17 +139,8 @@ msgid "target URL"
 msgstr "URL cible"
 
 #: models.py:41
-msgid ""
-"If you leave this empty, the page where the form resides will be requested, "
-"and you can use the mail form and logging features. You can also send data "
-"to external sites: For instance, enter \"http://www.google.ch/search\" to "
-"create a search form."
-msgstr ""
-"Si vous laisser ce champs vide, le formulaire sera envoyé vers la page où il "
-"se trouve et vous pourrez utiliser les fonctionnalités de courriel et de "
-"sauvegarde. Vous pouvez aussi envoyer les données saisies vers un site "
-"externe: Par exemple, entrez \"http://www.google.fr/search\" pour créer un "
-"formulaire de recherche."
+msgid "If you leave this empty, the page where the form resides will be requested, and you can use the mail form and logging features. You can also send data to external sites: For instance, enter \"http://www.google.ch/search\" to create a search form."
+msgstr "Si vous laisser ce champs vide, le formulaire sera envoyé vers la page où il se trouve et vous pourrez utiliser les fonctionnalités de courriel et de sauvegarde. Vous pouvez aussi envoyer les données saisies vers un site externe: Par exemple, entrez \"http://www.google.fr/search\" pour créer un formulaire de recherche."
 
 #: models.py:42
 msgid "send form data to e-mail address"
@@ -155,7 +156,7 @@ msgstr "Sujet du courriel"
 
 #: models.py:45
 msgid "Send uploaded files as email attachments"
-msgstr "Joindre les fichiers téléversés aux courriels."
+msgstr "Joindre les fichiers téléversés aux courriels"
 
 #: models.py:46
 msgid "method"
@@ -187,9 +188,7 @@ msgstr "Sauver les fichiers téléversés"
 
 #: models.py:51
 msgid "Saves all uploaded files using server storage."
-msgstr ""
-"Sauve tous les fichiers téléversés en utilisant la mécanique de stockage du "
-"serveur."
+msgstr "Sauve tous les fichiers téléversés en utilisant la mécanique de stockage du serveur."
 
 #: models.py:52
 msgid "HTTP redirect after successful submission"
@@ -204,31 +203,16 @@ msgid "allow initial values via URL"
 msgstr "Permettre l'assignation de valeurs via l'URL"
 
 #: models.py:54
-msgid ""
-"If enabled, you can fill in form fields by adding them to the query string."
-msgstr ""
-"Si activé, vous pouvez populer les champs du formulaire en les ajoutants à "
-"la chaîne de requête: Par exemple \"http://chemin.vers/mon/formulaire?"
-"prenom=Serge"
+msgid "If enabled, you can fill in form fields by adding them to the query string."
+msgstr "Si activé, vous pouvez préremplir les champs du formulaire en les ajoutants à la chaîne de requête: Par exemple \"http://chemin.vers/mon/formulaire?prenom=Serge"
 
 #: models.py:55
 msgid "message template"
 msgstr "Gabarit de message de courriel"
 
 #: models.py:55
-msgid ""
-"Your form fields are available as template context. Example: \"{{ message }}"
-"\" if you have a field named `message`. To iterate over all fields, use the "
-"variable `data` (a list containing a dictionary for each form field, each "
-"containing the elements `name`, `label`, `value`)."
-msgstr ""
-"Vos champs de formulaire sont accessibles sous forme de variables de "
-"gabarits.Par exemple: \"{{ message }}\" si vous avez un champ nommé &laquo;"
-"&thinsp;message&thinsp;&raquo;.Pour itérer sur l'ensemble des champs, "
-"utilisez la variables &laquo;&thinsp;data&thinsp;&raquo; (&thinsp;une liste "
-"de dictionnaires associé à chaque champ avec les clefs &laquo;&thinsp;"
-"name&thinsp;&raquo;, &laquo;&thinsp;label&thinsp;&raquo;, &laquo;&thinsp;"
-"value&thinsp;&raquo;&thinsp;)"
+msgid "Your form fields are available as template context. Example: \"{{ message }}\" if you have a field named `message`. To iterate over all fields, use the variable `data` (a list containing a dictionary for each form field, each containing the elements `name`, `label`, `value`)."
+msgstr "Vos champs de formulaire sont accessibles sous forme de variables de gabarits.Par exemple: \"{{ message }}\" si vous avez un champ nommé &laquo;&thinsp;message&thinsp;&raquo;.Pour itérer sur l'ensemble des champs, utilisez la variables &laquo;&thinsp;data&thinsp;&raquo; (&thinsp;une liste de dictionnaires associé à chaque champ avec les clefs &laquo;&thinsp;name&thinsp;&raquo;, &laquo;&thinsp;label&thinsp;&raquo;, &laquo;&thinsp;value&thinsp;&raquo;&thinsp;)"
 
 #: models.py:56
 msgid "form template"
@@ -304,23 +288,23 @@ msgstr "Un libellé par ligne"
 
 #: models.py:198
 msgid "max. length"
-msgstr "Longueur maximale"
+msgstr "Longueur max."
 
 #: models.py:199
 msgid "min. length"
-msgstr "Longueur minimale"
+msgstr "Longueur min."
 
 #: models.py:200
 msgid "max. value"
-msgstr "Valeur maximale"
+msgstr "Valeur max."
 
 #: models.py:201
 msgid "min. value"
-msgstr "Valeur minimale"
+msgstr "Valeur min."
 
 #: models.py:202
 msgid "max. digits"
-msgstr "Nombre de chiffres maximum"
+msgstr "Nombre de chiffres max."
 
 #: models.py:203
 msgid "decimal places"
@@ -398,9 +382,10 @@ msgstr "Choix Multiple de Modèle"
 msgid "File"
 msgstr "Fichier"
 
-#: settings.py:29 settings.py:37
+#: settings.py:29
+#: settings.py:37
 msgid "Default"
-msgstr "Défaut"
+msgstr "Par défaut"
 
 #: settings.py:30
 msgid "Text area"
@@ -440,16 +425,16 @@ msgstr "implémentation personnalisée"
 
 #: uploads.py:20
 msgid "This field is required."
-msgstr "Cette classe de champ nécessite un modèle."
+msgstr "Ce champs est obligatoire."
 
 #: uploads.py:25
 msgid "This file type is not allowed."
-msgstr ""
+msgstr "Le type de fichier n'est pas autorisé."
 
 #: uploads.py:27
 #, python-format
 msgid "Please keep file size under %(max_size)s. Current size is %(size)s."
-msgstr ""
+msgstr "Merci de ne pas dépasser la taille maximale de %(max_size)s. Taille actuelle : %(size)s."
 
 #: views.py:21
 msgid "Thank you, the data was submitted successfully."
@@ -486,3 +471,4 @@ msgstr "oui"
 #: templatetags/friendly.py:18
 msgid "no"
 msgstr "non"
+