X-Git-Url: http://git.ithinksw.org/philo.git/blobdiff_plain/8c48dda3b4c5cf0ac6c2d404ae29d8ef315b4f7f..da63b5b1fdcd03f375ff6b40a1d022d4e8778801:/models.py?ds=sidebyside diff --git a/models.py b/models.py index f866ee6..6be9951 100644 --- a/models.py +++ b/models.py @@ -19,6 +19,7 @@ from django.template.loader import get_template from django.http import Http404, HttpResponse, HttpResponseServerError, HttpResponseRedirect from django.core.servers.basehttp import FileWrapper from django.conf import settings +from philo.validators import URLRedirectValidator def register_value_model(model): @@ -275,13 +276,16 @@ class Redirect(Node): (302, 'Temporary'), (301, 'Permanent'), ) - target = models.URLField(help_text='Must be a valid, absolute URL (i.e. http://)') + target = models.CharField(max_length=200,validators=[URLRedirectValidator()]) status_code = models.IntegerField(choices=STATUS_CODES, default=302, verbose_name='redirect type') def render_to_response(self, request, path=None, subpath=None): response = HttpResponseRedirect(self.target) response.status_code = self.status_code return response + + def __unicode__(self): + return self.slug class File(Node): @@ -294,9 +298,6 @@ class File(Node): response = HttpResponse(wrapper, content_type=self.mimetype) response['Content-Length'] = self.file.size return response - - def __unicode__(self): - return self.file class Template(TreeModel):