diff --git a/src/protected/application/lib/MapasCulturais/ApiQuery.php b/src/protected/application/lib/MapasCulturais/ApiQuery.php index 1a20ca0a2..b9e34f64c 100644 --- 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)) { + if(($this->_permission != 'view' || $class::isPrivateEntity()) && (!$this->usesOriginSubsite || !$this->adminInSubsites)) { $this->joins .= " JOIN e.__permissionsCache $alias WITH $alias.action = $pkey AND $alias.userId = $_uid "; } else { diff --git a/src/protected/application/lib/MapasCulturais/Controllers/Opportunity.php b/src/protected/application/lib/MapasCulturais/Controllers/Opportunity.php index 80ae37f96..4b2bb36bb 100644 --- a/src/protected/application/lib/MapasCulturais/Controllers/Opportunity.php +++ b/src/protected/application/lib/MapasCulturais/Controllers/Opportunity.php @@ -861,7 +861,6 @@ function API_findEvaluations($opportunity_id = null) { registration_id IN ({$registration_ids}) $sql_status ORDER BY registration_sent_timestamp, valuer_user_id ASC - $sql_limit ", $params); @@ -1076,4 +1075,4 @@ function POST_saveFieldsOrder() { } } -} \ No newline at end of file +} diff --git a/src/protected/application/themes/BaseV1/layouts/parts/singles/opportunity-evaluations--admin--table.php b/src/protected/application/themes/BaseV1/layouts/parts/singles/opportunity-evaluations--admin--table.php index 68e371ddd..c1f81893d 100644 --- a/src/protected/application/themes/BaseV1/layouts/parts/singles/opportunity-evaluations--admin--table.php +++ b/src/protected/application/themes/BaseV1/layouts/parts/singles/opportunity-evaluations--admin--table.php @@ -47,12 +47,9 @@