Commit 1f86cea3 authored by Daniel W Bond's avatar Daniel W Bond
Browse files

Merge branch '30-update-to-1.10' into 'upgrade-django'

Resolve "Move the project to Django 1.10"

See merge request !9
parents 022853a8 42fa7f6c
Django>=1.8,<1.9
Django>1.10, <1.11
argparse
django-autoslug==1.7.2
django-floppyforms==1.1.1
django-autoslug==1.9.3
django-floppyforms
django-cas-client
django-leaflet==0.11.1
django-model-utils==2.0.2
djangorestframework>=3.1,<3.2
django-leaflet
django-model-utils
djangorestframework==3.6.2
distribute
wsgiref
from django.conf.urls import patterns, include, url
from website.views import *
# Django Imports
from django.conf.urls import include, url
# App Imports
from .views import CategoryViewSet, FacilityViewSet, ScheduleViewSet
# Other Imports
from rest_framework.routers import DefaultRouter
from django.conf.urls.static import static
from whats_open.settings import local as settings_local
router = DefaultRouter()
router.register(r'categories', CategoryViewSet)
router.register(r'facilities', FacilityViewSet)
router.register(r'schedules', ScheduleViewSet)
#router.register(r'opentimes', OpenTimeViewSet)
# Instiantiate our DefaultRouter
ROUTER = DefaultRouter()
# Register views to the API router
ROUTER.register(r'categories', CategoryViewSet)
ROUTER.register(r'facilities', FacilityViewSet)
ROUTER.register(r'schedules', ScheduleViewSet)
urlpatterns = patterns('website.views',
url(r'^api/', include(router.urls)),
#url(r'^$', 'facility_grid', name='facility_grid'),
)
#facilities open urls
#url(r'^facilities/$', FacilityListView.as_view(), name='faciliites-list'),
#url(r'^facilities/(?P<category>)/$', FacilityCategoryListView.as_view(), name='facilities-list-by-cat'),
#url(r'^facilities/(?P<slug>)/$', FacilityDetailView.as_view(), name='facilities-detail'),
#url(r'^facilities/(?P<on_campus>)/$', FacilityStatusListView.as_view(), name='facilities-list-by-status'),
#schedules urls
#url(r'^schedule/(?P<pk>)/$', ScheduleDetailView.as_view(), name='schedule-detail'),
#opentime urls
#url(r'^open-time/(?P<pk>)/$', OpenTimeDetailView.as_view(), name='open-time-detail'),
#) + static(settings_local.STATIC_URL, document_root=settings_local.STATIC_ROOT)
urlpatterns = [
# /api - Root API URL
url(r'^api/', include(ROUTER.urls)),
]
......@@ -165,13 +165,13 @@ TEMPLATES = [
'django.contrib.auth.context_processors.auth',
'django.template.context_processors.request',
'django.contrib.auth.context_processors.auth',
'django.core.context_processors.debug',
'django.core.context_processors.i18n',
'django.core.context_processors.media',
'django.core.context_processors.static',
'django.core.context_processors.tz',
'django.template.context_processors.debug',
'django.template.context_processors.i18n',
'django.template.context_processors.media',
'django.template.context_processors.static',
'django.template.context_processors.tz',
'django.contrib.messages.context_processors.messages',
'django.core.context_processors.request',
'django.template.context_processors.request',
],
# See: https://docs.djangoproject.com/en/dev/ref/settings/#template-loaders
'loaders': [
......
from django.conf.urls import patterns, include, url
from django.contrib.sites.models import Site
# Uncomment the next two lines to enable the admin:
# Django Imports
from django.conf.urls import include, url
from django.contrib import admin
import django.contrib.auth.views
admin.autodiscover()
urlpatterns = patterns('',
# Examples:
# Uncomment the admin/doc line below to enable admin documentation:
urlpatterns = [
# / - The homepage
url(r'^', include('website.urls')),
#url(r'management/', include('management.urls')),
# /admin - The admin panels
url(r'^admin/', include(admin.site.urls)),
# /admin/docs - Documentation for admin
url(r'^admin/doc/', include('django.contrib.admindocs.urls')),
# /api-auth - API Auth page
url(r'^api-auth/', include('rest_framework.urls', namespace='rest_framework')),
url(r'^admin/', include(admin.site.urls)),
url(r'^logout/$', 'django.contrib.auth.views.logout', {
'next_page': '/'}),
)
# /logout - Redirect to the homepage on logout
url(r'^logout/$', django.contrib.auth.views.logout, {'next_page': '/'}),
]
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