Bläddra i källkod

Wrap some lines to 80 characters

Erick Tryzelaar 11 år sedan
förälder
incheckning
b18ed0f
2 ändrade filer med 25 tillägg och 5 borttagningar
  1. 20 4
      desktop/core/src/desktop/api.py
  2. 5 1
      desktop/core/src/desktop/models.py

+ 20 - 4
desktop/core/src/desktop/api.py

@@ -39,8 +39,23 @@ def _get_docs(user):
   history_tag = DocumentTag.objects.get_history_tag(user)
   trash_tag = DocumentTag.objects.get_trash_tag(user)
   docs = itertools.chain(
-      Document.objects.get_docs(user).exclude(tags__in=[trash_tag]).filter(tags__in=[history_tag]).select_related('DocumentTag', 'User', 'DocumentPermission').order_by('-last_modified')[:500],
-      Document.objects.get_docs(user).exclude(tags__in=[history_tag]).select_related('DocumentTag', 'User', 'DocumentPermission').order_by('-last_modified')[:100]
+      Document.objects.get_docs(user)
+        .exclude(tags__in=[trash_tag])
+        .filter(tags__in=[history_tag])
+        .select_related(
+          'DocumentTag',
+          'User',
+          'DocumentPermission',
+        )
+        .order_by('-last_modified')[:500],
+      Document.objects.get_docs(user)
+        .exclude(tags__in=[history_tag])
+        .select_related(
+          'DocumentTag',
+          'User',
+          'DocumentPermission',
+        )
+        .order_by('-last_modified')[:100]
   )
   return list(docs)
 
@@ -152,7 +167,8 @@ def massaged_documents_for_json(documents, user):
                for tag in document.tags.all()],
       'perms': {
         'read': {
-          'users': [{'id': perm_user.id, 'username': perm_user.username} for perm_user in read_perms.users.all()],
+          'users': [{'id': perm_user.id, 'username': perm_user.username} \
+                    for perm_user in read_perms.users.all()],
           'groups': [{'id': perm_group.id, 'name': perm_group.name} \
                      for perm_group in read_perms.groups.all()]
         },
@@ -165,7 +181,7 @@ def massaged_documents_for_json(documents, user):
       'isMine': document.owner == user,
       'lastModified': document.last_modified.strftime("%x %X"),
       'lastModifiedInMillis': time.mktime(document.last_modified.timetuple())
-   }
+    }
 
   return docs
 

+ 5 - 1
desktop/core/src/desktop/models.py

@@ -165,7 +165,11 @@ class DocumentTag(models.Model):
 class DocumentManager(models.Manager):
 
   def documents(self, user):
-    return Document.objects.filter(Q(owner=user) | Q(documentpermission__users=user) | Q(documentpermission__groups__in=user.groups.all())).defer('description', 'extra').distinct()
+    return Document.objects.filter(
+        Q(owner=user) |
+        Q(documentpermission__users=user) |
+        Q(documentpermission__groups__in=user.groups.all())
+    ).defer('description', 'extra').distinct()
 
   def get_docs(self, user, model_class=None, extra=None):
     docs = Document.objects.documents(user).exclude(name='pig-app-hue-script')