diff options
| 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 | 
| commit | 13790d69392535543991be2f9de453b6a2fe9493 (patch) | |
| tree | 5df1cfe674759003b1599f7334448f9c7f00637d /ishtar_common/models.py | |
| parent | b9fad2cce5388c1f32a936521149cf2fa36e783e (diff) | |
| download | Ishtar-13790d69392535543991be2f9de453b6a2fe9493.tar.bz2 Ishtar-13790d69392535543991be2f9de453b6a2fe9493.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.py | 8 | 
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  | 
