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
+from philo.validators import RedirectValidator
def register_value_model(model):
return None
def get_path(self, pathsep='/', field='slug'):
- path = getattr(self.instance, field, '?')
+ path = getattr(self.instance, field, getattr(self.instance, 'slug', '?'))
parent = self.parent
while parent:
- path = getattr(parent.instance, field, '?') + pathsep + path
+ path = getattr(parent.instance, field, getattr(parent.instance, 'slug', '?')) + pathsep + path
parent = parent.parent
return path
path = property(get_path)
(302, 'Temporary'),
(301, 'Permanent'),
)
- target = models.CharField(max_length=200,validators=[URLRedirectValidator()])
+ target = models.CharField(max_length=200,validators=[RedirectValidator()])
status_code = models.IntegerField(choices=STATUS_CODES, default=302, verbose_name='redirect type')
def render_to_response(self, request, path=None, subpath=None):
response = HttpResponse(wrapper, content_type=self.mimetype)
response['Content-Length'] = self.file.size
return response
-
- def __unicode__(self):
- return self.file
class Template(TreeModel):