Explorar el Código

HUE-4241 [editor] Schedule are showing up in home

Romain Rigaux hace 9 años
padre
commit
8fccedc
Se han modificado 2 ficheros con 5 adiciones y 3 borrados
  1. 3 1
      desktop/core/src/desktop/api2.py
  2. 2 2
      desktop/core/src/desktop/models.py

+ 3 - 1
desktop/core/src/desktop/api2.py

@@ -88,6 +88,7 @@ def search_documents(request):
   perms = request.GET.get('perms', 'both').lower()
   include_history = json.loads(request.GET.get('include_history', 'false'))
   include_trashed = json.loads(request.GET.get('include_trashed', 'true'))
+  include_managed = json.loads(request.GET.get('include_managed', 'false'))
   flatten = json.loads(request.GET.get('flatten', 'true'))
 
   if perms not in ['owned', 'shared', 'both']:
@@ -97,7 +98,8 @@ def search_documents(request):
     user=request.user,
     perms=perms,
     include_history=include_history,
-    include_trashed=include_trashed
+    include_trashed=include_trashed,
+    include_managed=include_managed
   )
 
   # Refine results

+ 2 - 2
desktop/core/src/desktop/models.py

@@ -1354,7 +1354,7 @@ class Directory(Document2):
     """
     Returns the children documents for a given directory, excluding history documents
     """
-    documents = self.children.filter(is_history=False)  # TODO: perms
+    documents = self.children.filter(is_history=False).filter(is_managed=False)  # TODO: perms
     return documents
 
   def get_children_and_shared_documents(self, user):
@@ -1368,7 +1368,7 @@ class Directory(Document2):
           ~Q(owner=user) )
       )
 
-    documents = documents.exclude(is_history=True)
+    documents = documents.exclude(is_history=True).exclude(is_managed=True)
 
     return documents.defer('description', 'data', 'extra', 'search').distinct().order_by('-last_modified')