Merge pull request #297 from secultce/develop

Merge develop to homolog
secultce · Nov 4, 2024 · 653cd90 · 653cd90
2 parents a986f4c + 47e0c88
commit 653cd90
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/src/protected/application/lib/MapasCulturais/ApiQuery.php b/src/protected/application/lib/MapasCulturais/ApiQuery.php
@@ -1865,7 +1865,7 @@ protected function _addFilterByPermissions($value) {
             $pkey = $this->addSingleParam($this->_permission);
             $_uid = $user->id;
 
-            if(($this->_permission != 'view' || $class::isPrivateEntity()) && (!$this->usesOriginSubsite || !$this->adminInSubsites)) {
+            if(($this->_permission != 'view' || $class::isPrivateEntity()) && (!$this->usesOriginSubsite)) {
                 $this->joins .= " JOIN e.__permissionsCache $alias WITH $alias.action = $pkey AND $alias.userId = $_uid ";
 
             } else {
@@ -1890,6 +1890,8 @@ protected function _addFilterByPermissions($value) {
 
                     $admin_where = implode(' OR ', $admin_where);
                     $admin_where = "OR ($admin_where)";
+                } else {
+                    $admin_where = "OR (e._subsiteId IS NULL)";
                 }
 
                 if($this->usesStatus && $this->_permission == 'view' && !$class::isPrivateEntity()) {