From 666a5842a5e80ae0de549af00bc33ec03605f219 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sybren=20A=2E=20St=C3=BCvel?= Date: Fri, 6 May 2016 19:11:58 +0200 Subject: [PATCH 1/2] Fix for setting is_private on new permission-less projects --- pillar/application/modules/projects.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pillar/application/modules/projects.py b/pillar/application/modules/projects.py index 50148668..7a4248b5 100644 --- a/pillar/application/modules/projects.py +++ b/pillar/application/modules/projects.py @@ -40,6 +40,10 @@ def override_is_private_field(project, original): :param project: the project, which will be updated """ + if 'permissions' not in project: + project['is_private'] = False + return + world_perms = project['permissions'].get('world', []) project['is_private'] = 'GET' not in world_perms From 3a4754d28baba3c03e62f7416c448934f176b3b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sybren=20A=2E=20St=C3=BCvel?= Date: Sat, 7 May 2016 00:39:54 +0200 Subject: [PATCH 2/2] Hot fix for the fix. --- pillar/application/modules/projects.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pillar/application/modules/projects.py b/pillar/application/modules/projects.py index 7a4248b5..3677af34 100644 --- a/pillar/application/modules/projects.py +++ b/pillar/application/modules/projects.py @@ -40,13 +40,11 @@ def override_is_private_field(project, original): :param project: the project, which will be updated """ + # No permissions, no access. if 'permissions' not in project: - project['is_private'] = False + project['is_private'] = True return - world_perms = project['permissions'].get('world', []) - project['is_private'] = 'GET' not in world_perms - def before_inserting_override_is_private_field(projects): for project in projects: