[Phpgroupware-cvs] CVS: notes/inc class.bo.inc.php,1.13,1.14 class.ui.inc.php,1.49,1.50

[Bettina Gille <address@hidden>]

Update of /cvsroot/phpgroupware/notes/inc
In directory subversions:/tmp/cvs-serv15107/inc

Modified Files:
        class.bo.inc.php class.ui.inc.php 
Log Message:
update add/edit

Index: class.bo.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/notes/inc/class.bo.inc.php,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -r1.13 -r1.14
*** class.bo.inc.php    20 Apr 2003 22:30:39 -0000      1.13
--- class.bo.inc.php    27 Apr 2003 11:49:34 -0000      1.14
***************
*** 89,96 ****
                                $this->cat_id = $cat_id;
                        }
-                       else
-                       {
-                               unset($this->cat_id);
-                       }
                }
  
--- 89,92 ----

Index: class.ui.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/notes/inc/class.ui.inc.php,v
retrieving revision 1.49
retrieving revision 1.50
diff -C2 -r1.49 -r1.50
*** class.ui.inc.php    26 Apr 2003 01:21:47 -0000      1.49
--- class.ui.inc.php    27 Apr 2003 11:49:34 -0000      1.50
***************
*** 165,171 ****
                                'table_add'                                     
        => $table_add 
                        );
- 
-                       
$GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('list' => $data));
                        $this->save_sessiondata();
                }
  
--- 165,170 ----
                                'table_add'                                     
        => $table_add 
                        );
                        $this->save_sessiondata();
+                       
$GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('list' => $data));
                }
  
***************
*** 179,202 ****
                        if ($values['save'])
                        {
!                               //$values['category'] = $cat_id;
!                               $values['note_id'] = $note_id;
  
                                $note_id = $this->bo->save($values);
!                               $message = lang('Note has been saved');
                        }
  
                        if ($note_id)
                        {
                                $note = $this->bo->read_single($note_id);
!                               $GLOBALS['phpgw_info']['flags']['app_header'] = 
lang('notes') . ': ' . lang('edit note');
!                       }
!                       else
!                       {
!                               $GLOBALS['phpgw_info']['flags']['app_header'] = 
lang('notes') . ': ' . lang('add note');
!                       }
! 
!                       if ($note['cat_id'] > 0)
!                       {
!                               $this->cat_id = $note['cat_id'];
                        }
  
--- 178,194 ----
                        if ($values['save'])
                        {
!                               $values['note_id']      = $note_id;
  
                                $note_id = $this->bo->save($values);
!                               $this->cat_id = 
($values['cat_id']?$values['cat_id']:$this->cat_id);
!                               
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction=notes.ui.view&action=save&note_id='
 . $note_id);
                        }
  
+                       $GLOBALS['phpgw_info']['flags']['app_header'] = 
lang('notes') . ': ' . ($note_id?lang('edit note'):lang('add note'));
+ 
                        if ($note_id)
                        {
                                $note = $this->bo->read_single($note_id);
!                               $this->cat_id = 
($note['cat_id']?$note['cat_id']:$this->cat_id);
                        }
  
***************
*** 209,225 ****
                        $data = array
                        (
!                               'form_action'                                   
=> $GLOBALS['phpgw']->link('/index.php',$link_data),
!                               'done_action'                                   
=> $GLOBALS['phpgw']->link('/index.php','menuaction=notes.ui.index'),
                                'lang_content'                                  
=> lang('content'),
                                'lang_category'                                 
=> lang('category'),
                                'lang_access'                                   
=> lang('private'),
                                'lang_save'                                     
        => lang('save'),
!                               'lang_done'                                     
        => lang('done'),
                                'value_content'                                 
=> $note['content'],
                                'value_access'                                  
=> $note['access'],
                                'value_cat'                                     
        => $note['cat'],
-                               'message'                                       
        => $message,
                                'lang_content_statustext'               => 
lang('Enter the content of the note'),
!                               'lang_done_statustext'                  => 
lang('Back to the list'),
                                'lang_save_statustext'                  => 
lang('Save the note'),
                                'lang_access_off_statustext'    => lang('The 
note is public. If the note should be private, check this box'),
--- 201,216 ----
                        $data = array
                        (
!                               'edit_url'                                      
        => $GLOBALS['phpgw']->link('/index.php',$link_data),
!                               'cancel_url'                                    
=> $GLOBALS['phpgw']->link('/index.php','menuaction=notes.ui.index'),
                                'lang_content'                                  
=> lang('content'),
                                'lang_category'                                 
=> lang('category'),
                                'lang_access'                                   
=> lang('private'),
                                'lang_save'                                     
        => lang('save'),
!                               'lang_cancel'                                   
=> lang('cancel'),
                                'value_content'                                 
=> $note['content'],
                                'value_access'                                  
=> $note['access'],
                                'value_cat'                                     
        => $note['cat'],
                                'lang_content_statustext'               => 
lang('Enter the content of the note'),
!                               'lang_cancel_statustext'                => 
lang('Leave the note untouched and return back to the list'),
                                'lang_save_statustext'                  => 
lang('Save the note'),
                                'lang_access_off_statustext'    => lang('The 
note is public. If the note should be private, check this box'),
***************
*** 230,234 ****
                                'cat_list'                                      
        => $this->cats->formatted_xslt_list(array('format' => 
'select','selected' => $this->cat_id,'globals' => True))
                        );
- 
                        
$GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('edit' => $data));
                }
--- 221,224 ----
***************
*** 270,274 ****
                function view()
                {
!                       $note_id = get_var('note_id',array('GET'));
  
                        $GLOBALS['phpgw_info']['flags']['app_header'] = 
lang('notes') . ': ' . lang('view note');
--- 260,265 ----
                function view()
                {
!                       $note_id        = get_var('note_id',array('GET'));
!                       $action         = get_var('action',array('GET'));
  
                        $GLOBALS['phpgw_info']['flags']['app_header'] = 
lang('notes') . ': ' . lang('view note');
***************
*** 281,284 ****
--- 272,276 ----
                        (
                                'done_action'           => 
$GLOBALS['phpgw']->link('/index.php','menuaction=notes.ui.index'),
+                               'msgbox_data'           => 
(($action=='save')?$GLOBALS['phpgw']->common->msgbox('note has been 
saved',True):''),
                                'lang_content'          => lang('content'),
                                'lang_category'         => lang('category'),
***************
*** 288,292 ****
                                'value_content'         => $note['content'],
                                'value_access'          => 
lang(ucfirst($note['access'])),
!                               'value_cat'                     => 
$this->cats->id2name($note['cat']),
                                'value_date'            => 
$GLOBALS['phpgw']->common->show_date($note['date'])
                        );
--- 280,284 ----
                                'value_content'         => $note['content'],
                                'value_access'          => 
lang(ucfirst($note['access'])),
!                               'value_cat'                     => 
$this->cats->id2name($note['cat_id']),
                                'value_date'            => 
$GLOBALS['phpgw']->common->show_date($note['date'])
                        );