Add fix and tests for generic tagging on proxy models

jazzband · May 25, 2019 · f06b40c · f06b40c
1 parent 20ab5ff
commit f06b40c
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 0 deletions.
diff --git a/taggit/models.py b/taggit/models.py
@@ -143,6 +143,7 @@ def lookup_kwargs(cls, instance):
     @classmethod
     def tags_for(cls, model, instance=None, **extra_filters):
         tag_relname = cls.tag_relname()
+        model = model._meta.concrete_model
         kwargs = {
             "%s__content_type__app_label" % tag_relname: model._meta.app_label,
             "%s__content_type__model" % tag_relname: model._meta.model_name,

diff --git a/tests/migrations/0001_initial.py b/tests/migrations/0001_initial.py
@@ -331,6 +331,12 @@ class Migration(migrations.Migration):
             ],
             options={"abstract": False},
         ),
+        migrations.CreateModel(
+            name="ProxyPhoto",
+            fields=[],
+            options={"proxy": True, "indexes": []},
+            bases=("tests.photo",),
+        ),
         migrations.CreateModel(
             name="TaggedCustomPK",
             fields=[

diff --git a/tests/models.py b/tests/models.py
@@ -226,6 +226,11 @@ class Movie(Media):
     pass
 
 
+class ProxyPhoto(Photo):
+    class Meta:
+        proxy = True
+
+
 class ArticleTag(Tag):
     class Meta:
         proxy = True

diff --git a/tests/tests.py b/tests/tests.py
@@ -39,6 +39,7 @@
     OfficialThroughModel,
     Pet,
     Photo,
+    ProxyPhoto,
     TaggedCustomPK,
     TaggedCustomPKFood,
     TaggedFood,
@@ -628,6 +629,17 @@ def test_abstract_subclasses(self):
         m.tags.add("hd")
         self.assert_tags_equal(m.tags.all(), ["hd"])
 
+    def test_proxy_subclasses(self):
+        p = Photo.objects.create()
+        proxy_p = ProxyPhoto.objects.create()
+        p.tags.add("outdoors", "pretty")
+        self.assert_tags_equal(p.tags.all(), ["outdoors", "pretty"])
+        self.assert_tags_equal(proxy_p.tags.all(), [])
+
+        proxy_p.tags.add("hd")
+        self.assert_tags_equal(proxy_p.tags.all(), ["hd"])
+        self.assert_tags_equal(p.tags.all(), ["outdoors", "pretty"])
+
     def test_field_api(self):
         # Check if tag field, which simulates m2m, has django-like api.
         field = self.food_model._meta.get_field("tags")