Ticket #5968: 5968-3.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, models.base.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, models.base.ModelBase):
             model_or_iterable = [model_or_iterable]
         for model in model_or_iterable:
             if model not in self.registry:

docs/ref/contrib/databrowse.txt

@@ -39 +39 @@
     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 :doc:`URLconf file
        </topics/http/urls>` (``urls.py``).

new file tests/regressiontests/bug5968/models.py

@@ +1 @@
+from django.db import models
+
+class SomeModel(models.Model):
+    some_field = models.CharField(max_length=50)
+
+    def __unicode__(self):
+        return self.some_field
+
+class SomeOtherModel(models.Model):
+    some_other_field = models.CharField(max_length=50)
+
+    def __unicode__(self):
+        return self.some_other_field
+
+class YetAnotherModel(models.Model):
+    yet_another_field = models.CharField(max_length=50)
+
+    def __unicode__(self):
+        return self.yet_another_field

new file tests/regressiontests/bug5968/tests.py

@@ +1 @@
+from django.contrib import databrowse
+from django.test import TestCase
+
+from models import SomeModel, SomeOtherModel, YetAnotherModel
+
+class Bug5968Test(TestCase):
+    """
+    Test for bug #5968 - allow an iterable containing models to be passed to
+    databrowse.site.register/unregister.
+
+    """
+
+    def setUp(self):
+        sm1 = SomeModel.objects.create(some_field="Some Data 1")
+        sm2 = SomeModel.objects.create(some_field="Some Data 2")
+        som1 = SomeOtherModel.objects.create(some_other_field="Some Other Data 1")
+        som2 = SomeOtherModel.objects.create(some_other_field="Some Other Data 2")
+        yam1 = YetAnotherModel.objects.create(yet_another_field="Yet Some Other Data 1")
+        yam2 = YetAnotherModel.objects.create(yet_another_field="Yet Some Other Data 2")
+
+    def test_databrowse_registration(self):
+        databrowse.site.register(SomeModel)
+        self.assertEqual(SomeModel in databrowse.site.registry, True)
+        databrowse.site.register([SomeOtherModel, YetAnotherModel])
+        self.assertEqual(SomeOtherModel in databrowse.site.registry and
+            YetAnotherModel in databrowse.site.registry, True)
+
+        self.assertRaisesMessage(
+            databrowse.sites.AlreadyRegistered,
+            'The model SomeModel is already registered',
+            databrowse.site.register, [SomeModel, SomeOtherModel]
+        )
+
+        databrowse.site.unregister(SomeOtherModel)
+        self.assertEqual(SomeOtherModel not in databrowse.site.registry, True)
+        databrowse.site.unregister([SomeModel, YetAnotherModel])
+        self.assertEqual(SomeModel not in databrowse.site.registry and
+            YetAnotherModel not in databrowse.site.registry, True)
+
+        self.assertRaisesMessage(
+            databrowse.sites.NotRegistered,
+            'The model SomeModel is not registered',
+            databrowse.site.unregister, [SomeModel, SomeOtherModel]
+        )
+
+        self.assertRaisesMessage(
+            databrowse.sites.AlreadyRegistered,
+            'The model SomeModel is already registered',
+            databrowse.site.register, [SomeModel, SomeModel]
+        )
+
+        databrowse.site.unregister(SomeModel)
+        databrowse.site.register([SomeModel])
+        self.assertEqual(SomeModel in databrowse.site.registry, True)
+