Initial philo commit to use django-taggit instead of native tags.

[philo.git] / philo / contrib / julian / models.py

diff --git a/philo/contrib/julian/models.py b/philo/contrib/julian/models.py
index 33c6e2a..df49da5 100644 (file)
--- a/philo/contrib/julian/models.py
+++ b/philo/contrib/julian/models.py
@@ -13,10 +13,11 @@ from django.db import models
 from django.db.models.query import QuerySet
 from django.http import HttpResponse, Http404
 from django.utils.encoding import force_unicode
 from django.db.models.query import QuerySet
 from django.http import HttpResponse, Http404
 from django.utils.encoding import force_unicode

+from taggit.managers import TaggableManager

 
 from philo.contrib.julian.feedgenerator import ICalendarFeed
 
 from philo.contrib.julian.feedgenerator import ICalendarFeed

-from philo.contrib.syndication.models import FeedView
-from philo.contrib.syndication.feeds import registry
+from philo.contrib.winer.models import FeedView
+from philo.contrib.winer.feeds import registry

 from philo.exceptions import ViewCanNotProvideSubpath
 from philo.models import Tag, Entity, Page
 from philo.models.fields import TemplateField
 from philo.exceptions import ViewCanNotProvideSubpath
 from philo.models import Tag, Entity, Page
 from philo.models.fields import TemplateField


@@ -223,17 +224,17 @@ class CalendarView(FeedView):
                        # or per-calendar-view basis.
                        #url(r'^%s/(?P<slug>[\w-]+)' % self.location_permalink_base, ...)
                
                        # or per-calendar-view basis.
                        #url(r'^%s/(?P<slug>[\w-]+)' % self.location_permalink_base, ...)
                

-               if self.tag_archive_page:
+               if self.tag_archive_page_id:

                        urlpatterns += patterns('',
                                url(r'^%s$' % self.tag_permalink_base, self.tag_archive_view, name='tag_archive')
                        )
                
                        urlpatterns += patterns('',
                                url(r'^%s$' % self.tag_permalink_base, self.tag_archive_view, name='tag_archive')
                        )
                

-               if self.owner_archive_page:
+               if self.owner_archive_page_id:

                        urlpatterns += patterns('',
                                url(r'^%s$' % self.owner_permalink_base, self.owner_archive_view, name='owner_archive')
                        )
                
                        urlpatterns += patterns('',
                                url(r'^%s$' % self.owner_permalink_base, self.owner_archive_view, name='owner_archive')
                        )
                

-               if self.location_archive_page:
+               if self.location_archive_page_id:

                        urlpatterns += patterns('',
                                url(r'^%s$' % self.location_permalink_base, self.location_archive_view, name='location_archive')
                        )
                        urlpatterns += patterns('',
                                url(r'^%s$' % self.location_permalink_base, self.location_archive_view, name='location_archive')
                        )


@@ -334,7 +335,7 @@ class CalendarView(FeedView):
        
        def get_events_by_location(self, request, app_label, model, pk, extra_context=None):
                try:
        
        def get_events_by_location(self, request, app_label, model, pk, extra_context=None):
                try:

-                       ct = ContentType.objects.get(app_label=app_label, model=model)
+                       ct = ContentType.objects.get_by_natural_key(app_label, model)

                        location = ct.model_class()._default_manager.get(pk=pk)
                except ObjectDoesNotExist:
                        raise Http404
                        location = ct.model_class()._default_manager.get(pk=pk)
                except ObjectDoesNotExist:
                        raise Http404