Changeset 7495

Timestamp:

11/06/12 15:05:04 (11 years ago)

Author:

asaikawa

Message:

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

Location:

trunk/workflow/inc

Files:

• class.so_adminaccess.inc.php (modified) (1 diff)
• class.so_orgchart.inc.php (modified) (4 diffs)

trunk/workflow/inc/class.so_adminaccess.inc.php

@@ -374 +374 @@
                         while ($row = $result->fetchRow()) {
                                 if (isset($requiredLevel)) {
-                                        //$authorized = $this->_checkLevelNumber($row['nivel'], $requiredLevel);                
-                                        $authorized = $this->checkUserAccessToResource($type,$uid,$row['numvalue'],$requiredLevel);
+                                        //$authorized = $this->_checkLevelNumber($row['nivel'], $requiredLevel);
+                                        $authorized = $this->checkUserGroupAccessToResource($type,$uid,$row['numvalue'],$requiredLevel);
                                         if ($authorized) {
                                                 $output[] = $row['numvalue'];

trunk/workflow/inc/class.so_orgchart.inc.php

@@ -68 +68 @@
                 $authorized = false;
                 if ($checkType)
-                        $authorized = $this->acl->checkUserAccessToType('ORG', $this->userID);
+                        $authorized = $this->acl->checkUserGroupAccessToType('ORG', $this->userID);
                 else
                 {
@@ -74 +74 @@
                                 $authorized = false;
                         else
-                                $authorized = $this->acl->checkUserAccessToResource('ORG', $this->userID, (int) $organizationID);
+                                $authorized = $this->acl->checkUserGroupAccessToResource('ORG', $this->userID, (int) $organizationID);
                 }
 
@@ -144 +144 @@
                 else
                 {
-                        $organizations = $this->acl->getUserPermissions("ORG", $this->userID, 0);
+                        $organizations = $this->acl->getUserGroupPermissions("ORG", $this->userID, 0);
                         $organizations[] = -1;
                         $query = "SELECT organizacao_id, nome, descricao, ativa, url_imagem, sitio FROM organizacao WHERE (organizacao_id IN (" . implode(',', $organizations)  . ")) ORDER BY nome";
@@ -1164 +1164 @@
                  * This condition is true if the current user is the same user that's being retrieved
                  */
-                $authorized = $this->acl->checkUserAccessToResource('ORG', $account_id, (int) $organizationID, 1); 
+                $authorized = $this->acl->checkUserGroupAccessToResource('ORG', $account_id, (int) $organizationID, 1); 
                 if (($account_id == $employeeID) || ($authorized)) {
                         $mobile         = $employeeEntry['mobile'];