Merge pull request #326 from secultce/develop

Merge develop to homolog

Author: Junior-Shyko

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 {

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() {
         }
 
     }
-}
+}

src/protected/application/themes/BaseV1/layouts/parts/singles/opportunity-evaluations--admin--table.php

@@ -47,12 +47,9 @@
             <td colspan='10'>
                 <span ng-if="data.evaluations.length === 0"><?php \MapasCulturais\i::_e("Nenhuma avaliação enviada.");?></span>
                 <span ng-if="data.evaluations.length === 1"><?php \MapasCulturais\i::_e("1 avaliação encontrada.");?></span>
-                <span ng-if="data.evaluations.length > 1">{{data.evaluations.length}}
-                    <span ng-if="data.evaluationsAPIMetadata.count > 0">
-                        <i> de {{ data.evaluationsAPIMetadata.count }}</i>
-                    </span>
-                 <?php \MapasCulturais\i::_e("Avaliações");?>
-             </span>                
+                <span ng-if="data.evaluations.length > 1">
+                    {{data.evaluations.length}} <?php \MapasCulturais\i::_e("Avaliações");?>
+                </span>                
             </td>
         </tr>
 

src/protected/application/themes/BaseV1/layouts/parts/singles/opportunity-evaluations--committee--table.php

@@ -53,12 +53,9 @@
             <td colspan='10'>
                 <span ng-if="data.evaluations.length === 0"><?php \MapasCulturais\i::_e("Nenhuma avaliação enviada.");?></span>
                 <span ng-if="data.evaluations.length === 1"><?php \MapasCulturais\i::_e("1 avaliação encontrada.");?></span>                
-                <span ng-if="data.evaluations.length > 1">{{data.evaluations.length}}
-                    <span ng-if="data.evaluationsAPIMetadata.count > 0">
-                        <i> de {{ data.evaluationsAPIMetadata.count }}</i>
-                    </span>
-                 <?php \MapasCulturais\i::_e("Avaliações");?>
-             </span>   
+                <span ng-if="data.evaluations.length > 1">
+                    {{data.evaluations.length}} <?php \MapasCulturais\i::_e("Avaliações");?>
+                </span>   
             </td>
         </tr>
         <tr ng-repeat="evaluation in data.evaluations" id="registration-{{evaluation.registration.id}}">

version.txt

@@ -1 +1 @@
-5.9.4-rc3
+5.9.4