Merge remote-tracking branch 'origin/1.6' into bugfix/grid-helper-assets

# Conflicts: # src/Helper/GridHelperService.php
pimcore · Dec 17, 2024 · 2662efc · 2662efc
2 parents ac3f184 + 3d0fca2
commit 2662efc
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/src/Helper/GridHelperService.php b/src/Helper/GridHelperService.php
@@ -960,7 +960,7 @@ private function optimizedConcatNotLike(
         }
 
         return '(
-            (`path` != "' . $path . '/" AND ' . $queryColumn .  ' != "' . $leaf . '")
+            NOT (`path` = "' . $path . '/" AND ' . $queryColumn .  ' = "' . $leaf . '")
             AND
             `path` NOT LIKE "' . $fullpath . '/%"
         )';
@@ -995,7 +995,9 @@ protected function getPermittedPathsByUser(string $type, User $user): string
                     //if any allowed child is found, the current folder can be listed but its content is still blocked
                     $onlyChildren = true;
                 }
-                $forbiddenPathSql[] = $this->optimizedConcatNotLike($forbiddenPath, $onlyChildren, $type) . $exceptions;
+                $forbiddenPathSql[] =
+                    '(' . $this->optimizedConcatNotLike($forbiddenPath, $onlyChildren, $type) . $exceptions . ')'
+                ;
             }
             foreach ($elementPaths['allowed'] as $allowedPaths) {
                 $allowedPathSql[] = $this->optimizedConcatLike($allowedPaths, $type);