Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
SRCT
roomlist
Commits
57fa46cd
Commit
57fa46cd
authored
Dec 09, 2015
by
Daniel W Bond
Browse files
Merge branch 'master' of git.gmu.edu:srct/roomlist
parents
c9e78f2d
cfc1f1cb
Changes
1
Hide whitespace changes
Inline
Side-by-side
roomlist/settings/urls.py
View file @
57fa46cd
...
...
@@ -8,6 +8,7 @@ from django.contrib import admin
from
django.views.decorators.cache
import
cache_page
# imports from your apps
from
.views
import
HomePageView
from
haystack.views
import
SearchView
admin
.
autodiscover
()
admin
.
site
.
login
=
login_required
(
admin
.
site
.
login
)
...
...
@@ -31,7 +32,7 @@ urlpatterns = patterns('',
url
(
r
'^accounts/'
,
include
(
'accounts.urls'
)),
# search
url
(
r
'^search/'
,
include
(
'haystack.urls
'
),
name
=
'search'
),
url
(
r
'^search/'
,
login_required
(
SearchView
(),
login_url
=
'login
'
),
name
=
'search'
),
# login and logout
url
(
r
'^login/'
,
'accounts.views.custom_cas_login'
,
name
=
'login'
),
...
...
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