summaryrefslogtreecommitdiff
path: root/ishtar_common/models.py
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@iggdrasil.net>2016-09-09 00:41:57 +0200
committerÉtienne Loks <etienne.loks@iggdrasil.net>2016-09-09 00:41:57 +0200
commit5230a8e0a06a5d67d6c13f2359bc51be07b4fb5a (patch)
tree5df1cfe674759003b1599f7334448f9c7f00637d /ishtar_common/models.py
parent06f8d8f45d5c08ec9ed17cee4836f3311703e6df (diff)
downloadIshtar-5230a8e0a06a5d67d6c13f2359bc51be07b4fb5a.tar.bz2
Ishtar-5230a8e0a06a5d67d6c13f2359bc51be07b4fb5a.zip
Shortcut menu: menu is now dynamic - selected items filter dependant items (refs #2996) - can now pin items from sheet (refs #3078)
Diffstat (limited to 'ishtar_common/models.py')
-rw-r--r--ishtar_common/models.py8
1 files changed, 5 insertions, 3 deletions
diff --git a/ishtar_common/models.py b/ishtar_common/models.py
index 6150ab0aa..9e48df8d2 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):
+ def get_owns(cls, user, extra_query={}):
"""
Get Own items
"""
@@ -249,8 +249,10 @@ class OwnPerms:
query = cls.get_query_owns(user)
if not query:
return cls.objects.filter(pk__isnull=True)
- items += list(
- cls.objects.filter(query).order_by(*cls._meta.ordering).all())
+ q = cls.objects.filter(query)
+ if extra_query:
+ q = q.filter(**extra_query)
+ items += list(q.order_by(*cls._meta.ordering).all())
return items