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
8696c671
Commit
8696c671
authored
Aug 20, 2015
by
Bertrand Marron
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #24 from IONISx/tusbar/new-dashboard
Use IONISx dashboard
parents
d55863dd
ed80bfbc
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
3 deletions
+7
-3
common/djangoapps/student/views.py
+3
-0
lms/djangoapps/courseware/views.py
+3
-2
lms/envs/common.py
+1
-1
No files found.
common/djangoapps/student/views.py
View file @
8696c671
...
...
@@ -484,6 +484,9 @@ def is_course_blocked(request, redeemed_registration_codes, course_key):
@login_required
@ensure_csrf_cookie
def
dashboard
(
request
):
if
settings
.
FEATURES
.
get
(
'ENABLE_MKTG_SITE'
,
False
):
return
redirect
(
settings
.
MKTG_URLS
.
get
(
'ROOT'
)
+
'/dashboard'
)
user
=
request
.
user
platform_name
=
microsite
.
get_value
(
"platform_name"
,
settings
.
PLATFORM_NAME
)
...
...
lms/djangoapps/courseware/views.py
View file @
8696c671
...
...
@@ -828,8 +828,9 @@ def course_about(request, course_id):
)
course
=
get_course_with_access
(
request
.
user
,
permission_name
,
course_key
)
# if microsite.get_value('ENABLE_MKTG_SITE', settings.FEATURES.get('ENABLE_MKTG_SITE', False)):
# return redirect(reverse('info', args=[course.id.to_deprecated_string()]))
# Redirect to IONISx course description page
if
settings
.
IONISX_AUTH
and
settings
.
IONISX_AUTH
.
get
(
'ROOT_URL'
):
return
redirect
(
settings
.
IONISX_AUTH
.
get
(
'ROOT_URL'
)
+
'/return/'
+
course
.
id
.
to_deprecated_string
())
registered
=
registered_for_course
(
course
,
request
.
user
)
...
...
lms/envs/common.py
View file @
8696c671
...
...
@@ -1202,7 +1202,7 @@ X_FRAME_OPTIONS = 'ALLOW'
############################### Pipeline #######################################
STATICFILES_STORAGE
=
'pipeline.storage.PipelineStorage'
STATICFILES_STORAGE
=
'pipeline.storage.Pipeline
Cached
Storage'
from
openedx.core.lib.rooted_paths
import
rooted_glob
...
...
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