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
2695e7b3
Commit
2695e7b3
authored
Dec 11, 2015
by
Clinton Blackburn
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #10965 from edx/clintonb/credit-followup
Followup to Credit Patch
parents
be1adc38
27f853d6
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
7 deletions
+3
-7
common/djangoapps/student/tests/test_credit.py
+1
-2
lms/templates/dashboard/_dashboard_credit_info.html
+2
-5
No files found.
common/djangoapps/student/tests/test_credit.py
View file @
2695e7b3
...
...
@@ -116,9 +116,8 @@ class CreditCourseDashboardTest(ModuleStoreTestCase):
self
.
_make_eligible
()
self
.
_purchase_credit
()
# Expect that the user's status is "pending"
response
=
self
.
_load_dashboard
()
self
.
assertContains
(
response
,
"credit-request-
pending
-msg"
)
self
.
assertContains
(
response
,
"credit-request-
not-started
-msg"
)
def
test_purchased_credit_and_request_pending
(
self
):
# Simulate that the user has purchased credit and initiated a request,
...
...
lms/templates/dashboard/_dashboard_credit_info.html
View file @
2695e7b3
...
...
@@ -13,9 +13,6 @@
error =
credit_status['error']
status =
'eligible'
#
Translators:
provider_name
is
the
name
of
a
credit
provider
or
university
(
e
.
g
.
State
University
)
credit_msg =
_("You
have
completed
this
course
and
are
eligible
to
purchase
course
credit
.
Select
<
strong
>
Get Credit
</strong>
to get started.")
credit_msg_class = "credit-eligibility-msg"
...
...
@@ -35,7 +32,7 @@
"at the {link_to_provider_site} website. Select
<b>
Request Credit
</b>
to get started.").format(
link_to_provider_site=provider_link,
)
credit_msg_class = "credit-request-
pending
-msg"
credit_msg_class = "credit-request-
not-started
-msg"
credit_btn_label = _("Request Credit")
credit_btn_class = 'pending-credit-btn'
elif request_status == 'pending':
...
...
@@ -77,7 +74,7 @@
</p>
<div
class=
"credit-action"
>
% if credit_btn_label:
<a
class=
"btn credit-btn ${credit_btn_class}"
href=
"${credit_btn_href
}"
target=
"_blank"
data-course-key=
"${credit_status['course_key']}"
data-user=
"${user.username}"
data-provider=
"${credit_status['provider_id']
}"
>
<a
class=
"btn credit-btn ${credit_btn_class}"
href=
"${credit_btn_href
| h}"
target=
"_blank"
data-course-key=
"${credit_status['course_key'] | h}"
data-user=
"${user.username | h}"
data-provider=
"${credit_status['provider_id'] | h
}"
>
${credit_btn_label}
</a>
% endif
...
...
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