summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan McGee <dpmcgee@gmail.com>2013-02-04 21:37:12 -0600
committerDan McGee <dpmcgee@gmail.com>2013-02-04 21:37:12 -0600
commit8bbf80092fde60ee984258858c77384bb2b2970b (patch)
tree310312317ca59fb0603fbb68f16edeee07862630
parent05e05d93bdd9e20d90a93e85262df23bdcc191c4 (diff)
downloadwebsite-8bbf80092fde60ee984258858c77384bb2b2970b.tar.gz
website-8bbf80092fde60ee984258858c77384bb2b2970b.zip
Start removal of deprecated generic function view usage
-rw-r--r--blog/models.py8
-rw-r--r--urls.py6
2 files changed, 6 insertions, 8 deletions
diff --git a/blog/models.py b/blog/models.py
index e00e46b..a4c05e8 100644
--- a/blog/models.py
+++ b/blog/models.py
@@ -2,9 +2,10 @@ from datetime import datetime
import markdown
from django.db import models
-from django.db.models import Count, permalink
+from django.db.models import Count
from django.db.models.signals import pre_save
from django.contrib.auth.models import User
+from django.core.urlresolvers import reverse
# Categories table; used in Many to Many relationship with Posts
class PostCategory(models.Model):
@@ -71,10 +72,7 @@ class Post(models.Model):
return self.title
def get_absolute_url(self):
- "Return an absolute URL for this post"
- return('django.views.generic.list_detail.object_detail', None,
- {'slug': self.slug,})
- get_absolute_url = permalink(get_absolute_url)
+ return reverse('blog-single-post', args=[self.slug])
class Meta:
ordering = ('-pub_date',)
diff --git a/urls.py b/urls.py
index daaca00..cb78004 100644
--- a/urls.py
+++ b/urls.py
@@ -1,8 +1,8 @@
from django.conf.urls import include, patterns
-# we need these until http://code.djangoproject.com/ticket/5350 is fixed
-from django.conf.urls import handler404, handler500
from django.conf import settings
from django.contrib import admin
+from django.views.generic.base import RedirectView
+
from feeds import BlogRss, BlogAtom
from feeds import CommentsRss, CommentsAtom
from sitemaps import BlogSitemap, NamedURLSitemap
@@ -22,7 +22,7 @@ urlpatterns = patterns('',
(r'^$', 'general.views.index', None, "page-index"),
(r'^about/$', 'general.views.about', None, "page-about"),
# redirects
- (r'^index.html$', 'django.views.generic.simple.redirect_to', {'url': '/'}),
+ (r'^index.html$', RedirectView.as_view(url='/')),
# admin site
(r'^admin/doc/', include('django.contrib.admindocs.urls')),
(r'^admin/', include(admin.site.urls)),