[Phpgroupware-cvs] tts/inc class.botts.inc.php class.uitts.inc.php

[Dave Hall]

CVSROOT:        /cvsroot/phpgroupware
Module name:    tts
Changes by:     Dave Hall <skwashd>     07/01/08 00:37:33

Modified files:
        inc            : class.botts.inc.php class.uitts.inc.php 

Log message:
        fix search

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/tts/inc/class.botts.inc.php?cvsroot=phpgroupware&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/tts/inc/class.uitts.inc.php?cvsroot=phpgroupware&r1=1.9&r2=1.10

Patches:
Index: class.botts.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/tts/inc/class.botts.inc.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- class.botts.inc.php 27 Dec 2006 12:26:04 -0000      1.8
+++ class.botts.inc.php 8 Jan 2007 00:37:32 -0000       1.9
@@ -5,7 +5,7 @@
        * @copyright Copyright (C) 2000-2005 Free Software Foundation, Inc. 
http://www.fsf.org/
        * @license http://www.gnu.org/licenses/gpl.html GNU General Public 
License
        * @package tts
-       * @version $Id: class.botts.inc.php,v 1.8 2006/12/27 12:26:04 skwashd 
Exp $
+       * @version $Id: class.botts.inc.php,v 1.9 2007/01/08 00:37:32 skwashd 
Exp $
        */
 
 
@@ -953,7 +953,14 @@
                        else
                        {
                                $ttype = 0;
-                               $ttype_filter = 'phpgw_tts_tickets.ticket_type 
IN(\'' . implode('\',\'', $GLOBALS['phpgw']->acl->get_location_list('tts', 
PHPGW_ACL_READ)) . '\')';
+                               $ttype_filter = 'phpgw_tts_tickets.ticket_type 
IN(';
+                               foreach ( 
$GLOBALS['phpgw']->acl->get_location_list('tts', PHPGW_ACL_READ) as $loc )
+                               {
+                                       $ttype_filter .= (int)substr($loc, 1) . 
', ';
+                               }
+                               $ttype_filter .= "0)";
+                               //$ttype_filter = 
'phpgw_tts_tickets.ticket_type IN(\'' . implode('\',\'', 
$GLOBALS['phpgw']->acl->get_location_list('tts', PHPGW_ACL_READ)) . '\')';
+                               
                        }
 
                        $fields = $this->get_fields($ttype);

Index: class.uitts.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/tts/inc/class.uitts.inc.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- class.uitts.inc.php 5 Jan 2007 04:14:50 -0000       1.9
+++ class.uitts.inc.php 8 Jan 2007 00:37:32 -0000       1.10
@@ -5,7 +5,7 @@
        * @copyright Copyright (C) 2000-2006 Free Software Foundation, Inc. 
http://www.fsf.org/
        * @license http://www.gnu.org/licenses/gpl.html GNU General Public 
License
        * @package tts
-       * @version $Id: class.uitts.inc.php,v 1.9 2007/01/05 04:14:50 skwashd 
Exp $
+       * @version $Id: class.uitts.inc.php,v 1.10 2007/01/08 00:37:32 skwashd 
Exp $
        */
        
        class tts_uitts
@@ -372,7 +372,6 @@
                                {
                                        $results = array();
                                }
-
                                $GLOBALS['phpgw_info']['flags']['xslt_app'] = 
true;
                                
$GLOBALS['phpgw']->xslttpl->add_file('search_results');