[Phpgroupware-cvs] CVS: todo/inc class.ui.inc.php,1.2.2.9,1.2.2.10

[Bettina Gille <address@hidden>]

Update of /cvsroot/phpgroupware/todo/inc
In directory subversions:/tmp/cvs-serv19689/inc

Modified Files:
      Tag: Version-0_9_14-branch
        class.ui.inc.php 
Log Message:
fixed filter

Index: class.ui.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/todo/inc/class.ui.inc.php,v
retrieving revision 1.2.2.9
retrieving revision 1.2.2.10
diff -C2 -r1.2.2.9 -r1.2.2.10
*** class.ui.inc.php    13 Mar 2002 21:32:37 -0000      1.2.2.9
--- class.ui.inc.php    17 Mar 2002 19:45:03 -0000      1.2.2.10
***************
*** 154,161 ****
                        
$this->t->set_var('sort_edate',$this->nextmatchs->show_sort_order($this->sort,'todo_enddate',$this->order,'/todo/index.php',lang('end
 date')));
                        
$this->t->set_var('sort_owner',$this->nextmatchs->show_sort_order($this->sort,'todo_owner',$this->order,'/todo/index.php',lang('created
 by')));
-                       
$this->t->set_var('sort_assigned',$this->nextmatchs->show_sort_order($this->sort,'todo_assigned',$this->order,'/todo/index.php',lang('assigned
 to')));
                        $this->t->set_var('h_lang_sub',lang('Add Sub'));
                        $this->t->set_var('h_lang_view',lang('View'));
                        $this->t->set_var('h_lang_edit',lang('Edit'));
  
  // -------------- end header declaration 
--------------------------------------- 
--- 154,161 ----
                        
$this->t->set_var('sort_edate',$this->nextmatchs->show_sort_order($this->sort,'todo_enddate',$this->order,'/todo/index.php',lang('end
 date')));
                        
$this->t->set_var('sort_owner',$this->nextmatchs->show_sort_order($this->sort,'todo_owner',$this->order,'/todo/index.php',lang('created
 by')));
                        $this->t->set_var('h_lang_sub',lang('Add Sub'));
                        $this->t->set_var('h_lang_view',lang('View'));
                        $this->t->set_var('h_lang_edit',lang('Edit'));
+                       $this->t->set_var('h_lang_delete',lang('Delete'));
  
  // -------------- end header declaration 
--------------------------------------- 
***************
*** 221,227 ****
                                }
  
-                               $assigned = 
$this->bo->list_assigned($todo_list[$i]['assigned']);
-                               $assigned .= 
$this->bo->list_assigned($todo_list[$i]['assigned_group']);
- 
  // --------------- template declaration for list records 
-------------------------------------
  
--- 221,224 ----
***************
*** 233,238 ****
                                        'datecreated'   => 
$todo_list[$i]['sdate'],
                                        'datedue'               => $datedueout,
!                                       'owner'                 => 
$todo_list[$i]['owner'],
!                                       'assigned'              => $assigned
                                ));
  
--- 230,234 ----
                                        'datecreated'   => 
$todo_list[$i]['sdate'],
                                        'datedue'               => $datedueout,
!                                       'owner'                 => 
$todo_list[$i]['owner']
                                ));
  
***************
*** 377,381 ****
                function add()
                {
!                       global $cat_id, $new_cat, $values, $submit, 
$new_parent, $parent, $assigned, $assigned_group;
  
                        if ($new_parent)
--- 373,377 ----
                function add()
                {
!                       global $cat_id, $new_cat, $values, $submit, 
$new_parent, $parent;
  
                        if ($new_parent)
***************
*** 394,415 ****
                                $values['parent'] = $parent;
  
-                               if (is_array($assigned))
-                               {
-                                       $values['assigned'] = 
implode(',',$assigned);
-                                       if (count($assigned) > 1)
-                                       {
-                                               $values['assigned'] = ',' . 
$values['assigned'] . ',';
-                                       }
-                               }
- 
-                               if (is_array($assigned_group))
-                               {
-                                       $values['assigned_group'] = 
implode(',',$assigned_group);
-                                       if (count($assigned_group) > 1)
-                                       {
-                                               $values['assigned_group'] = ',' 
. $values['assigned_group'] . ',';
-                                       }
-                               }
- 
                                $error = $this->bo->check_values($values);
                                if (is_array($error))
--- 390,393 ----
***************
*** 452,459 ****
                        
$this->t->set_var('stat_list',$this->sbox->getPercentage('values[status]',0));
  
-                       
$this->t->set_var('user_list',$this->formatted_user($assigned,'accounts'));
- 
-                       
$this->t->set_var('group_list',$this->formatted_user($assigned_group,'groups'));
- 
                        if (!$values['smonth'])
                        {
--- 430,433 ----
***************
*** 515,523 ****
                        $this->t->set_var('value_completed',$values['status']);
  
-                       $assigned = 
$this->bo->list_assigned($this->bo->format_assigned($values['assigned']));
-                       $assigned .= 
$this->bo->list_assigned($this->bo->format_assigned($values['assigned_group']));
- 
-                       $this->t->set_var('assigned',$assigned);
- 
                        $cached_data = 
$this->bo->cached_accounts($values['owner']);
                        
$this->t->set_var('owner',$GLOBALS['phpgw']->common->display_fullname($cached_data[$values['owner']]['lid'],
--- 489,492 ----
***************
*** 543,547 ****
                function edit()
                {
!                       global $cat_id, $new_cat, $values, $submit, 
$new_parent, $parent, $todo_id, $assigned, $assigned_group;
  
                        if ($new_parent)
--- 512,516 ----
                function edit()
                {
!                       global $cat_id, $new_cat, $values, $submit, 
$new_parent, $parent, $todo_id;
  
                        if ($new_parent)
***************
*** 561,582 ****
                  $values['id'] = $todo_id;
  
-                               if (is_array($assigned))
-                               {
-                                       $values['assigned'] = 
implode(',',$assigned);
-                                       if (count($assigned) > 1)
-                                       {
-                                               $values['assigned'] = ',' . 
$values['assigned'] . ',';
-                                       }
-                               }
- 
-                               if (is_array($assigned_group))
-                               {
-                                       $values['assigned_group'] = 
implode(',',$assigned_group);
-                                       if (count($assigned_group) > 1)
-                                       {
-                                               $values['assigned_group'] = ',' 
. $values['assigned_group'] . ',';
-                                       }
-                               }
- 
                                $error = $this->bo->check_values($values);
                                if (is_array($error))
--- 530,533 ----
***************
*** 621,626 ****
                        
$this->t->set_var('pri_list',$this->sbox->getPriority('values[pri]',$values['pri']));
                        
$this->t->set_var('stat_list',$this->sbox->getPercentage('values[status]',$values['status']));
-                       
$this->t->set_var('user_list',$this->formatted_user($this->bo->format_assigned($values['assigned']),'accounts'));
-                       
$this->t->set_var('group_list',$this->formatted_user($this->bo->format_assigned($values['assigned_group']),'groups'));
  
                        if ($values['sdate'] == 0)
--- 572,575 ----