From: Jordan Augé Date: Tue, 2 Jul 2013 16:04:15 +0000 (+0200) Subject: fixed template X-Git-Tag: myslice-0.2-1~115 X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;ds=sidebyside;h=505d063036e7827a8654d4efe89f56a878d86494;p=myslice.git fixed template --- diff --git a/manifold/core/query.py b/manifold/core/query.py index bedf04b6..4aba14b6 100644 --- a/manifold/core/query.py +++ b/manifold/core/query.py @@ -361,9 +361,12 @@ class AnalyzedQuery(Query): if not method in self._subqueries: analyzed_query = AnalyzedQuery(metadata=self.metadata) analyzed_query.action = self.action - try: - type = self.metadata.get_field_type(self.object, method) - except ValueError ,e: # backwards 1..N + if self.metadata: + try: + type = self.metadata.get_field_type(self.object, method) + except ValueError ,e: # backwards 1..N + type = method + else: type = method analyzed_query.object = type self._subqueries[method] = analyzed_query diff --git a/portal/templates/register_user.html b/portal/templates/register_user.html index 8d1d5280..cc3fce0b 100644 --- a/portal/templates/register_user.html +++ b/portal/templates/register_user.html @@ -12,57 +12,11 @@

User registration

-
- - -
- -
{% csrf_token %} - - {% if wizard.form.forms %} - {{ wizard.management_form }} - {% for form in wizard.form.forms %} - {% crispy form form.helper %} - {% endfor %} - {% else %} - {{ wizard.management_form }} - {% crispy wizard.form %} - {% endif %} -
- - {% if wizard.steps.prev %} - - - {% endif %} - -
- - -
-
- {% if wizard.steps.prev %} - - {% endif %} - -
-
-
-
- -
-
- Step {{ wizard.steps.step1 }} of {{ wizard.steps.count }} -
-
-
+{% if envoi %}Votre message a bien été envoyé !{% endif %} + +
{% csrf_token %} +{{ form.as_p }} + +
{% endblock %}