Merge pull request #9816 from edx/clintonb/admin-updates

Additional Admin Updates

common/djangoapps/student/admin.py

@@ -137,13 +137,31 @@ class CourseEnrollmentAdmin(admin.ModelAdmin):
     list_display = ('id', 'course_id', 'mode', 'user', 'is_active',)
     list_filter = ('mode', 'is_active',)
     search_fields = ('course_id', 'mode', 'user__username',)
-    readonly_fields = ('course_id', 'mode', 'user',)
+
+    def get_readonly_fields(self, request, obj=None):
+        # The course_id, mode, and user fields should not be editable for an existing enrollment.
+        if obj:
+            return self.readonly_fields + ('course_id', 'mode', 'user',)
+        return self.readonly_fields
 
     class Meta(object):  # pylint: disable=missing-docstring
         model = CourseEnrollment
 
 
-admin.site.register(UserProfile)
+class UserProfileAdmin(admin.ModelAdmin):
+    """ Admin interface for UserProfile model. """
+    list_display = ('user', 'name',)
+    search_fields = ('user__username', 'user__first_name', 'user__last_name', 'user__email', 'name',)
+
+    def get_readonly_fields(self, request, obj=None):
+        # The user field should not be editable for an existing user profile.
+        if obj:
+            return self.readonly_fields + ('user',)
+        return self.readonly_fields
+
+    class Meta(object):  # pylint: disable=missing-docstring
+        model = UserProfile
+
 
 admin.site.register(UserTestGroup)
 
@@ -160,3 +178,5 @@ admin.site.register(DashboardConfiguration, ConfigurationModelAdmin)
 admin.site.register(LinkedInAddToProfileConfiguration, LinkedInAddToProfileConfigurationAdmin)
 
 admin.site.register(CourseEnrollment, CourseEnrollmentAdmin)
+
+admin.site.register(UserProfile, UserProfileAdmin)

openedx/core/djangoapps/credit/admin.py

@@ -9,23 +9,42 @@ from openedx.core.djangoapps.credit.models import (
 
 class CreditCourseAdmin(admin.ModelAdmin):
     """Admin for credit courses. """
-    search_fields = ("course_key",)
+    list_display = ('course_key', 'enabled',)
+    list_filter = ('enabled',)
+    search_fields = ('course_key',)
+
+    class Meta(object):  # pylint: disable=missing-docstring
+        model = CreditCourse
 
 
 class CreditProviderAdmin(admin.ModelAdmin):
     """Admin for credit providers. """
-    search_fields = ("provider_id", "display_name")
+    list_display = ('provider_id', 'display_name', 'active',)
+    list_filter = ('active',)
+    search_fields = ('provider_id', 'display_name')
+
+    class Meta(object):  # pylint: disable=missing-docstring
+        model = CreditProvider
 
 
 class CreditEligibilityAdmin(admin.ModelAdmin):
     """Admin for credit eligibility. """
-    search_fields = ("username", "course__course_key")
+    list_display = ('course', 'username', 'deadline')
+    search_fields = ('username', 'course__course_key')
+
+    class Meta(object):  # pylint: disable=missing-docstring
+        model = CreditEligibility
 
 
 class CreditRequestAdmin(admin.ModelAdmin):
     """Admin for credit requests. """
-    search_fields = ("uuid", "username", "course__course_key", "provider__provider_id")
-    readonly_fields = ("uuid",)
+    list_display = ('provider', 'course', 'status', 'username')
+    list_filter = ('provider', 'status',)
+    readonly_fields = ('uuid',)
+    search_fields = ('uuid', 'username', 'course__course_key', 'provider__provider_id')
+
+    class Meta(object):  # pylint: disable=missing-docstring
+        model = CreditRequest
 
 
 admin.site.register(CreditCourse, CreditCourseAdmin)