Commit 0e6a4259 authored by Nheo Samson's avatar Nheo Samson 🎸

Merge branch 'calendar' into 'staging'

Calendar

See merge request !8
parents 691c6991 ba4c2160
from django.contrib import admin from django.contrib import admin
from .models import Event, Location from .models import Event, Location
...@@ -18,7 +17,7 @@ class EventAdmin(admin.ModelAdmin): ...@@ -18,7 +17,7 @@ class EventAdmin(admin.ModelAdmin):
'target_datetime', 'location', 'estimated_hours' 'target_datetime', 'location', 'estimated_hours'
] ]
}), }),
] ]
class LocationAdmin(admin.ModelAdmin): class LocationAdmin(admin.ModelAdmin):
...@@ -28,13 +27,5 @@ class LocationAdmin(admin.ModelAdmin): ...@@ -28,13 +27,5 @@ class LocationAdmin(admin.ModelAdmin):
list_filter = ('mode', ) list_filter = ('mode', )
class EventInline(admin.TabularInline):
model = Event
class LocationInline(admin.TabularInline):
model = Location
admin.site.register(Event, EventAdmin) admin.site.register(Event, EventAdmin)
admin.site.register(Location, LocationAdmin) admin.site.register(Location, LocationAdmin)
from django.http import HttpResponse from django.http import HttpResponse
from .models import Event, Location from .models import Event
def index(request): def index(request):
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment