Changeset 5133 for trunk/expressoAdmin1_2/inc/class.uimanagers.inc.php

Timestamp:

11/03/11 13:24:14 (12 years ago)

Author:

wmerlotto

Message:

Ticket #2305 - Enviando alteracoes, desenvolvidas internamente na Prognus, do modulo ExpressoAdmin.

File:

• trunk/expressoAdmin1_2/inc/class.uimanagers.inc.php (modified) (4 diffs)

trunk/expressoAdmin1_2/inc/class.uimanagers.inc.php

@@ -36 +36 @@
                         }
                         $GLOBALS['phpgw']->js->validate_file('jscode','connector','expressoAdmin1_2');#diretorio, arquivo.js, aplicacao
+                        $GLOBALS['phpgw']->js->validate_file('jscode','finder','expressoAdmin1_2');
                         $GLOBALS['phpgw']->js->validate_file('jscode','expressoadmin','expressoAdmin1_2');
                         $GLOBALS['phpgw']->js->validate_file('jscode','managers','expressoAdmin1_2');
@@ -87 +88 @@
 
                         // Le BD para pegar os administradors.
-                        $query = 'SELECT manager_lid,context FROM phpgw_expressoadmin ORDER by manager_lid';
+                        $query = 'SELECT distinct manager_lid manager_lid,context FROM phpgw_expressoadmin_acls ORDER by manager_lid ';
                         $GLOBALS['phpgw']->db->query($query);
                         while($GLOBALS['phpgw']->db->next_record())
@@ -215 +216 @@
                         $manager_lid = $_GET['manager_lid'];
                         
-                        $query = "DELETE FROM phpgw_expressoadmin WHERE manager_lid = '".$manager_lid."' AND context = '" . $context ."'";
+                        $query = "DELETE FROM phpgw_expressoadmin_acls WHERE manager_lid = '".$manager_lid."' AND context = '" . $context ."'"; 
                         $GLOBALS['phpgw']->db->query($query);
                         
@@ -257 +258 @@
                         if ($first_time)
                         {
-                                //Pego ACL do gerente
-                                $manager = $this->functions->read_acl($_GET['manager_lid']);
-                                //Cria vetor da ACL
-                                $manager_acl = $this->functions->make_array_acl($manager['acl']);
+                                
+                                $manager_acl = $this->functions->read_acl($_GET['manager_lid']);
                                 //Pesquisa no Banco e pega os valores dos apps.
                                 $query = "SELECT * FROM phpgw_expressoadmin_apps WHERE manager_lid = '" . $_GET['manager_lid'] . "' AND context = '" . $_GET['context'] . "'";