Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #10965 from edx/clintonb/credit-followup

Browse Source 
Followup to Credit Patch
This commit is contained in:
Clinton Blackburn
2015-12-11 17:06:24 -05:00
parent be1adc3887 27f853d605
commit 2695e7b3cb
2 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
common/djangoapps/student/tests/test_credit.py
View File

@@ -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,

7
lms/templates/dashboard/_dashboard_credit_info.html
View File

@@ -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