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

Timestamp:

05/04/10 18:58:04 (14 years ago)

Author:

rodsouza

Message:

Ticket #1058 - Corrigindo problemas no expressoAdmin1_2.

File:

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

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

@@ -35 +35 @@
                                 $GLOBALS['phpgw']->js = CreateObject('phpgwapi.javascript');
                         }
-                        $GLOBALS['phpgw']->js->validate_file('jscode','connector','expressoAdmin1_2');#diretorio, arquivo.js, aplicacao
+                        $GLOBALS['phpgw']->js->validate_file('jscode','globals','expressoAdmin1_2');
+                        $GLOBALS['phpgw']->js->validate_file('jscode','connector','expressoAdmin1_2');
                         $GLOBALS['phpgw']->js->validate_file('jscode','expressoadmin','expressoAdmin1_2');
                         $GLOBALS['phpgw']->js->validate_file('jscode','managers','expressoAdmin1_2');
@@ -124 +125 @@
 
                         $p->set_var($var);
-                        echo "<script>var expressoAdmin_controller = '{$GLOBALS[ 'phpgw' ] -> link( '/controller.php' )}?action=';</script>" . $GLOBALS['phpgw']->js->get_script_links( );
+                        $GLOBALS[ 'phpgw_info' ][ 'flags' ][ 'java_script_thirst' ] .= "<script>var expressoAdmin_controller = '{$GLOBALS[ 'phpgw' ] -> link( '/expressoAdmin1_2/controller.php' )}?action=';</script>";
+                        //echo "<script>var expressoAdmin_controller = '{$GLOBALS[ 'phpgw' ] -> link( '/controller.php' )}?action=';</script>" . $GLOBALS['phpgw']->js->get_script_links( );
                         $p->pfp('out','body');
                 }
@@ -170 +172 @@
                         // Seta variaveis que estao no TPL
                         $var = Array(
-                                'scripts_java'                  =>      $scripts_java,  
+                                'scripts_java'                  =>      '',//$scripts_java,     
                                 //'action'                              => $GLOBALS['phpgw']->link('/index.php','menuaction=expressoAdmin1_2.uimanagers.validate'),
                                 //'action'                              => $GLOBALS['phpgw']->link('/index.php','menuaction=expressoAdmin1_2.bomanagers.add_managers'),
@@ -302 +304 @@
 
                         $var = Array(
-                                'scripts_java'                          => $scripts_java,
+                                'scripts_java'                          => '',//$scripts_java,
                                 'action'                                        => $GLOBALS['phpgw']->link('/index.php','menuaction=expressoAdmin1_2.uimanagers.validate'),
                                 'display_samba_suport'          => $this->config['expressoAdmin_samba_support'] == 'true' ? '' : 'display:none',
@@ -344 +346 @@
                                 }
                         }
-                        
-                        echo "<script>var expressoAdmin_controller = '{$GLOBALS[ 'phpgw' ] -> link( '/expressoAdmin1_2/controller.php' )}?action=';</script>" . $GLOBALS['phpgw']->js->get_script_links( );
+
+                        $GLOBALS[ 'phpgw_info' ][ 'flags' ][ 'java_script_thirst' ] .= "<script>var expressoAdmin_controller = '{$GLOBALS[ 'phpgw' ] -> link( '/expressoAdmin1_2/controller.php' )}?action=';</script>";
                         echo $p->fp('out','form');
                 }