diff --git a/openedx/core/djangoapps/credit/admin.py b/openedx/core/djangoapps/credit/admin.py index 054a399e04..b30803e3d2 100644 --- a/openedx/core/djangoapps/credit/admin.py +++ b/openedx/core/djangoapps/credit/admin.py @@ -52,6 +52,8 @@ class CreditRequestAdmin(admin.ModelAdmin): class CreditRequirementAdmin(admin.ModelAdmin): """ Admin for CreditRequirement. """ list_display = ('course', 'namespace', 'name', 'display_name', 'active',) + list_filter = ('active', 'namespace',) + search_fields = ('course__course_key', 'namespace', 'name',) class Meta(object): model = CreditRequirement @@ -60,6 +62,7 @@ class CreditRequirementAdmin(admin.ModelAdmin): class CreditRequirementStatusAdmin(admin.ModelAdmin): """ Admin for CreditRequirementStatus. """ list_display = ('username', 'requirement', 'status',) + search_fields = ('username', 'requirement__course__course_key',) class Meta(object): model = CreditRequirementStatus diff --git a/openedx/core/djangoapps/credit/migrations/0003_auto_20160511_2227.py b/openedx/core/djangoapps/credit/migrations/0003_auto_20160511_2227.py new file mode 100644 index 0000000000..a8a676e788 --- /dev/null +++ b/openedx/core/djangoapps/credit/migrations/0003_auto_20160511_2227.py @@ -0,0 +1,18 @@ +# -*- coding: utf-8 -*- +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('credit', '0002_creditconfig'), + ] + + operations = [ + migrations.AlterModelOptions( + name='creditrequirementstatus', + options={'verbose_name_plural': 'Credit requirement statuses'}, + ), + ] diff --git a/openedx/core/djangoapps/credit/models.py b/openedx/core/djangoapps/credit/models.py index 8bd3071a5e..ebd1115f1c 100644 --- a/openedx/core/djangoapps/credit/models.py +++ b/openedx/core/djangoapps/credit/models.py @@ -295,7 +295,7 @@ class CreditRequirement(TimeStampedModel): ordering = ["order"] def __unicode__(self): - return self.display_name + return '{course_id} - {name}'.format(course_id=self.course.course_key, name=self.display_name) @classmethod def add_or_update_course_requirement(cls, credit_course, requirement, order): @@ -430,6 +430,7 @@ class CreditRequirementStatus(TimeStampedModel): class Meta(object): unique_together = ('username', 'requirement') + verbose_name_plural = _('Credit requirement statuses') @classmethod def get_statuses(cls, requirements, username):