[Phpgroupware-cvs] CVS: news_admin/inc class.boadmin.inc.php,1.8.2.1,1.8.2.2 class.soadmin.inc.php,1.6.2.2,1.6.2.3 class.uiadmin.inc.php,1.12.2.3,1.12.2.4

[Dave Hall <address@hidden>]

Update of /cvsroot/phpgroupware/news_admin/inc
In directory subversions:/tmp/cvs-serv24552

Modified Files:
      Tag: Version-0_9_14-branch
        class.boadmin.inc.php class.soadmin.inc.php 
        class.uiadmin.inc.php 
Log Message:
Fix for Bug #1715, forgetting cats in edit, delete not working

Index: class.boadmin.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/news_admin/inc/class.boadmin.inc.php,v
retrieving revision 1.8.2.1
retrieving revision 1.8.2.2
diff -C2 -r1.8.2.1 -r1.8.2.2
*** class.boadmin.inc.php       30 Jan 2002 04:30:27 -0000      1.8.2.1
--- class.boadmin.inc.php       19 Mar 2003 21:03:09 -0000      1.8.2.2
***************
*** 17,20 ****
--- 17,22 ----
        class boadmin
        {
+               var $public_functions = array('delete'  => True);
+ 
                function boadmin()
                {

Index: class.soadmin.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/news_admin/inc/class.soadmin.inc.php,v
retrieving revision 1.6.2.2
retrieving revision 1.6.2.3
diff -C2 -r1.6.2.2 -r1.6.2.3
*** class.soadmin.inc.php       31 Jan 2002 01:01:16 -0000      1.6.2.2
--- class.soadmin.inc.php       19 Mar 2003 21:03:09 -0000      1.6.2.3
***************
*** 66,70 ****
                                'content'     => $this->db->f('news_content'),
                                'status'      => $this->db->f('news_status'),
!                               'cat'         => $this->db->f('news_cat')
                        );
                        return $items;
--- 66,70 ----
                                'content'     => $this->db->f('news_content'),
                                'status'      => $this->db->f('news_status'),
!                               'category'    => $this->db->f('news_cat')
                        );
                        return $items;

Index: class.uiadmin.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/news_admin/inc/class.uiadmin.inc.php,v
retrieving revision 1.12.2.3
retrieving revision 1.12.2.4
diff -C2 -r1.12.2.3 -r1.12.2.4
*** class.uiadmin.inc.php       30 Jan 2002 04:30:27 -0000      1.12.2.3
--- class.uiadmin.inc.php       19 Mar 2003 21:03:09 -0000      1.12.2.4
***************
*** 150,154 ****
  
                        
$GLOBALS['phpgw']->template->set_var('label_category',lang('Category') . ':');
!                       
$GLOBALS['phpgw']->template->set_var('value_category','<select 
name="news[category]"><option value="0">' . lang('Main') . '</option>' . 
$this->cats->formated_list('select','mains',$news['category']) . '</select>');
  
                        
$GLOBALS['phpgw']->template->set_var('label_status',lang('Status') . ':');
--- 150,154 ----
  
                        
$GLOBALS['phpgw']->template->set_var('label_category',lang('Category') . ':');
!                       
$GLOBALS['phpgw']->template->set_var('value_category','<select 
name="news[category]"><option value="0">' . lang('Main') . '</option>' . 
$this->cats->formated_list('select','mains',$news['category'], True) . 
'</select>');
  
                        
$GLOBALS['phpgw']->template->set_var('label_status',lang('Status') . ':');
***************
*** 225,229 ****
  
                        
$GLOBALS['phpgw']->template->set_var('label_category',lang('Category') . ':');
!                       
$GLOBALS['phpgw']->template->set_var('value_category','<select 
name="news[category]"><option value="0">' . lang('Main') . '</option>' . 
$this->cats->formated_list('select','mains',$news['category']) . '</select>');
  
                        
$GLOBALS['phpgw']->template->set_var('label_status',lang('Status') . ':');
--- 225,229 ----
  
                        
$GLOBALS['phpgw']->template->set_var('label_category',lang('Category') . ':');
!                       
$GLOBALS['phpgw']->template->set_var('value_category','<select 
name="news[category]"><option value="0">' . lang('Main') . '</option>' . 
$this->cats->formated_list('select','mains',$news['category'], True) . 
'</select>');
  
                        
$GLOBALS['phpgw']->template->set_var('label_status',lang('Status') . ':');
***************
*** 299,303 ****
  
                        
$GLOBALS['phpgw']->template->set_var('form_action',$GLOBALS['phpgw']->link('/index.php','menuaction=news_admin.uiadmin.news_list'));
!                       
$GLOBALS['phpgw']->template->set_var('input_category',$this->cats->formated_list('select','mains',$cat_id));
  
                        
$GLOBALS['phpgw']->template->set_var('header_date',$GLOBALS['phpgw']->nextmatchs->show_sort_order($sort,'news_date',$order,'/index.php',lang('Date'),'&menuaction=news_admin.uiadmin.news_list'));
--- 299,303 ----
  
                        
$GLOBALS['phpgw']->template->set_var('form_action',$GLOBALS['phpgw']->link('/index.php','menuaction=news_admin.uiadmin.news_list'));
!                       
$GLOBALS['phpgw']->template->set_var('input_category',$this->cats->formated_list('select','mains',$cat_id,
 True));
  
                        
$GLOBALS['phpgw']->template->set_var('header_date',$GLOBALS['phpgw']->nextmatchs->show_sort_order($sort,'news_date',$order,'/index.php',lang('Date'),'&menuaction=news_admin.uiadmin.news_list'));