Slight changes to penfield NewsletterIssueAdmin & added newsletter value models

[philo.git] / models / base.py

diff --git a/models/base.py b/models/base.py
index 9434825..6f23191 100644 (file)
--- a/models/base.py
+++ b/models/base.py
@@ -9,7 +9,7 @@ from UserDict import DictMixin
 
 class Tag(models.Model):
        name = models.CharField(max_length=250)
 
 class Tag(models.Model):
        name = models.CharField(max_length=250)

-       slug = models.SlugField()
+       slug = models.SlugField(unique=True)

        
        def __unicode__(self):
                return self.name
        
        def __unicode__(self):
                return self.name


@@ -20,7 +20,7 @@ class Tag(models.Model):
 
 class Titled(models.Model):
        title = models.CharField(max_length=255)
 
 class Titled(models.Model):
        title = models.CharField(max_length=255)

-       slug = models.SlugField()
+       slug = models.SlugField(max_length=255)

        
        def __unicode__(self):
                return self.title
        
        def __unicode__(self):
                return self.title


@@ -159,13 +159,29 @@ class TreeModel(models.Model):
        parent = models.ForeignKey('self', related_name='children', null=True, blank=True)
        slug = models.SlugField()
        
        parent = models.ForeignKey('self', related_name='children', null=True, blank=True)
        slug = models.SlugField()
        

-       def get_path(self, pathsep='/', field='slug'):
-               path = getattr(self, field, '?')
-               parent = self.parent
+       def has_ancestor(self, ancestor):
+               parent = self

                while parent:
                while parent:

-                       path = getattr(parent, field, '?') + pathsep + path
+                       if parent == ancestor:
+                               return True

                        parent = parent.parent
                        parent = parent.parent

-               return path
+               return False
+       
+       def get_path(self, root=None, pathsep='/', field='slug'):
+               if root is not None and self.has_ancestor(root):
+                       path = ''
+                       parent = self
+                       while parent and parent != root:
+                               path = getattr(parent, field, '?') + pathsep + path
+                               parent = parent.parent
+                       return path
+               else:
+                       path = getattr(self, field, '?')
+                       parent = self.parent
+                       while parent and parent != root:
+                               path = getattr(parent, field, '?') + pathsep + path
+                               parent = parent.parent
+                       return path

        path = property(get_path)
        
        def __unicode__(self):
        path = property(get_path)
        
        def __unicode__(self):