Ticket #6003: 00-admin-registration.2.diff

django/conf/app_template/admin.py

@@ +1 @@
+from django.contrib import admin
+import models
+
+def register(site_admin):
+    pass # Register your models here.

django/conf/project_template/admin.py

@@ +1 @@
+from django.contrib import admin
+
+# Import admins from your or contrib applications.
+from django.contrib.auth import admin as auth_admin
+from django.contrib.sites import admin as sites_admin
+
+# Register admins from your or contrib applications.
+admin_site = admin.AdminSite()
+auth_admin.register(admin_site)
+sites_admin.register(admin_site)

django/contrib/comments/admin.py

@@ +1 @@
+from django.contrib import admin
+from django.contrib.comments import models
+
+class CommentAdmin(admin.ModelAdmin):
+    fieldsets = (
+        (None, {'fields': ('content_type', 'object_id', 'site')}),
+        ('Content', {'fields': ('user', 'headline', 'comment')}),
+        ('Ratings', {'fields': ('rating1', 'rating2', 'rating3', 'rating4', 'rating5', 'rating6', 'rating7', 'rating8', 'valid_rating')}),
+        ('Meta', {'fields': ('is_public', 'is_removed', 'ip_address')}),
+    )
+    list_display = ('user', 'submit_date', 'content_type', 'get_content_object')
+    list_filter = ('submit_date',)
+    date_hierarchy = 'submit_date'
+    search_fields = ('comment', 'user__username')
+    raw_id_fields = ('user',)
+
+class FreeCommentAdmin(admin.ModelAdmin):
+    fieldsets = (
+        (None, {'fields': ('content_type', 'object_id', 'site')}),
+        ('Content', {'fields': ('person_name', 'comment')}),
+        ('Meta', {'fields': ('submit_date', 'is_public', 'ip_address', 'approved')}),
+    )
+    list_display = ('person_name', 'submit_date', 'content_type', 'get_content_object')
+    list_filter = ('submit_date',)
+    date_hierarchy = 'submit_date'
+    search_fields = ('comment', 'person_name')
+
+def register(admin_site):
+    admin_site.register(models.Comment, CommentAdmin)
+    admin_site.register(models.FreeComment, FreeCommentAdmin)

django/contrib/flatpages/admin.py

@@ +1 @@
+from django.contrib import admin
+from django.contrib.flatpages import models
+
+class FlatPageAdmin(admin.ModelAdmin):
+    fieldsets = (
+        (None, {'fields': ('url', 'title', 'content', 'sites')}),
+        ('Advanced options', {'classes': 'collapse', 'fields': ('enable_comments', 'registration_required', 'template_name')}),
+    )
+    list_filter = ('sites',)
+    search_fields = ('url', 'title')
+
+def register(admin_site):
+    admin_site.register(models.FlatPage, FlatPageAdmin)

django/contrib/redirects/admin.py

@@ +1 @@
+from django.contrib import admin
+from django.contrib.redirects import models
+
+class RedirectAdmin(admin.ModelAdmin):
+    list_filter = ('site',)
+    search_fields = ('old_path', 'new_path')
+
+def register(admin_site):
+    admin_site.register(models.Redirect, RedirectAdmin)
+

django/contrib/sites/admin.py

@@ +1 @@
+from django.contrib import admin
+from django.contrib.sites import models
+
+class SiteAdmin(admin.ModelAdmin):
+    list_display = ('domain', 'name')
+    search_fields = ('domain', 'name')
+
+def register(site):
+    site.register(models.Site, SiteAdmin)

django/conf/project_template/urls.py

@@ -1 +1 @@
 from django.conf.urls.defaults import *
 
 # Uncomment this for admin:
-#from django.contrib import admin
+#import admin
 
 urlpatterns = patterns('',
     # Example:
@@ -11 +11 @@
     #(r'^admin/doc/', include('django.contrib.admindocs.urls')),
 
     # Uncomment this for admin:
-    #('^admin/(.*)', admin.site.root),
+    #('^admin/(.*)', admin.admin_site.root),
 )

django/contrib/admin/__init__.py

@@ -1 +1 @@
 from django.contrib.admin.options import ModelAdmin
 from django.contrib.admin.options import StackedInline, TabularInline
-from django.contrib.admin.sites import AdminSite, site
+from django.contrib.admin.sites import AdminSite

django/contrib/admin/sites.py

@@ -301 +301 @@
 # This global object represents the default admin site, for the common case.
 # You can instantiate AdminSite in your own code to create a custom admin site.
 site = AdminSite()
+

django/contrib/auth/admin.py

@@ -59 +59 @@
             'username_help_text': User._meta.get_field('username').help_text,
         }, context_instance=template.RequestContext(request))
 
-admin.site.register(Group, GroupAdmin)
-admin.site.register(User, UserAdmin)
-
+def register(admin_site):
+    admin_site.register(Group, GroupAdmin)
+    admin_site.register(User, UserAdmin)

django/contrib/auth/models.py

@@ -364 +364 @@
 
     def is_authenticated(self):
         return False
-
-# Register the admin options for these models.
-from django.contrib.auth import admin

django/contrib/comments/models.py

@@ -273 +273 @@
 
     def __unicode__(self):
         return _("Moderator deletion by %r") % self.user
-
-# 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 CommentAdmin(admin.ModelAdmin):
-    fieldsets = (
-        (None, {'fields': ('content_type', 'object_id', 'site')}),
-        ('Content', {'fields': ('user', 'headline', 'comment')}),
-        ('Ratings', {'fields': ('rating1', 'rating2', 'rating3', 'rating4', 'rating5', 'rating6', 'rating7', 'rating8', 'valid_rating')}),
-        ('Meta', {'fields': ('is_public', 'is_removed', 'ip_address')}),
-    )
-    list_display = ('user', 'submit_date', 'content_type', 'get_content_object')
-    list_filter = ('submit_date',)
-    date_hierarchy = 'submit_date'
-    search_fields = ('comment', 'user__username')
-    raw_id_fields = ('user',)
-
-class FreeCommentAdmin(admin.ModelAdmin):
-    fieldsets = (
-        (None, {'fields': ('content_type', 'object_id', 'site')}),
-        ('Content', {'fields': ('person_name', 'comment')}),
-        ('Meta', {'fields': ('submit_date', 'is_public', 'ip_address', 'approved')}),
-    )
-    list_display = ('person_name', 'submit_date', 'content_type', 'get_content_object')
-    list_filter = ('submit_date',)
-    date_hierarchy = 'submit_date'
-    search_fields = ('comment', 'person_name')
-
-admin.site.register(Comment, CommentAdmin)
-admin.site.register(FreeComment, FreeCommentAdmin)

django/contrib/flatpages/models.py

@@ -25 +25 @@
 
     def get_absolute_url(self):
         return self.url
-
-# 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 FlatPageAdmin(admin.ModelAdmin):
-    fieldsets = (
-        (None, {'fields': ('url', 'title', 'content', 'sites')}),
-        ('Advanced options', {'classes': 'collapse', 'fields': ('enable_comments', 'registration_required', 'template_name')}),
-    )
-    list_filter = ('sites',)
-    search_fields = ('url', 'title')
-
-admin.site.register(FlatPage, FlatPageAdmin)

django/contrib/redirects/models.py

@@ -18 +18 @@
 
     def __unicode__(self):
         return "%s ---> %s" % (self.old_path, self.new_path)
-
-# 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 RedirectAdmin(admin.ModelAdmin):
-    list_filter = ('site',)
-    search_fields = ('old_path', 'new_path')
-
-admin.site.register(Redirect, RedirectAdmin)
-

django/contrib/sites/models.py

@@ -42 +42 @@
     def __unicode__(self):
         return self.domain
 
-# 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 SiteAdmin(admin.ModelAdmin):
-    list_display = ('domain', 'name')
-    search_fields = ('domain', 'name')
-
-admin.site.register(Site, SiteAdmin)
-
 class RequestSite(object):
     """
     A class that shares the primary interface of Site (i.e., it has