Changeset 5eb3da3 for asadb/groups

Timestamp:

Aug 14, 2011, 9:09:03 PM (14 years ago)

Author:

Alex Dehnert <adehnert@…>

Branches:

master, space-access, stable, stage, test-hooks

Children:

1d495e2

Parents:

b98ef9c

git-author:

Alex Dehnert <adehnert@…> (08/14/11 21:09:03)

git-committer:

Alex Dehnert <adehnert@…> (08/14/11 21:09:03)

Message:

Rearrange admin setup

File:

• asadb/groups/admin.py (modified) (9 diffs)

asadb/groups/admin.py

@@ -25 +25 @@
     date_hierarchy = 'update_date'
     search_fields = [ 'id', 'name', 'abbreviation', 'officer_email', 'athena_locker', ]
+admin.site.register(groups.models.Group, GroupAdmin)
+
 
 class Admin_GroupNote(VersionAdmin):
@@ -48 +50 @@
         'group__athena_locker',
     ]
+admin.site.register(groups.models.GroupNote, Admin_GroupNote)
+
 
 class OfficerRoleAdmin(VersionAdmin):
@@ -60 +64 @@
     list_display_links = ('id', 'display_name', 'slug', )
     prepopulated_fields = {"slug": ("display_name",)}
+admin.site.register(groups.models.OfficerRole, OfficerRoleAdmin)
+
 
 class OfficeHolderAdmin(VersionAdmin):
@@ -83 +89 @@
         'start_time', 'end_time',
     )
+admin.site.register(groups.models.OfficeHolder, OfficeHolderAdmin)
+
 
 class ActivityCategoryAdmin(admin.ModelAdmin):
@@ -90 +98 @@
     )
     list_display_links = ('id', 'name', )
+admin.site.register(groups.models.ActivityCategory, ActivityCategoryAdmin)
+
 
 class Admin_GroupClass(admin.ModelAdmin):
@@ -101 +111 @@
     list_filter = [ 'gets_publicity', ]
     prepopulated_fields = {'slug': ('name', )}
+admin.site.register(groups.models.GroupClass, Admin_GroupClass)
+
 
 class Admin_GroupStatus(admin.ModelAdmin):
@@ -112 +124 @@
     list_filter = [ 'is_active', ]
     prepopulated_fields = {'slug': ('name', )}
+admin.site.register(groups.models.GroupStatus, Admin_GroupStatus)
+
 
 class Admin_GroupFunding(admin.ModelAdmin):
@@ -123 +137 @@
     list_display_links = ('id', 'name', 'slug', )
     prepopulated_fields = {'slug': ('name', )}
+admin.site.register(groups.models.GroupFunding, Admin_GroupFunding)
 
-class Admin_GroupClass(admin.ModelAdmin):
-    list_display = (
-        'id',
-        'name',
-        'slug',
-        'gets_publicity',
-    )
-    list_display_links = ('id', 'name', 'slug', )
-    list_filter = [ 'gets_publicity', ]
-    prepopulated_fields = {'slug': ('name', )}
 
 class Admin_AthenaMoiraAccount(admin.ModelAdmin):
@@ -150 +155 @@
     list_display_links = ( 'id', 'username', )
     search_fields = ( 'username', 'mit_id', 'first_name', 'last_name', 'account_class', )
-
-admin.site.register(groups.models.Group, GroupAdmin)
-admin.site.register(groups.models.GroupNote, Admin_GroupNote)
-admin.site.register(groups.models.OfficerRole, OfficerRoleAdmin)
-admin.site.register(groups.models.OfficeHolder, OfficeHolderAdmin)
-admin.site.register(groups.models.ActivityCategory, ActivityCategoryAdmin)
-admin.site.register(groups.models.GroupClass, Admin_GroupClass)
-admin.site.register(groups.models.GroupStatus, Admin_GroupStatus)
-admin.site.register(groups.models.GroupFunding, Admin_GroupFunding)
 admin.site.register(groups.models.AthenaMoiraAccount, Admin_AthenaMoiraAccount)