Eventplanner

- cleaned up urls
- permissions
This commit is contained in:
Martin Bauer
2013-06-30 16:55:00 +02:00
parent 01a7f5c16f
commit e2d98d9962
13 changed files with 271 additions and 101 deletions

Binary file not shown.

View File

@@ -153,7 +153,7 @@ INSTALLED_APPS = (
REST_FRAMEWORK = {
'DEFAULT_PERMISSION_CLASSES': ('rest_framework.permissions.IsAdminUser',),
'DEFAULT_PERMISSION_CLASSES': ('rest_framework.permissions.IsAuthenticated',),
'PAGINATE_BY': 10
}

View File

@@ -16,15 +16,9 @@ from django.conf.urls.static import static
admin.autodiscover()
urlpatterns = patterns('',
# Examples:
# url(r'^$', 'blechreiz.views.home', name='home'),
# url(r'^blechreiz/', include('blechreiz.foo.urls')),
# Uncomment the admin/doc line below to enable admin documentation:
url(r'^admin/doc/', include('django.contrib.admindocs.urls')),
# Uncomment the next line to enable the admin:
url(r'^admin/', include(admin.site.urls)),
url(r'^events/', include( eventplanner.views.urls) ),
url(r'^admin/', include(admin.site.urls) ),
url(r'^admin/doc/', include('django.contrib.admindocs.urls') ),
url(r'^musicians/$', MusicianList.as_view() ),
url(r'^musicians/(?P<username>[\w]+)$', user_edit ),
@@ -32,10 +26,4 @@ urlpatterns = patterns('',
url(r'^website/$', website.views.home_view),
url(r'^login/$', website.views.login_view),
url(r'^logout/$', website.views.logout_view),
url(r'^events/$', eventplanner.views.eventplanning_view),
url(r'^eventParticipation/$', eventplanner.views.event_participation_detail ),
url(r'^eventParticipation/(\w+)/$', eventplanner.views.event_participation_detail ),
url(r'^eventParticipation/(\w+)/(\d+)$', eventplanner.views.event_participation_detail ),
url(r'^events/grid$', eventplanner.views.events_grid ),
url(r'^events/(?P<pk>\d+)$', eventplanner.views.EventUpdate.as_view() ),
) + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)