From: melinath <stephen.r.burrows@gmail.com>
Date: Fri, 18 Jun 2010 14:43:39 +0000 (-0400)
Subject: Merge branch 'master' of http://git.ithinksw.org/philo
X-Git-Tag: philo-0.9~76^2~1^2~4
X-Git-Url: http://git.ithinksw.org/philo.git/commitdiff_plain/da63b5b1fdcd03f375ff6b40a1d022d4e8778801?hp=-c

Merge branch 'master' of git.ithinksw.org/philo
---

da63b5b1fdcd03f375ff6b40a1d022d4e8778801
diff --combined models.py
index 4df28d3,1c71889..6be9951
--- a/models.py
+++ b/models.py
@@@ -19,7 -19,6 +19,7 @@@ from django.template.loader import get_
  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):
@@@ -214,10 -213,7 +214,10 @@@ class InheritableTreeEntity(TreeEntity)
  	
  	@property
  	def instance(self):
 -		return self.instance_type.get_object_for_this_type(id=self.id)
 +		try:
 +			return self.instance_type.get_object_for_this_type(id=self.id)
 +		except:
 +			return None
  	
  	def get_path(self, pathsep='/', field='slug'):
  		path = getattr(self.instance, field, '?')
@@@ -276,16 -272,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):
@@@ -298,9 -291,6 +298,6 @@@
  		response = HttpResponse(wrapper, content_type=self.mimetype)
  		response['Content-Length'] = self.file.size
  		return response
- 	
- 	def __unicode__(self):
- 		return self.file
  
  
  class Template(TreeModel):
@@@ -406,7 -396,7 +403,7 @@@ class ContentReference(models.Model)
  	page = models.ForeignKey(Page, related_name='contentreferences')
  	name = models.CharField(max_length=255)
  	content_type = models.ForeignKey(ContentType, verbose_name='Content type')
 -	content_id = models.PositiveIntegerField(verbose_name='Content ID')
 +	content_id = models.PositiveIntegerField(verbose_name='Content ID', blank=True, null=True)
  	content = generic.GenericForeignKey('content_type', 'content_id')
  	
  	def __unicode__(self):