Changeset 4947

Timestamp:

04/06/07 23:33:45 (2 years ago)

Author:

adrian

Message:

newforms-admin: Converted django.contrib.auth model admin options to use new syntax

Files:

• django/branches/newforms-admin/django/contrib/auth/models.py (modified) (3 diffs)

django/branches/newforms-admin/django/contrib/auth/models.py

@@ -63 +63 @@
-        verbose_name_plural = _('groups')
-        ordering = ('name',)
-
-    class Admin:
-        search_fields = ('name',)
-        filter_horizontal = ('permissions',)
-
-    def __str__(self):
@@ -111 +107 @@
-        verbose_name_plural = _('users')
-        ordering = ('username',)
-
-    class Admin:
-        fields = (
-            (None, {'fields': ('username', 'password')}),
-            (_('Personal info'), {'fields': ('first_name', 'last_name', 'email')}),
-            (_('Permissions'), {'fields': ('is_staff', 'is_active', 'is_superuser', 'user_permissions')}),
-            (_('Important dates'), {'fields': ('last_login', 'date_joined')}),
-            (_('Groups'), {'fields': ('groups',)}),
-        )
-        list_display = ('username', 'email', 'first_name', 'last_name', 'is_staff')
-        list_filter = ('is_staff', 'is_superuser')
-        search_fields = ('username', 'first_name', 'last_name', 'email')
-        filter_horizontal = ('user_permissions',)
-
-    def __str__(self):
@@ -321 +304 @@
-    def is_authenticated(self):
-        return False
+
+# Register the admin options for these models.
+# TODO: Maybe this should live in a separate module admin.py, but how would we
+# ensure that module was loaded?
+
+from django.contrib import admin
+
+class GroupAdmin(admin.ModelAdmin):
+    search_fields = ('name',)
+    filter_horizontal = ('permissions',)
+
+class UserAdmin(admin.ModelAdmin):
+    fields = (
+        (None, {'fields': ('username', 'password')}),
+        (_('Personal info'), {'fields': ('first_name', 'last_name', 'email')}),
+        (_('Permissions'), {'fields': ('is_staff', 'is_active', 'is_superuser', 'user_permissions')}),
+        (_('Important dates'), {'fields': ('last_login', 'date_joined')}),
+        (_('Groups'), {'fields': ('groups',)}),
+    )
+    list_display = ('username', 'email', 'first_name', 'last_name', 'is_staff')
+    list_filter = ('is_staff', 'is_superuser')
+    search_fields = ('username', 'first_name', 'last_name', 'email')
+    filter_horizontal = ('user_permissions',)
+
+admin.site.register(Group, GroupAdmin)
+admin.site.register(User, UserAdmin)