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
31f2e42c
Commit
31f2e42c
authored
Apr 04, 2015
by
Chris Dodge
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
be sure to take platform_name from microsite config paths in the dashboard
add some more microsite aware config checks
parent
fc7b35c7
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
3 deletions
+7
-3
common/djangoapps/student/views.py
+7
-3
No files found.
common/djangoapps/student/views.py
View file @
31f2e42c
...
...
@@ -498,6 +498,8 @@ def is_course_blocked(request, redeemed_registration_codes, course_key):
def
dashboard
(
request
):
user
=
request
.
user
platform_name
=
microsite
.
get_value
(
"platform_name"
,
settings
.
PLATFORM_NAME
)
# for microsites, we want to filter and only show enrollments for courses within
# the microsites 'ORG'
course_org_filter
=
microsite
.
get_value
(
'course_org_filter'
)
...
...
@@ -541,7 +543,7 @@ def dashboard(request):
if
not
user
.
is_active
:
message
=
render_to_string
(
'registration/activate_account_notice.html'
,
{
'email'
:
user
.
email
,
'platform_name'
:
settings
.
PLATFORM_NAME
}
{
'email'
:
user
.
email
,
'platform_name'
:
platform_name
}
)
# Global staff can see what courses errored on their dashboard
...
...
@@ -686,7 +688,7 @@ def dashboard(request):
'user'
:
user
,
'duplicate_provider'
:
None
,
'logout_url'
:
reverse
(
logout_user
),
'platform_name'
:
settings
.
PLATFORM_NAME
,
'platform_name'
:
platform_name
,
'enrolled_courses_either_paid'
:
enrolled_courses_either_paid
,
'provider_states'
:
[],
'order_history_list'
:
order_history_list
,
...
...
@@ -726,9 +728,11 @@ def _create_recent_enrollment_message(course_enrollment_pairs, course_modes):
for
course
,
enrollment
in
recently_enrolled_courses
]
platform_name
=
microsite
.
get_value
(
'platform_name'
,
settings
.
PLATFORM_NAME
)
return
render_to_string
(
'enrollment/course_enrollment_message.html'
,
{
'course_enrollment_messages'
:
messages
,
'platform_name'
:
settings
.
PLATFORM_NAME
}
{
'course_enrollment_messages'
:
messages
,
'platform_name'
:
platform_name
}
)
...
...
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