diff options
author | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-09-09 14:32:28 +0200 |
---|---|---|
committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-09-09 14:32:28 +0200 |
commit | 916920ad3dcc18c2c252698ee192c265743ab01a (patch) | |
tree | af639c67b2f1637d4a8526776e556906a3fbe882 /ishtar_common/models.py | |
parent | 19aca26153c716737dffd48effbb98a6a4540caf (diff) | |
download | Ishtar-916920ad3dcc18c2c252698ee192c265743ab01a.tar.bz2 Ishtar-916920ad3dcc18c2c252698ee192c265743ab01a.zip |
Shortcut menu: show all dependent items of pinned but not own parent item
Diffstat (limited to 'ishtar_common/models.py')
-rw-r--r-- | ishtar_common/models.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/ishtar_common/models.py b/ishtar_common/models.py index 9e48df8d2..29dedd113 100644 --- a/ishtar_common/models.py +++ b/ishtar_common/models.py @@ -235,7 +235,7 @@ class OwnPerms: return cls.objects.filter(query).count() @classmethod - def get_owns(cls, user, extra_query={}): + def get_owns(cls, user, replace_query={}): """ Get Own items """ @@ -247,11 +247,11 @@ class OwnPerms: if hasattr(cls, 'BASKET_MODEL'): items = list(cls.BASKET_MODEL.objects.filter(user=user).all()) query = cls.get_query_owns(user) - if not query: + if not query and not replace_query: return cls.objects.filter(pk__isnull=True) q = cls.objects.filter(query) - if extra_query: - q = q.filter(**extra_query) + if replace_query: + q = cls.objects.filter(**replace_query) items += list(q.order_by(*cls._meta.ordering).all()) return items |