Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
E
edx-platform
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
edx
edx-platform
Commits
0c3d0542
Commit
0c3d0542
authored
Sep 04, 2012
by
ichuang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: university domain should not be determined by HTTP_HOST for dev or behind proxy
parent
4cbdf90d
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
12 additions
and
1 deletions
+12
-1
common/djangoapps/student/views.py
+4
-1
lms/envs/common.py
+3
-0
lms/envs/dev.py
+1
-0
lms/envs/dev_ike.py
+4
-0
No files found.
common/djangoapps/student/views.py
View file @
0c3d0542
...
@@ -75,8 +75,11 @@ def index(request, extra_context={}, user=None):
...
@@ -75,8 +75,11 @@ def index(request, extra_context={}, user=None):
entry
.
summary
=
soup
.
getText
()
entry
.
summary
=
soup
.
getText
()
# The course selection work is done in courseware.courses.
# The course selection work is done in courseware.courses.
domain
=
settings
.
MITX_FEATURES
.
get
(
'FORCE_UNIVERSITY_DOMAIN'
)
# normally False
if
not
domain
:
domain
=
request
.
META
.
get
(
'HTTP_HOST'
)
universities
=
get_courses_by_university
(
None
,
universities
=
get_courses_by_university
(
None
,
domain
=
request
.
META
.
get
(
'HTTP_HOST'
)
)
domain
=
domain
)
context
=
{
'universities'
:
universities
,
'entries'
:
entries
}
context
=
{
'universities'
:
universities
,
'entries'
:
entries
}
context
.
update
(
extra_context
)
context
.
update
(
extra_context
)
return
render_to_response
(
'index.html'
,
context
)
return
render_to_response
(
'index.html'
,
context
)
...
...
lms/envs/common.py
View file @
0c3d0542
...
@@ -64,6 +64,9 @@ MITX_FEATURES = {
...
@@ -64,6 +64,9 @@ MITX_FEATURES = {
# university to use for branding purposes
# university to use for branding purposes
'SUBDOMAIN_BRANDING'
:
False
,
'SUBDOMAIN_BRANDING'
:
False
,
'FORCE_UNIVERSITY_DOMAIN'
:
False
,
# set this to the university domain to use, as an override to HTTP_HOST
# set to None to do no university selection
'ENABLE_TEXTBOOK'
:
True
,
'ENABLE_TEXTBOOK'
:
True
,
'ENABLE_DISCUSSION'
:
False
,
'ENABLE_DISCUSSION'
:
False
,
'ENABLE_DISCUSSION_SERVICE'
:
True
,
'ENABLE_DISCUSSION_SERVICE'
:
True
,
...
...
lms/envs/dev.py
View file @
0c3d0542
...
@@ -17,6 +17,7 @@ MITX_FEATURES['DISABLE_START_DATES'] = True
...
@@ -17,6 +17,7 @@ MITX_FEATURES['DISABLE_START_DATES'] = True
MITX_FEATURES
[
'ENABLE_SQL_TRACKING_LOGS'
]
=
True
MITX_FEATURES
[
'ENABLE_SQL_TRACKING_LOGS'
]
=
True
MITX_FEATURES
[
'SUBDOMAIN_COURSE_LISTINGS'
]
=
False
# Enable to test subdomains--otherwise, want all courses to show up
MITX_FEATURES
[
'SUBDOMAIN_COURSE_LISTINGS'
]
=
False
# Enable to test subdomains--otherwise, want all courses to show up
MITX_FEATURES
[
'SUBDOMAIN_BRANDING'
]
=
True
MITX_FEATURES
[
'SUBDOMAIN_BRANDING'
]
=
True
MITX_FEATURES
[
'FORCE_UNIVERSITY_DOMAIN'
]
=
None
# show all university courses if in dev (ie don't use HTTP_HOST)
WIKI_ENABLED
=
True
WIKI_ENABLED
=
True
...
...
lms/envs/dev_ike.py
View file @
0c3d0542
...
@@ -18,6 +18,7 @@ MITX_FEATURES['ENABLE_DISCUSSION'] = False
...
@@ -18,6 +18,7 @@ MITX_FEATURES['ENABLE_DISCUSSION'] = False
MITX_FEATURES
[
'ACCESS_REQUIRE_STAFF_FOR_COURSE'
]
=
True
# require that user be in the staff_* group to be able to enroll
MITX_FEATURES
[
'ACCESS_REQUIRE_STAFF_FOR_COURSE'
]
=
True
# require that user be in the staff_* group to be able to enroll
MITX_FEATURES
[
'SUBDOMAIN_COURSE_LISTINGS'
]
=
False
MITX_FEATURES
[
'SUBDOMAIN_COURSE_LISTINGS'
]
=
False
MITX_FEATURES
[
'SUBDOMAIN_BRANDING'
]
=
False
MITX_FEATURES
[
'SUBDOMAIN_BRANDING'
]
=
False
MITX_FEATURES
[
'FORCE_UNIVERSITY_DOMAIN'
]
=
None
# show all university courses if in dev (ie don't use HTTP_HOST)
MITX_FEATURES
[
'DISABLE_START_DATES'
]
=
True
MITX_FEATURES
[
'DISABLE_START_DATES'
]
=
True
# MITX_FEATURES['USE_DJANGO_PIPELINE']=False # don't recompile scss
# MITX_FEATURES['USE_DJANGO_PIPELINE']=False # don't recompile scss
...
@@ -28,6 +29,9 @@ if ('edxvm' in myhost) or ('ocw' in myhost):
...
@@ -28,6 +29,9 @@ if ('edxvm' in myhost) or ('ocw' in myhost):
MITX_FEATURES
[
'USE_XQA_SERVER'
]
=
'https://qisx.mit.edu/xqa'
# needs to be ssl or browser blocks it
MITX_FEATURES
[
'USE_XQA_SERVER'
]
=
'https://qisx.mit.edu/xqa'
# needs to be ssl or browser blocks it
MITX_FEATURES
[
'USE_DJANGO_PIPELINE'
]
=
False
# don't recompile scss
MITX_FEATURES
[
'USE_DJANGO_PIPELINE'
]
=
False
# don't recompile scss
if
(
'ocw'
in
myhost
):
MITX_FEATURES
[
'ACCESS_REQUIRE_STAFF_FOR_COURSE'
]
=
False
if
(
'domU'
in
myhost
):
if
(
'domU'
in
myhost
):
EMAIL_BACKEND
=
'django.core.mail.backends.smtp.EmailBackend'
EMAIL_BACKEND
=
'django.core.mail.backends.smtp.EmailBackend'
MITX_FEATURES
[
'REROUTE_ACTIVATION_EMAIL'
]
=
'ichuang@mitx.mit.edu'
# nonempty string = address for all activation emails
MITX_FEATURES
[
'REROUTE_ACTIVATION_EMAIL'
]
=
'ichuang@mitx.mit.edu'
# nonempty string = address for all activation emails
...
...
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