Generic management of baskets in owns items

1 files changed, 6 insertions, 1 deletions

diff --git a/ishtar_common/models.py b/ishtar_common/models.py
index 33ae05369..f3974d04d 100644
--- a/ishtar_common/models.py
+++ b/ishtar_common/models.py
@@ -243,10 +243,15 @@ class OwnPerms:
             user = IshtarUser.objects.get(user_ptr=user)
         if user.is_anonymous():
             return cls.objects.filter(pk__isnull=True)
+        items = []
+        if hasattr(cls, 'BASKET_MODEL'):
+            items = list(cls.BASKET_MODEL.objects.filter(user=user).all())
         query = cls.get_query_owns(user)
         if not query:
             return cls.objects.filter(pk__isnull=True)
-        return cls.objects.filter(query).order_by(*cls._meta.ordering)
+        items += list(
+            cls.objects.filter(query).order_by(*cls._meta.ordering).all())
+        return items
 
 
 class Cached(object):