X-Git-Url: http://git.ithinksw.org/philo.git/blobdiff_plain/e3ad0b4b28aca417a136f5ed1fa9a90ee9d78a54..b7bb8ec0115e9c9928a0e3177db027b0586d14d6:/philo/contrib/julian/models.py

diff --git a/philo/contrib/julian/models.py b/philo/contrib/julian/models.py
index 33c6e2a..837675b 100644
--- a/philo/contrib/julian/models.py
+++ b/philo/contrib/julian/models.py
@@ -15,8 +15,8 @@ from django.http import HttpResponse, Http404
 from django.utils.encoding import force_unicode
 
 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
@@ -223,17 +223,17 @@ class CalendarView(FeedView):
 			# 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')
 			)
 		
-		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')
 			)
 		
-		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')
 			)
@@ -334,7 +334,7 @@ class CalendarView(FeedView):
 	
 	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