Merge branch 'master' into julian

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

diff --git a/contrib/julian/admin.py b/contrib/julian/admin.py
index a822e1d..c8ef95a 100644 (file)
--- a/contrib/julian/admin.py
+++ b/contrib/julian/admin.py
@@ -1,6 +1,6 @@
 from django.contrib import admin
 from philo.admin import EntityAdmin
-from philo.contrib.julian.models import Location, Event, Calendar
+from philo.contrib.julian.models import Location, Event, Calendar, ICalendarFeedView
 
 
 class LocationAdmin(EntityAdmin):
@@ -8,17 +8,17 @@ class LocationAdmin(EntityAdmin):
 
 
 class EventAdmin(EntityAdmin):
-       fieldsets = (
-               (None, {
-                       'fields': ('title', 'description', 'tags', 'parent_event', 'owner')
-               }),
-               ('Location', {
-                       'fields': ('location_content_type', 'location_pk')
-               }),
-               ('Time', {
-                       'fields': (('start_date', 'start_time'), ('end_date', 'end_time'),),
-               })
-       )
+       #fieldsets = (
+       #       (None, {
+       #               'fields': ('name', 'slug' 'description', 'tags', 'parent_event', 'owner')
+       #       }),
+       #       ('Location', {
+       #               'fields': ('location_content_type', 'location_pk')
+       #       }),
+       #       ('Time', {
+       #               'fields': (('start_date', 'start_time'), ('end_date', 'end_time'),),
+       #       })
+       #)
        related_lookup_fields = {
                'generic': [["location_content_type", "location_pk"]]
        }
@@ -28,6 +28,11 @@ class CalendarAdmin(EntityAdmin):
        pass
 
 
+class ICalendarFeedViewAdmin(EntityAdmin):
+       pass
+
+
 admin.site.register(Location, LocationAdmin)
 admin.site.register(Event, EventAdmin)
-admin.site.register(Calendar, CalendarAdmin)
\ No newline at end of file
+admin.site.register(Calendar, CalendarAdmin)
+admin.site.register(ICalendarFeedView, ICalendarFeedViewAdmin)
\ No newline at end of file