Changeset 7495


Ignore:
Timestamp:
11/06/12 16:05:04 (7 years ago)
Author:
asaikawa
Message:

Ticket #3184 - Corrigida a liberacao de acesso a administracao do organograma

Location:
trunk/workflow/inc
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/workflow/inc/class.so_adminaccess.inc.php

    r3255 r7495  
    374374                        while ($row = $result->fetchRow()) { 
    375375                                if (isset($requiredLevel)) { 
    376                                         //$authorized = $this->_checkLevelNumber($row['nivel'], $requiredLevel);                 
    377                                         $authorized = $this->checkUserAccessToResource($type,$uid,$row['numvalue'],$requiredLevel); 
     376                                        //$authorized = $this->_checkLevelNumber($row['nivel'], $requiredLevel); 
     377                                        $authorized = $this->checkUserGroupAccessToResource($type,$uid,$row['numvalue'],$requiredLevel); 
    378378                                        if ($authorized) { 
    379379                                                $output[] = $row['numvalue']; 
  • trunk/workflow/inc/class.so_orgchart.inc.php

    r7013 r7495  
    6868                $authorized = false; 
    6969                if ($checkType) 
    70                         $authorized = $this->acl->checkUserAccessToType('ORG', $this->userID); 
     70                        $authorized = $this->acl->checkUserGroupAccessToType('ORG', $this->userID); 
    7171                else 
    7272                { 
     
    7474                                $authorized = false; 
    7575                        else 
    76                                 $authorized = $this->acl->checkUserAccessToResource('ORG', $this->userID, (int) $organizationID); 
     76                                $authorized = $this->acl->checkUserGroupAccessToResource('ORG', $this->userID, (int) $organizationID); 
    7777                } 
    7878 
     
    144144                else 
    145145                { 
    146                         $organizations = $this->acl->getUserPermissions("ORG", $this->userID, 0); 
     146                        $organizations = $this->acl->getUserGroupPermissions("ORG", $this->userID, 0); 
    147147                        $organizations[] = -1; 
    148148                        $query = "SELECT organizacao_id, nome, descricao, ativa, url_imagem, sitio FROM organizacao WHERE (organizacao_id IN (" . implode(',', $organizations)  . ")) ORDER BY nome"; 
     
    11641164                 * This condition is true if the current user is the same user that's being retrieved 
    11651165                 */ 
    1166                 $authorized = $this->acl->checkUserAccessToResource('ORG', $account_id, (int) $organizationID, 1);  
     1166                $authorized = $this->acl->checkUserGroupAccessToResource('ORG', $account_id, (int) $organizationID, 1);  
    11671167                if (($account_id == $employeeID) || ($authorized)) { 
    11681168                        $mobile         = $employeeEntry['mobile']; 
Note: See TracChangeset for help on using the changeset viewer.