diff options
Diffstat (limited to 'apps/blog')
| -rw-r--r-- | apps/blog/admin.py | 2 | ||||
| -rw-r--r-- | apps/blog/models.py | 5 |
2 files changed, 1 insertions, 6 deletions
diff --git a/apps/blog/admin.py b/apps/blog/admin.py index 6ea9ea5..ee6957e 100644 --- a/apps/blog/admin.py +++ b/apps/blog/admin.py @@ -22,7 +22,7 @@ class EntryAdmin(OSMGeoAdmin): prepopulated_fields = {"slug" : ('title',)} list_filter = ('pub_date', 'enable_comments', 'status','region','location') fieldsets = ( - ('Entry', {'fields': ('title','body_markdown', ('location','region'), 'pub_date', ('status','enable_comments'), 'tags', 'slug','photo_gallery'), 'classes': ('show','extrapretty','wide')}), + ('Entry', {'fields': ('title','body_markdown', ('location','region'), 'pub_date', ('status','enable_comments'), 'slug','photo_gallery'), 'classes': ('show','extrapretty','wide')}), ('Pub Location', {'fields': ('point',('image','thumbnail',),'dek', 'topics', 'meta_description','template_name'), 'classes': ('collapse', 'wide')}), ) diff --git a/apps/blog/models.py b/apps/blog/models.py index 9995bc1..65c0149 100644 --- a/apps/blog/models.py +++ b/apps/blog/models.py @@ -7,8 +7,6 @@ from django.template.defaultfilters import truncatewords_html from utils import markdown2 as markdown -from tagging.fields import TagField -from tagging.models import Tag from photos.models import PhotoGallery from locations.models import Location,Region @@ -69,7 +67,6 @@ class Entry(models.Model): body_markdown = models.TextField() dek = models.TextField(null=True,blank=True) pub_date = models.DateTimeField('Date published') - tags = TagField() enable_comments = models.BooleanField(default=True) point = models.PointField(null=True) location = models.ForeignKey(Location, null=True) @@ -109,8 +106,6 @@ class Entry(models.Model): def get_next_published(self): return self.get_next_by_pub_date(status__exact=1) - def get_tags(self): - return Tag.objects.get_for_object(self) def comment_period_open(self): return self.enable_comments and datetime.datetime.today() - datetime.timedelta(30) <= self.pub_date |