Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
R
roomlist
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
23
Issues
23
List
Boards
Labels
Service Desk
Milestones
Merge Requests
2
Merge Requests
2
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
SRCT
roomlist
Commits
f863ccd4
Commit
f863ccd4
authored
Nov 20, 2014
by
Daniel W Bond
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
corrected import locations under new directory structure
parent
f7a86ccb
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
7 additions
and
7 deletions
+7
-7
roomlist/api/views.py
roomlist/api/views.py
+1
-1
roomlist/housing/admin.py
roomlist/housing/admin.py
+1
-1
roomlist/housing/views.py
roomlist/housing/views.py
+1
-1
roomlist/settings/settings.py
roomlist/settings/settings.py
+3
-3
roomlist/settings/urls.py
roomlist/settings/urls.py
+1
-1
No files found.
roomlist/api/views.py
View file @
f863ccd4
...
...
@@ -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
):
...
...
roomlist/housing/admin.py
View file @
f863ccd4
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
)
...
...
roomlist/housing/views.py
View file @
f863ccd4
...
...
@@ -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
):
...
...
roomlist/settings/settings.py
View file @
f863ccd4
...
...
@@ -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
...
...
roomlist/settings/urls.py
View file @
f863ccd4
...
...
@@ -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'
)),
)
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment