Commit f863ccd4 authored by Daniel W Bond's avatar Daniel W Bond

corrected import locations under new directory structure

parent f7a86ccb
......@@ -2,7 +2,7 @@ from django.http import HttpResponse
import json
from api.models import Building, Room
from housing.models import Building, Room
# Create your views here.
def index(request):
......
from django.contrib import admin
from api.models import Class, Building, Address, Room
from housing.models import Class, Building, Address, Room
# Register your models here.
admin.site.register(Class)
......
......@@ -4,7 +4,7 @@ from django.template import RequestContext, loader
from django.contrib.auth.forms import AuthenticationForm
from django.contrib.auth import authenticate, logout
from api.models import Building, Room
from housing.models import Building, Room
# Create your views here.
def index(request):
......
......@@ -64,7 +64,7 @@ INSTALLED_APPS = (
'django.contrib.messages',
'django.contrib.staticfiles',
'api',
'roomlist',
'housing',
)
MIDDLEWARE_CLASSES = (
......@@ -76,9 +76,9 @@ MIDDLEWARE_CLASSES = (
'django.middleware.clickjacking.XFrameOptionsMiddleware',
)
ROOT_URLCONF = 'django_project.urls'
ROOT_URLCONF = 'settings.urls'
WSGI_APPLICATION = 'django_project.wsgi.application'
WSGI_APPLICATION = 'settings.wsgi.application'
# Database
......
......@@ -9,5 +9,5 @@ urlpatterns = patterns('',
# url(r'^blog/', include('blog.urls')),
url(r'^api/', include('api.urls')),
url(r'^admin/', include(admin.site.urls)),
url(r'^', include('roomlist.urls')),
url(r'^', include('housing.urls')),
)
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