From 743b419d19168c32679d56702b306140e77f753f Mon Sep 17 00:00:00 2001
From: j <j@mailb.org>
Date: Wed, 15 Feb 2017 19:07:36 +0100
Subject: [PATCH] remove unpublished lists/edits/collections from home

---
 pandora/home/models.py | 28 +++++++++++++++++++---------
 pandora/home/views.py  |  2 +-
 2 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/pandora/home/models.py b/pandora/home/models.py
index 134a7433..ff87be1e 100644
--- a/pandora/home/models.py
+++ b/pandora/home/models.py
@@ -99,18 +99,28 @@ class Item(models.Model):
         contentid = self.data.get('contentid')
         if not contentid:
             return None
+        data = None
+        content = None
         if type == 'list':
-            content = List.get(contentid).json(keys=content_keys)
-            content['link'] = '/list==' + quote(content['user'] + ':' + content['name'])
+            content = List.get(contentid)
+            data = content.json(keys=content_keys)
+            data['link'] = '/list==' + quote(data['user'] + ':' + data['name'])
         elif type == 'edit':
-            content = Edit.get(contentid).json(keys=content_keys)
-            content['link'] = '/edits' + quote(content['user'] + ':' + content['name'])
+            content = Edit.get(contentid)
+            data = content.json(keys=content_keys)
+            data['link'] = '/edits' + quote(data['user'] + ':' + data['name'])
         elif type == 'collection':
-            content = Collection.get(contentid).json(keys=content_keys)
-            content['link'] = '/documents/collection==' + quote(content['user'] + ':' + content['name'])
-        else:
-            content = None
-        return content
+            content = Collection.get(contentid)
+            data = content.json(keys=content_keys)
+            data['link'] = '/documents/collection==' + quote(data['user'] + ':' + data['name'])
+        if content and content.status == 'private':
+            self.delete()
+            data = None
+        return data
+
+    def is_public(self):
+        type = self.data.get('type')
+        return type == 'custom' or self.get_content() is not None
 
     def json(self, keys=None):
         j = {
diff --git a/pandora/home/views.py b/pandora/home/views.py
index 7d5a0531..7033bb37 100644
--- a/pandora/home/views.py
+++ b/pandora/home/views.py
@@ -105,6 +105,6 @@ def getHomeItems(request, data):
     qs = models.Item.objects.all().order_by('-active', 'index', 'created')
     if 'active' in data:
         qs = qs.filter(active=data['active'] is True)
-    response['data']['items'] = [i.json() for i in qs]
+    response['data']['items'] = [i.json() for i in qs if i.is_public()]
     return render_to_json_response(response)
 actions.register(getHomeItems)