diff --git a/openedx/core/djangoapps/credit/admin.py b/openedx/core/djangoapps/credit/admin.py index 3fd6d89943..054a399e04 100644 --- a/openedx/core/djangoapps/credit/admin.py +++ b/openedx/core/djangoapps/credit/admin.py @@ -2,8 +2,10 @@ Django admin page for credit eligibility """ from ratelimitbackend import admin + from openedx.core.djangoapps.credit.models import ( - CreditConfig, CreditCourse, CreditProvider, CreditEligibility, CreditRequest + CreditConfig, CreditCourse, CreditProvider, CreditEligibility, CreditRequest, CreditRequirement, + CreditRequirementStatus ) @@ -47,8 +49,26 @@ class CreditRequestAdmin(admin.ModelAdmin): model = CreditRequest +class CreditRequirementAdmin(admin.ModelAdmin): + """ Admin for CreditRequirement. """ + list_display = ('course', 'namespace', 'name', 'display_name', 'active',) + + class Meta(object): + model = CreditRequirement + + +class CreditRequirementStatusAdmin(admin.ModelAdmin): + """ Admin for CreditRequirementStatus. """ + list_display = ('username', 'requirement', 'status',) + + class Meta(object): + model = CreditRequirementStatus + + admin.site.register(CreditCourse, CreditCourseAdmin) admin.site.register(CreditProvider, CreditProviderAdmin) admin.site.register(CreditEligibility, CreditEligibilityAdmin) admin.site.register(CreditRequest, CreditRequestAdmin) admin.site.register(CreditConfig) +admin.site.register(CreditRequirement, CreditRequirementAdmin) +admin.site.register(CreditRequirementStatus, CreditRequirementStatusAdmin) diff --git a/openedx/core/djangoapps/credit/models.py b/openedx/core/djangoapps/credit/models.py index c657e7118b..8bd3071a5e 100644 --- a/openedx/core/djangoapps/credit/models.py +++ b/openedx/core/djangoapps/credit/models.py @@ -294,6 +294,9 @@ class CreditRequirement(TimeStampedModel): unique_together = ('namespace', 'name', 'course') ordering = ["order"] + def __unicode__(self): + return self.display_name + @classmethod def add_or_update_course_requirement(cls, credit_course, requirement, order): """ diff --git a/openedx/core/djangoapps/credit/signals.py b/openedx/core/djangoapps/credit/signals.py index fbec5c9bd8..30f40a0f2f 100644 --- a/openedx/core/djangoapps/credit/signals.py +++ b/openedx/core/djangoapps/credit/signals.py @@ -55,8 +55,7 @@ def on_pre_publish(sender, course_key, **kwargs): # pylint: disable=unused-argu @receiver(GRADES_UPDATED) def listen_for_grade_calculation(sender, username, grade_summary, course_key, deadline, **kwargs): # pylint: disable=unused-argument - """Receive 'MIN_GRADE_REQUIREMENT_STATUS' signal and update minimum grade - requirement status. + """Receive 'MIN_GRADE_REQUIREMENT_STATUS' signal and update minimum grade requirement status. Args: sender: None