fixup! synthese: do not convert every filters to list

PnX-SI · Apr 18, 2023 · 83dd954 · 83dd954
1 parent 00ea7f2
commit 83dd954
Showing 1 changed file with 6 additions and 15 deletions.
diff --git a/...d/geonature/migrations/versions/0630b93bcfe0_add_permissions_inherited_modules_objects.py b/...d/geonature/migrations/versions/0630b93bcfe0_add_permissions_inherited_modules_objects.py
@@ -101,26 +101,17 @@ def upgrade():
         	perm_object_all.id_module,
         	object_other.id_object
         FROM
-        	gn_permissions.t_objects object_other,
         	gn_permissions.cor_role_action_filter_module_object perm_object_all
-        JOIN gn_permissions.t_objects object_all ON
-        	perm_object_all.id_object = object_all.id_object
+        JOIN
+            gn_permissions.t_objects object_all ON perm_object_all.id_object = object_all.id_object
+        JOIN
+            gn_permissions.cor_object_module cor_object_module ON cor_object_module.id_module = perm_object_all.id_module
+        JOIN
+            gn_permissions.t_objects object_other ON object_other.id_object = cor_object_module.id_object
         WHERE
         	object_all.code_object = 'ALL'
         	AND
         	object_other.code_object != 'ALL'
-        	AND 
-        	EXISTS
-        	(
-        	SELECT 
-        		NULL
-        	FROM 
-        		gn_permissions.cor_object_module cor_object_module
-        	WHERE 
-        		cor_object_module.id_object = object_other.id_object
-        		AND
-        		cor_object_module.id_module = perm_object_all.id_module
-        	)
         	AND
         	NOT EXISTS 
         	(