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
dc0e3d04
Commit
dc0e3d04
authored
11 years ago
by
Diana Huang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Determine which mode was selected more intelligently.
LMS-1384
parent
9f104eb6
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
14 deletions
+12
-14
common/djangoapps/course_modes/views.py
+9
-11
common/templates/course_modes/choose.html
+3
-3
No files found.
common/djangoapps/course_modes/views.py
View file @
dc0e3d04
...
...
@@ -82,9 +82,7 @@ class ChooseModeView(View):
upgrade
=
request
.
GET
.
get
(
'upgrade'
,
False
)
requested_mode
=
self
.
get_requested_mode
(
request
.
POST
.
get
(
"mode"
))
if
requested_mode
==
"verified"
and
request
.
POST
.
get
(
"honor-code"
):
requested_mode
=
"honor"
requested_mode
=
self
.
get_requested_mode
(
request
.
POST
)
allowed_modes
=
CourseMode
.
modes_for_course_dict
(
course_id
)
if
requested_mode
not
in
allowed_modes
:
...
...
@@ -125,14 +123,14 @@ class ChooseModeView(View):
reverse
(
'verify_student_show_requirements'
,
kwargs
=
{
'course_id'
:
course_id
})
+
"?upgrade={}"
.
format
(
upgrade
))
def
get_requested_mode
(
self
,
user_choice
):
def
get_requested_mode
(
self
,
request_dict
):
"""
Given the
tex
t of `user_choice`, return the
Given the
request objec
t of `user_choice`, return the
corresponding course mode slug
"""
choices
=
{
"Select Audit"
:
"audit"
,
"Select Certificate"
:
"verified"
,
"Upgrade Your Registration"
:
"verified"
}
return
choices
.
get
(
user_choice
)
if
'audit_mode'
in
request_dict
:
return
'audit'
if
'certificate_mode'
and
request_dict
.
get
(
"honor-code"
):
return
'honor'
if
'certificate_mode'
in
request_dict
:
return
'verified'
This diff is collapsed.
Click to expand it.
common/templates/course_modes/choose.html
View file @
dc0e3d04
...
...
@@ -134,9 +134,9 @@ $(document).ready(function() {
<ul
class=
"list-actions"
>
<li
class=
"action action-select"
>
%if upgrade:
<input
type=
"submit"
name=
"mode"
value=
"Upgrade Your Registration
"
/>
<input
type=
"submit"
name=
"certificate_mode"
value=
"${_('Upgrade Your Registration')}
"
/>
%else:
<input
type=
"submit"
name=
"mode"
value=
"Select Certificate
"
/>
<input
type=
"submit"
name=
"certificate_mode"
value=
"${_('Select Certificate')}
"
/>
%endif
</li>
...
...
@@ -179,7 +179,7 @@ $(document).ready(function() {
<ul
class=
"list-actions"
>
<li
class=
"action action-select"
>
<input
type=
"submit"
name=
"mode"
value=
"Select Audit
"
/>
<input
type=
"submit"
name=
"audit_mode"
value=
"${_('Select Audit')}
"
/>
</li>
</ul>
</div>
...
...
This diff is collapsed.
Click to expand it.
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