Changeset 3536

Timestamp:

11/26/10 08:27:06 (13 years ago)

Author:

niltonneto

Message:

Ticket #1349 - Corrigido problema da busca por grupos em categorias globais.

File:

• branches/2.2/admin/inc/class.uicategories.inc.php (modified) (5 diffs)

branches/2.2/admin/inc/class.uicategories.inc.php

@@ -80 +80 @@
                         sort($this->icons);
                         $this->img_url = $GLOBALS['phpgw_info']['server']['webserver_url'].'/phpgwapi/images/';
+                        $this->template_dir = 'calendar/templates/'.$GLOBALS['phpgw_info']['user']['preferences']['common']['template_set'];
                 }
 
@@ -186 +187 @@
                         // if ExpressoMail 1.2 has been installed and enabled, show the plugin using AJAX. 
                         if($GLOBALS['phpgw_info']['server']['cal_expressoMail']) {
-                                $this->template_dir = 'calendar/templates/'.$GLOBALS['phpgw_info']['user']['preferences']['common']['template_set'];                                                    
                                 $module_name = 'expressoMail'.(str_replace("1.","1_",$GLOBALS['phpgw_info']['server']['cal_expressoMail']));
                                 if($GLOBALS['phpgw_info']['user']['apps'][$module_name]){                                                               
@@ -197 +197 @@
                                         $scripts =      "<script src='".$module_name."/js/connector.js' type='text/javascript'></script>".
                                                                 "<script type='text/javascript'>var DEFAULT_URL = '".$module_name."/controller.php?action=';</script> ".                                                                                        
-                                                                "<script src='".$this->template_dir."/js/search.js' type='text/javascript'></script>";
+                                                                "<script src='calendar/js/search.js' type='text/javascript'></script>";
                                         // Fim
                                 }
@@ -426 +426 @@
                 // if ExpressoMail 1.2 has been installed and enabled, show the plugin using AJAX. 
                 if($GLOBALS['phpgw_info']['server']['cal_expressoMail']) {
-                        $this->template_dir = 'calendar/templates/'.$GLOBALS['phpgw_info']['user']['preferences']['common']['template_set'];                                                    
                         $module_name = 'expressoMail'.(str_replace("1.","1_",$GLOBALS['phpgw_info']['server']['cal_expressoMail']));
                         if($GLOBALS['phpgw_info']['user']['apps'][$module_name]){                                                               
@@ -437 +436 @@
                                 $scripts =      "<script src='".$module_name."/js/connector.js' type='text/javascript'></script>".
                                                         "<script type='text/javascript'>var DEFAULT_URL = '".$module_name."/controller.php?action=';</script> ".                                                                                        
-                                                        "<script src='".$this->template_dir."/js/search.js' type='text/javascript'></script>";                          
+                                                        "<script src='calendar/js/search.js' type='text/javascript'></script>";                         
                                 // Fim                                                          
                                 $this->template->set_var('scripts',$scripts);
-                                $this->template->set_var('template_set', $this->template_dir);
                         }
                 }
                 // FIM if.
+                $this->template->set_var('template_set', $this->template_dir);
 
                         $this->template->set_file(array('form' => 'category_form.tpl'));