Skip to content

Commit

Permalink
Upgraded to django 1.8
Browse files Browse the repository at this point in the history
  • Loading branch information
manjunath24 committed Apr 28, 2015
1 parent 4e7561a commit 9de73be
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 50 deletions.
28 changes: 0 additions & 28 deletions blogango/__init__.py
Original file line number Diff line number Diff line change
@@ -1,28 +0,0 @@

from django.db.models import signals

from pingback import register_pingback, ping_func
from pingback.client import ping_external_links
from django_xmlrpc import xmlrpcdispatcher

from blogango.models import BlogEntry

def pingback_blog_handler(year, month, slug, **kwargs):
return BlogEntry.objects.get(created_on__year=year,
created_on__month=month,
slug=slug,
is_published=True)


# ping_details = {'blogango_details': pingback_blog_handler}

register_pingback('blogango.views.details', pingback_blog_handler)

xmlrpcdispatcher.register_function(ping_func, 'pingback.ping')

# ping external links in the entry

def get_blog_text(instance):
return instance.text.rendered

signals.post_save.connect(ping_external_links(content_func=get_blog_text, url_attr='get_absolute_url'), sender=BlogEntry, weak=True)
7 changes: 4 additions & 3 deletions blogango/feeds.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,10 @@

class main_feed(Feed):
blog = Blog.objects.get_blog()
title = blog.title
link = "/rss/latest/"
description = blog.tag_line
if blog:
title = blog.title
link = "/rss/latest/"
description = blog.tag_line

def items(self):
return BlogEntry.objects.filter(is_page=False)[:10]
Expand Down
1 change: 1 addition & 0 deletions blogango/forms.py
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ class PreferencesForm(forms.ModelForm):

class Meta:
model = Blog
exclude = ()


class BlogForm(forms.ModelForm):
Expand Down
20 changes: 4 additions & 16 deletions blogango/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
from django.db import models
from django.contrib.auth.models import User
from django.conf import settings
from django.contrib.comments.moderation import CommentModerator, moderator
from django.template.defaultfilters import slugify
from django.core.urlresolvers import reverse

Expand Down Expand Up @@ -52,8 +51,8 @@ def save(self, *args, **kwargs):
class BlogPublishedManager(models.Manager):
use_for_related_fields = True

def get_query_set(self):
return super(BlogPublishedManager, self).get_query_set().filter(
def get_queryset(self):
return super(BlogPublishedManager, self).get_queryset().filter(
is_published=True,
publish_date__lte=datetime.now())

Expand Down Expand Up @@ -176,8 +175,8 @@ def get_recent_comments(self):


class CommentManager(models.Manager):
def get_query_set(self):
return super(CommentManager, self).get_query_set().filter(is_public=True)
def get_queryset(self):
return super(CommentManager, self).get_queryset().filter(is_public=True)


class BaseComment(models.Model):
Expand Down Expand Up @@ -252,21 +251,10 @@ def get_absolute_url(self):
return self.url


class CommentModerator(CommentModerator):
email_notification = True
enable_field = 'is_public'


#Helper methods
def _infer_title_or_slug(text):
return '-'.join(text.split()[:5])


def _generate_summary(text):
return ' '.join(text.split()[:100])

if Comment not in moderator._registry:
moderator.register(Comment, CommentModerator)

from south.modelsinspector import add_introspection_rules
add_introspection_rules([], ["^markupfield\.fields\.MarkupField"])
5 changes: 2 additions & 3 deletions example/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@
'django.middleware.common.CommonMiddleware',
'django.contrib.sessions.middleware.SessionMiddleware',
'django.contrib.auth.middleware.AuthenticationMiddleware',
'django.middleware.doc.XViewMiddleware',
'django.contrib.admindocs.middleware.XViewMiddleware',
'django.contrib.messages.middleware.MessageMiddleware',
'django.middleware.csrf.CsrfViewMiddleware',
)
Expand All @@ -81,12 +81,11 @@
'django.contrib.humanize',
'django.contrib.sitemaps',
'django.contrib.staticfiles',

'blogango',
'pingback',
'django_xmlrpc',
'taggit',
'django.contrib.comments',
'south',
)

try:
Expand Down

0 comments on commit 9de73be

Please sign in to comment.