Merge branch 'v0.9' into wheezy

1 files changed, 7 insertions, 2 deletions

diff --git a/ishtar_common/models.py b/ishtar_common/models.py
index 95d995a91..ba3d51172 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, replace_query={}):
+    def get_owns(cls, user, replace_query={}, limit=None):
         """
         Get Own items
         """
@@ -252,7 +252,10 @@ class OwnPerms:
         q = cls.objects.filter(query)
         if replace_query:
             q = cls.objects.filter(**replace_query)
-        items += list(q.order_by(*cls._meta.ordering).all())
+        if limit:
+            items += list(q.order_by('-pk')[:limit])
+        else:
+            items += list(q.order_by(*cls._meta.ordering).all())
         return items
 
 
@@ -2526,6 +2529,8 @@ class IshtarUser(User):
                   'person__attached_to')
     person = models.ForeignKey(Person, verbose_name=_(u"Person"), unique=True,
                                related_name='ishtaruser')
+    advanced_shortcut_menu = models.BooleanField(
+        _(u"Advanced shortcut menu"), default=False)
 
     class Meta:
         verbose_name = _(u"Ishtar user")