From e2236864e76891e0efc47bcfa17337aacfbc8e75 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sybren=20A=2E=20St=C3=BCvel?= <sybren@stuvel.eu>
Date: Thu, 29 Sep 2016 17:34:24 +0200
Subject: [PATCH] Filter out '^attract_.*' node types from jstree

While we're at it, also filter out comment & post from the query, rather
than later in Python code.
---
 pillar/web/utils/jstree.py | 28 +++++++++++++++-------------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/pillar/web/utils/jstree.py b/pillar/web/utils/jstree.py
index be8828da..f68035b5 100644
--- a/pillar/web/utils/jstree.py
+++ b/pillar/web/utils/jstree.py
@@ -1,7 +1,7 @@
 from pillarsdk import Node
 from pillarsdk.exceptions import ForbiddenAccess
 from pillarsdk.exceptions import ResourceNotFound
-from flask.ext.login import current_user
+from flask_login import current_user
 
 from pillar.web import system_util
 
@@ -34,26 +34,28 @@ def jstree_get_children(node_id, project_id=None):
             'name': 1, 'parent': 1, 'node_type': 1, 'properties.order': 1,
             'properties.status': 1, 'properties.content_type': 1, 'user': 1,
             'project': 1},
-        'sort': [('properties.order', 1), ('_created', 1)]}
+        'sort': [('properties.order', 1), ('_created', 1)],
+        'where': {
+            '$and': [
+                {'node_type': {'$regex': '^(?!attract_)'}},
+                {'node_type': {'$not': {'$in': ['comment', 'post', 'blog']}}},
+            ],
+        }
+    }
     if node_id:
         if node_id.startswith('n_'):
             node_id = node_id.split('_')[1]
-        lookup['where'] = {'parent': node_id}
+        lookup['where']['parent'] = node_id
     elif project_id:
-        lookup['where'] = {'project': project_id, 'parent': {'$exists': False}}
+        lookup['where']['project'] = project_id
+        lookup['where']['parent'] = {'$exists': False}
 
     try:
         children = Node.all(lookup, api=api)
         for child in children['_items']:
-            # Skip nodes of type comment
-            if child.node_type not in ['comment', 'post']:
-                if child.properties.status == 'published':
-                    children_list.append(jstree_parse_node(child))
-                # TODO: Remove this code (blog now accessible from sidebar)
-                # elif child.node_type == 'blog':
-                #     children_list.append(jstree_parse_node(child))
-                elif current_user.is_authenticated and child.user == current_user.objectid:
-                    children_list.append(jstree_parse_node(child))
+            is_pub = child.properties.status == 'published'
+            if is_pub or (current_user.is_authenticated and child.user == current_user.objectid):
+                children_list.append(jstree_parse_node(child))
     except ForbiddenAccess:
         pass
     return children_list