admin: split get_queryset() / queryset() methods.

avoid calling loops due to some inherited classes
2014-09-22 15:14:32 +02:00
parent 30eb88fbdb
commit ff6b09e7c7
1 changed files with 8 additions and 4 deletions
@@ -231,11 +231,15 @@ class PolymorphicParentModelAdmin(admin.ModelAdmin):


    def get_queryset(self, request):
-        return self.queryset(request)
-
-
-    def queryset(self, request):
        # optimize the list display.
+        qs = super(PolymorphicParentModelAdmin, self).get_queryset(request)
+        if not self.polymorphic_list:
+            qs = qs.non_polymorphic()
+        return qs
+
+
+    # For Django 1.5:
+    def queryset(self, request):
        qs = super(PolymorphicParentModelAdmin, self).queryset(request)
        if not self.polymorphic_list:
            qs = qs.non_polymorphic()