Implemented one-time login on account confirm.

[philo.git] / forms.py

diff --git a/forms.py b/forms.py
index b428d28..8050d39 100644 (file)
--- a/forms.py
+++ b/forms.py
@@ -1,6 +1,8 @@
+from django.core.exceptions import ValidationError

 from django.forms.models import model_to_dict, fields_for_model, ModelFormMetaclass, ModelForm
 from django.forms.models import model_to_dict, fields_for_model, ModelFormMetaclass, ModelForm

+from django.template import loader, loader_tags, TemplateDoesNotExist, Context, Template as DjangoTemplate

 from django.utils.datastructures import SortedDict
 from django.utils.datastructures import SortedDict

-from philo.models import Entity
+from philo.models import Entity, Template

 from philo.models.fields import RelationshipField
 from philo.utils import fattr
 
 from philo.models.fields import RelationshipField
 from philo.utils import fattr
 


@@ -30,7 +32,7 @@ def proxy_fields_for_entity_model(entity_model, fields=None, exclude=None, widge
        if fields:
                field_dict = SortedDict(
                        [(f, field_dict.get(f)) for f in fields
        if fields:
                field_dict = SortedDict(
                        [(f, field_dict.get(f)) for f in fields

-                               if ((not exclude) or (exclude and f not in exclude)) and (f not in ignored)]
+                               if ((not exclude) or (exclude and f not in exclude)) and (f not in ignored) and (f in field_dict)]

                )
        return field_dict
 
                )
        return field_dict
 


@@ -86,4 +88,35 @@ class EntityForm(EntityFormBase): # Would inherit from ModelForm directly if it
                        instance.save()
                        self.save_m2m()
                
                        instance.save()
                        self.save_m2m()
                

-               return instance
\ No newline at end of file
+               return instance
+
+
+def validate_template(template):
+       """
+       Makes sure that the template and all included or extended templates are valid.
+       """     
+       for node in template.nodelist:
+               try:
+                       if isinstance(node, loader_tags.ExtendsNode):
+                               extended_template = node.get_parent(Context())
+                               validate_template(extended_template)
+                       elif isinstance(node, loader_tags.IncludeNode):
+                               included_template = loader.get_template(node.template_name.resolve(Context()))
+                               validate_template(extended_template)
+               except Exception, e:
+                       raise ValidationError("Template code invalid. Error was: %s: %s" % (e.__class__.__name__, e))
+
+
+class TemplateForm(ModelForm):
+       def clean_code(self):
+               code = self.cleaned_data['code']
+               try:
+                       t = DjangoTemplate(code)
+               except Exception, e:
+                       raise ValidationError("Template code invalid. Error was: %s: %s" % (e.__class__.__name__, e))
+
+               validate_template(t)
+               return code
+
+       class Meta:
+               model = Template
\ No newline at end of file