Set project shared status to xform shared status if not the same

onaio · Apr 8, 2021 · ea88326 · ea88326
1 parent 0e16356
commit ea88326
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/onadata/apps/logger/models/xform.py b/onadata/apps/logger/models/xform.py
@@ -1054,7 +1054,9 @@ def clear_project_cache(project_id):
 
 def set_object_permissions(sender, instance=None, created=False, **kwargs):
     # clear cache
-    clear_project_cache(instance.project.pk)
+    project = instance.project
+    project.refresh_from_db()
+    clear_project_cache(project.pk)
     safe_delete('{}{}'.format(IS_ORG, instance.pk))
 
     if created:
@@ -1065,7 +1067,7 @@ def set_object_permissions(sender, instance=None, created=False, **kwargs):
             OwnerRole.add(instance.created_by, instance)
 
         from onadata.libs.utils.project_utils import set_project_perms_to_xform
-        set_project_perms_to_xform(instance, instance.project)
+        set_project_perms_to_xform(instance, project)
 
 
 post_save.connect(

diff --git a/onadata/libs/utils/project_utils.py b/onadata/libs/utils/project_utils.py
@@ -22,8 +22,7 @@ def set_project_perms_to_xform(xform, project):
     """
     # allows us to still use xform.shared and xform.shared_data as before
     # only switch if xform.shared is False
-    xform_is_shared = xform.shared or xform.shared_data
-    if not xform_is_shared and project.shared != xform.shared:
+    if project.shared != xform.shared:
         xform.shared = project.shared
         xform.shared_data = project.shared
         xform.save()