Made referencing containers optional on pages. Fixes a bug.

[philo.git] / models.py

diff --git a/models.py b/models.py
index 464b3b5..9210e1b 100644 (file)
--- a/models.py
+++ b/models.py
@@ -125,7 +125,7 @@ class CollectionMember(models.Model):
        member = generic.GenericForeignKey('member_content_type', 'member_object_id')
        
        def __unicode__(self):
        member = generic.GenericForeignKey('member_content_type', 'member_object_id')
        
        def __unicode__(self):

-               return '%s - %s' % (self.collection, self.member)
+               return u'%s - %s' % (self.collection, self.member)

 
 
 class TreeManager(models.Manager):
 
 
 class TreeManager(models.Manager):


@@ -290,6 +290,9 @@ class File(Node):
                response = HttpResponse(wrapper, content_type=self.mimetype)
                response['Content-Length'] = self.file.size
                return response
                response = HttpResponse(wrapper, content_type=self.mimetype)
                response['Content-Length'] = self.file.size
                return response

+       
+       def __unicode__(self):
+               return self.file

 
 
 class Template(TreeModel):
 
 
 class Template(TreeModel):