From: Joseph Spiros <joseph.spiros@ithinksw.com>
Date: Mon, 5 Jul 2010 18:32:27 +0000 (-0400)
Subject: Merge branch 'master' of git://github.com/kgodey/philo
X-Git-Tag: philo-0.9~57
X-Git-Url: http://git.ithinksw.org/philo.git/commitdiff_plain/776f7c515dfb9019906dfb7dd5d9f78182add931?hp=94f98261589e880ef15d17809112c0615d57b983

Merge branch 'master' of git://github.com/kgodey/philo

* 'master' of git://github.com/kgodey/philo:
  Fixed null constraint on entries_per_page in BlogView
  Edited unicode methods and added some null=True, blank=True constraints.
---

diff --git a/admin/base.py b/admin/base.py
index bdf9f38..457db17 100644
--- a/admin/base.py
+++ b/admin/base.py
@@ -29,4 +29,7 @@ class EntityAdmin(admin.ModelAdmin):
 	save_on_top = True
 
 
-admin.site.register(Tag)
\ No newline at end of file
+class TagAdmin(admin.ModelAdmin):
+	prepopulated_fields = {"slug": ("name",)}
+
+admin.site.register(Tag, TagAdmin)
\ No newline at end of file
diff --git a/contrib/penfield/models.py b/contrib/penfield/models.py
index e0b7218..d1695e7 100644
--- a/contrib/penfield/models.py
+++ b/contrib/penfield/models.py
@@ -15,13 +15,16 @@ class Blog(Entity, Titled):
 		return Tag.objects.filter(blogentries__blog=self)
 
 
+register_value_model(Blog)
+
+
 class BlogEntry(Entity, Titled):
 	blog = models.ForeignKey(Blog, related_name='entries')
 	author = models.ForeignKey(getattr(settings, 'PHILO_PERSON_MODULE', 'auth.User'), related_name='blogentries')
 	date = models.DateTimeField(default=datetime.now)
 	content = models.TextField()
-	excerpt = models.TextField()
-	tags = models.ManyToManyField(Tag, related_name='blogentries')
+	excerpt = models.TextField(blank=True, null=True)
+	tags = models.ManyToManyField(Tag, related_name='blogentries', blank=True, null=True)
 	
 	class Meta:
 		ordering = ['-date']
@@ -47,7 +50,7 @@ class BlogView(MultiView):
 	entry_archive_page = models.ForeignKey(Page, related_name='blog_entry_archive_related', null=True, blank=True)
 	tag_page = models.ForeignKey(Page, related_name='blog_tag_related')
 	tag_archive_page = models.ForeignKey(Page, related_name='blog_tag_archive_related', null=True, blank=True)
-	entries_per_page = models.IntegerField(blank=True, validators=[validate_pagination_count])
+	entries_per_page = models.IntegerField(blank=True, validators=[validate_pagination_count], null=True)
 	
 	entry_permalink_style = models.CharField(max_length=1, choices=ENTRY_PERMALINK_STYLE_CHOICES)
 	entry_permalink_base = models.CharField(max_length=255, blank=False, default='entries')
diff --git a/models/nodes.py b/models/nodes.py
index a8125ee..1e7622a 100644
--- a/models/nodes.py
+++ b/models/nodes.py
@@ -108,4 +108,7 @@ class File(View):
 		return response
 	
 	class Meta:
-		app_label = 'philo'
\ No newline at end of file
+		app_label = 'philo'
+	
+	def __unicode__(self):
+		return self.file.name
\ No newline at end of file