Make sure conditions are isolated in if (was working but...)

collective · Mar 17, 2021 · 3bcb9ee · 3bcb9ee
1 parent 4a70754
commit 3bcb9ee
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/src/collective/iconifiedcategory/tests/test_behaviors.py b/src/collective/iconifiedcategory/tests/test_behaviors.py
@@ -277,8 +277,11 @@ def test_only_pdf_invariant(self):
         view = self.portal.restrictedTraverse('folder_contents')
         request['PUBLISHED'] = view
         self.assertFalse(invariants.validate(data))
-        request.set('already_validateFileIsPDF', False)
+        # already_validateFileIsPDF was set in REQUEST
+        self.assertTrue(request.get('already_validateFileIsPDF'))
+        self.assertFalse(invariants.validate(data))
         # PDF needed
+        request.set('already_validateFileIsPDF', False)
         category.only_pdf = True
         errors = invariants.validate(data)
         request.set('already_validateFileIsPDF', False)

diff --git a/src/collective/iconifiedcategory/utils.py b/src/collective/iconifiedcategory/utils.py
@@ -298,8 +298,8 @@ def _check_filters(infos):
     catalog = api.portal.get_tool('portal_catalog')
     current_user_allowedRolesAndUsers = catalog._listAllowedRolesAndUsers(api.user.get_current())
     for uid, infos in categorized_elements.items():
-        if uids and uid not in uids or \
-           portal_type and infos['portal_type'] != portal_type or \
+        if (uids and uid not in uids) or \
+           (portal_type and infos['portal_type'] != portal_type) or \
            not _check_filters(infos) or \
            (infos['confidential'] and
                 not set(infos['allowedRolesAndUsers']).intersection(current_user_allowedRolesAndUsers)):