repaired Department and Professor dependencies

diff --git a/karmaworld/apps/courses/admin.py b/karmaworld/apps/courses/admin.py
index e26ac25cfdce13fb76d0b73b16d635ee51ba7dec..f2b7fa0f50718b4cf851b44b1bf20e0118d2bf4a 100644 (file)
--- a/karmaworld/apps/courses/admin.py
+++ b/karmaworld/apps/courses/admin.py
@@ -18,6 +18,12 @@ class CourseAdmin(reversion.VersionAdmin, admin.ModelAdmin):
     autocomplete_lookup_fields = {
         'fk': ['school']
     }
+class DepartmentAdmin(reversion.VersionAdmin, admin.ModelAdmin):
+   """ Admin handler for Department model """
+      
+
+class ProfessorAdmin(reversion.VersionAdmin, admin.ModelAdmin):
+   """ Admin handler for Professor model """
 
 admin.site.register(School)
 admin.site.register(Professor)

diff --git a/karmaworld/apps/courses/models.py b/karmaworld/apps/courses/models.py
index 573bfe4db8bf5f6620c646c18785507dcad8b162..ad083d1a7d95c1247a2c198460a8b2e40c1dca6d 100644 (file)
--- a/karmaworld/apps/courses/models.py
+++ b/karmaworld/apps/courses/models.py
@@ -4,7 +4,7 @@
 
 """
     Models for the courses django app.
-    Handles courses, and their related models
+    Handles courses, and their related modelsl
     Courses are the first class object, they contain notes.
     Courses have a manytoone relation to schools.
 """

diff --git a/karmaworld/apps/moderation/admin.py b/karmaworld/apps/moderation/admin.py
index e99d535224a5c223d2f1f3c5d8ebe577fa68371a..4b14b81a7d67b70bc23f792c6972586dcfb6e600 100644 (file)
--- a/karmaworld/apps/moderation/admin.py
+++ b/karmaworld/apps/moderation/admin.py
@@ -8,6 +8,11 @@ from karmaworld.apps.courses.admin import CourseAdmin
 from karmaworld.apps.notes.models import Note
 from karmaworld.apps.notes.admin import NoteAdmin
 from karmaworld.apps.moderation import moderator
+from karmaworld.apps.courses.models import Professor
+from karmaworld.apps.courses.admin import ProfessorAdmin
+from karmaworld.apps.courses.models import Department
+from karmaworld.apps.courses.admin import DepartmentAdmin
+
 
 
 # Create a simple action to reset flags to zero.
@@ -33,7 +38,7 @@ show_notes.short_description = "Show selected notes"
 class CourseModerator(CourseAdmin):
     date_heirarchy = 'updated_at'
     # Identify fields to display on the Change page
-    list_display = ('name', 'flags', 'url', 'updated_at', 'department','professor')
+    list_display = ('name', 'flags', 'url', 'updated_at', 'department',)
     # Sort by highest number of flags first, and then by date for ties.
     ordering = ('-flags', '-updated_at')
     # Enable resetting flags
@@ -51,7 +56,7 @@ class NoteModerator(NoteAdmin):
     actions = (reset_flags, hide_notes, show_notes)
 
 # Structure views of Department objects
-class DepartmentModerator(NoteAdmin):
+class DepartmentModerator(DepartmentAdmin):
     date_heirarchy = 'uploaded_at'
     # Identify fields to display on the Change page
     list_display = ('name', 'school', 'url')
@@ -61,7 +66,7 @@ class DepartmentModerator(NoteAdmin):
     actions = (reset_flags,)
 
 # Structure views of Professor objects
-class ProfessorModerator(NoteAdmin):
+class ProfessorModerator(ProfessorAdmin):
     date_heirarchy = 'uploaded_at'
     # Identify fields to display on the Change page
     list_display = ('name', 'email')