[Phpgroupware-cvs] CVS: notes/inc class.ui.inc.php,1.50,1.51

[Bettina Gille <address@hidden>]

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

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

Index: class.ui.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/notes/inc/class.ui.inc.php,v
retrieving revision 1.50
retrieving revision 1.51
diff -C2 -r1.50 -r1.51
*** class.ui.inc.php    27 Apr 2003 11:49:34 -0000      1.50
--- class.ui.inc.php    27 Apr 2003 13:14:38 -0000      1.51
***************
*** 174,188 ****
                        $values         = get_var('values',array('POST'));
  
!                       $GLOBALS['phpgw']->xslttpl->add_file('app_data');
! 
!                       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'));
  
--- 174,200 ----
                        $values         = get_var('values',array('POST'));
  
!                       if (is_array($values))
                        {
!                               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.index');
!                               }
!                               elseif($values['cancel'])
!                               {
!                                       
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction=notes.ui.index');
!                               }
!                               else
!                               {
!                                       $values['note_id']      = $note_id;
!                                       $note_id                        = 
$this->bo->save($values);
!                                       $action                         = 
'apply';
!                               }
                        }
  
+                       $GLOBALS['phpgw']->xslttpl->add_file('app_data');
+ 
                        $GLOBALS['phpgw_info']['flags']['app_header'] = 
lang('notes') . ': ' . ($note_id?lang('edit note'):lang('add note'));
  
***************
*** 201,206 ****
                        $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'),
--- 213,218 ----
                        $data = array
                        (
+                               'msgbox_data'                                   
=> (($action=='apply')?$GLOBALS['phpgw']->common->msgbox('note has been 
saved',True):''),
                                'edit_url'                                      
        => $GLOBALS['phpgw']->link('/index.php',$link_data),
                                'lang_content'                                  
=> lang('content'),
                                'lang_category'                                 
=> lang('category'),
***************
*** 208,217 ****
                                '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'),
                                'lang_access_on_statustext'             => 
lang('The note is private. If the note should be public, uncheck this box'),
--- 220,231 ----
                                'lang_save'                                     
        => lang('save'),
                                'lang_cancel'                                   
=> lang('cancel'),
+                               'lang_apply'                                    
=> lang('apply'),
                                'value_content'                                 
=> $note['content'],
                                'value_access'                                  
=> $note['access'],
                                'value_cat'                                     
        => $note['cat'],
                                'lang_content_statustext'               => 
lang('Enter the content of the note'),
+                               'lang_apply_statustext'                 => 
lang('Apply the values'),
                                'lang_cancel_statustext'                => 
lang('Leave the note untouched and return back to the list'),
!                               'lang_save_statustext'                  => 
lang('Save the note and return back to the list'),
                                'lang_access_off_statustext'    => lang('The 
note is public. If the note should be private, check this box'),
                                'lang_access_on_statustext'             => 
lang('The note is private. If the note should be public, uncheck this box'),
***************
*** 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'),
--- 286,289 ----