[Phpgroupware-cvs] property/inc hook_settings.inc.php, 1.11 class.botts.inc.php, 1.9 class.uitts.inc.php, 1.20 class.bocommon.inc.php, 1.17

[sigurdne]

Update of property/inc

Modified Files:
     Branch: MAIN
            hook_settings.inc.php lines: +3 -1
            class.botts.inc.php lines: +18 -10
            class.uitts.inc.php lines: +20 -8
            class.bocommon.inc.php lines: +3 -3

Log Message:
*** empty log message ***

====================================================
Index: property/inc/hook_settings.inc.php
diff -u property/inc/hook_settings.inc.php:1.10 
property/inc/hook_settings.inc.php:1.11
--- property/inc/hook_settings.inc.php:1.10     Fri Jun 10 07:55:24 2005
+++ property/inc/hook_settings.inc.php  Tue Nov  8 15:19:36 2005
@@ -19,6 +19,8 @@
        );
        create_select_box('show new/updated tickets on main 
screen','mainscreen_show_new_updated',$yes_and_no,'Dont think this is working - 
yet');

+       create_select_box('Group filters in single 
query','group_filters',$yes_and_no,'Group filters - means that one has to hit 
the search button to apply the filter');
+
        $tts_status = array(
                ''              => lang('Open'),
                'closed'        => lang('Closed'),

====================================================
Index: property/inc/class.botts.inc.php
diff -u property/inc/class.botts.inc.php:1.8 
property/inc/class.botts.inc.php:1.9
--- property/inc/class.botts.inc.php:1.8        Fri Sep  9 10:52:13 2005
+++ property/inc/class.botts.inc.php    Tue Nov  8 15:19:36 2005
@@ -88,35 +88,35 @@
                                $this->start=0;
                        }

-                       if(isset($query))
+                       if($query)
                        {
                                $this->query = $query;
                        }
-                       if(isset($filter))
+                       if($filter)
                        {
                                $this->filter = $filter;
                        }
-                       if(isset($user_filter))
+                       if($user_filter)
                        {
                                $this->user_filter = $user_filter;
                        }
-                       if(isset($sort))
+                       if($sort)
                        {
                                $this->sort = $sort;
                        }
-                       if(isset($order))
+                       if($order)
                        {
                                $this->order = $order;
                        }
-                       if(isset($cat_id))
+                       if($cat_id)
                        {
                                $this->cat_id = $cat_id;
                        }
-                       if(isset($district_id))
+                       if($district_id)
                        {
                                $this->district_id = $district_id;
                        }
-                       if(isset($allrows))
+                       if($allrows)
                        {
                                $this->allrows = $allrows;
                        }
@@ -154,7 +154,15 @@
                                $selected = 
(isset($data['filter'])?$data['filter']:$data['default']);
                        }

-                       
$GLOBALS['phpgw']->xslttpl->add_file(array('filter_filter'));
+                       switch($format)
+                       {
+                               case 'select':
+                                       
$GLOBALS['phpgw']->xslttpl->add_file(array('filter_select'));
+                                       break;
+                               case 'filter':
+                                       
$GLOBALS['phpgw']->xslttpl->add_file(array('filter_filter'));
+                                       break;
+                       }

                        $filters[0][id]='closed';
                        $filters[0][name]=lang('Closed');

====================================================
Index: property/inc/class.uitts.inc.php
diff -u property/inc/class.uitts.inc.php:1.19 
property/inc/class.uitts.inc.php:1.20
--- property/inc/class.uitts.inc.php:1.19       Fri Sep 23 09:00:47 2005
+++ property/inc/class.uitts.inc.php    Tue Nov  8 15:19:36 2005
@@ -48,7 +48,7 @@

                        $this->start                            = 
$this->bo->start;
                        $this->query                            = 
$this->bo->query;
-                       $this->sort                                     = 
$this->bo->sort;
+                       $this->sort                             = 
$this->bo->sort;
                        $this->order                            = 
$this->bo->order;
                        $this->filter                           = 
$this->bo->filter;
                        $this->user_filter                      = 
$this->bo->user_filter;
@@ -172,8 +172,7 @@

                        $GLOBALS['phpgw']->xslttpl->add_file(array('tts',
                                                                                
'menu',
-                                                                               
'nextmatchs',
-                                                                               
'search_field'));
+                                                                               
'nextmatchs'));


                        $second_display = 
get_var('second_display',array('POST','GET'));
@@ -479,8 +478,21 @@
                                                'start' =>$this->start
                        );

+                       $group_filters  = 
$GLOBALS['phpgw_info']['user']['preferences'][$this->currentapp]['group_filters']?
 'select':'filter';
+                       
if($GLOBALS['phpgw_info']['user']['preferences'][$this->currentapp]['group_filters'])
+                       {
+                               $group_filters = 'select';
+                               
$GLOBALS['phpgw']->xslttpl->add_file(array('search_field_grouped'));
+                       }
+                       else
+                       {
+                               $group_filters = 'filter';
+                               
$GLOBALS['phpgw']->xslttpl->add_file(array('search_field'));
+                       }
+
                        $data = array
                        (
+                               'group_filters'                         => 
$GLOBALS['phpgw_info']['user']['preferences'][$this->currentapp]['group_filters'],
                                'lang_excel'                            => 
'excel',
                                'link_excel'                            => 
$GLOBALS['phpgw']->link('/index.php',$link_excel),
                                'lang_excel_help'                       => 
lang('Download table to MS Excel'),
@@ -508,10 +520,10 @@
                                'lang_no_cat'                                   
=> lang('no category'),
                                'lang_cat_statustext'                   => 
lang('Select the category the ticket belongs to. To do not use a category 
select NO CATEGORY'),
                                'select_name'                                   
=> 'cat_id',
-                               'cat_list'                                      
        => $this->bo->select_category_list('filter',$this->cat_id),
+                               'cat_list'                                      
        => $this->bo->select_category_list($group_filters,$this->cat_id),
                                'select_action'                                 
=> $GLOBALS['phpgw']->link('/index.php',$link_data),
                                'filter_name'                                   
=> 'filter',
-                               'filter_list'                                   
=> $this->bo->filter(array('filter' => $this->filter,'default' => 'open')),
+                               'filter_list'                                   
=> $this->bo->filter(array('format' => $group_filters, 'filter'=> 
$this->filter,'default' => 'open')),
                                'lang_show_all'                                 
=> lang('Open'),
                                'lang_filter_statustext'                => 
lang('Select the filter. To show all entries select SHOW ALL'),
                                'lang_searchfield_statustext'   => lang('Enter 
the search string. To show all entries, empty this field and press the SUBMIT 
button again'),
@@ -522,7 +534,7 @@
                                'values'                                        
        => $content,
                                'table_add'                                     
        => $table_add,

-                               'district_list'                                 
=> $this->bocommon->select_district_list('filter',$this->district_id),
+                               'district_list'                                 
=> $this->bocommon->select_district_list($group_filters,$this->district_id),
                                'lang_no_district'                              
=> lang('no district'),
                                'lang_district_statustext'              => 
lang('Select the district the selection belongs to. To do not use a district 
select NO DISTRICT'),
                                'select_district_name'                  => 
'district_id',
@@ -530,7 +542,7 @@
                                'lang_user_statustext'                  => 
lang('Assigned to'),
                                'select_user_name'                              
=> 'user_filter',
                                'lang_no_user'                                  
=> lang('No user'),
-                               'user_list'                                     
        => 
$this->bocommon->get_user_list_right2('filter',4,$this->user_filter,$this->acl2_location,'',$default='')
+                               'user_list'                                     
        => 
$this->bocommon->get_user_list_right2($group_filters,4,$this->user_filter,$this->acl2_location,'',$default='')
                        );

                        $appname                                                
= lang('helpdesk');

====================================================
Index: property/inc/class.bocommon.inc.php
diff -u property/inc/class.bocommon.inc.php:1.16 
property/inc/class.bocommon.inc.php:1.17
--- property/inc/class.bocommon.inc.php:1.16    Mon Nov  7 10:17:47 2005
+++ property/inc/class.bocommon.inc.php Tue Nov  8 15:19:36 2005
@@ -98,7 +98,7 @@
                                $this->dateformat               = "Y-m-d";
                                $this->datetimeformat   = "Y-m-d G:i:s";
                        }
-       */
+

                        if(!$GLOBALS['phpgw_info']['flags']['css'])
                        {
@@ -109,7 +109,7 @@
                                        . 
'/css/'.$GLOBALS['phpgw_info']['server']['template_set'].'.css" 
title="'.$GLOBALS['phpgw_info']['server']['template_set'].'" />'
                                        . "\n<style type=\"text/css\">\n<!--\n";
                        }
-
+*/
                }

                function jscalendar()