Ticket #5968: 5968-2.diff

django/contrib/databrowse/sites.py

@@ -1 +1 @@
 from django import http
 from django.db import models
+from django.db.models.base import ModelBase
 from django.contrib.databrowse.datastructures import EasyModel
 from django.shortcuts import render_to_response
 from django.utils.safestring import mark_safe
@@ -85 +86 @@
         If a model is already registered, this will raise AlreadyRegistered.
         """
         databrowse_class = databrowse_class or DefaultModelDatabrowse
-        if issubclass(model_or_iterable, models.Model):
+        if isinstance(model_or_iterable, ModelBase):
             model_or_iterable = [model_or_iterable]
         for model in model_or_iterable:
             if model in self.registry:
@@ -98 +99 @@
 
         If a model isn't already registered, this will raise NotRegistered.
         """
-        if issubclass(model_or_iterable, models.Model):
+        if isinstance(model_or_iterable, ModelBase):
             model_or_iterable = [model_or_iterable]
         for model in model_or_iterable:
             if model not in self.registry:

docs/ref/contrib/databrowse.txt

@@ -41 +41 @@
     2. Register a number of models with the Databrowse site::
 
            from django.contrib import databrowse
-           from myapp.models import SomeModel, SomeOtherModel
+           from myapp.models import SomeModel, SomeOtherModel, YetAnotherModel
 
            databrowse.site.register(SomeModel)
-           databrowse.site.register(SomeOtherModel)
+           databrowse.site.register([SomeOtherModel, YetAnotherModel])
 
        Note that you should register the model *classes*, not instances.
 
+       The register function accepts an individual model class or a list of classes.
+
        It doesn't matter where you put this, as long as it gets executed at some
        point. A good place for it is in your :ref:`URLconf file
        <topics-http-urls>` (``urls.py``).