[Phpgroupware-cvs] notes/class.base.php, 1.1.2.3

[nomail]

Update of /notes
Modified Files:
        Branch: proposal-branch
          class.base.php

date: 2004/04/18 04:36:29;  author: jengo;  state: Exp;  lines: +10 -5

Log Message:
- When you delete a note, it will forward you back to notes.base.start
- Started adding some of the hooks for history rollbacks
=====================================================================
No syntax errors detected in -
=====================================================================
Index: notes/class.base.php
diff -u notes/class.base.php:1.1.2.2 notes/class.base.php:1.1.2.3
--- notes/class.base.php:1.1.2.2        Sat Apr 17 07:18:38 2004
+++ notes/class.base.php        Sun Apr 18 04:36:29 2004
@@ -217,8 +217,9 @@
                                        'content'  => lang('Content')
                                );
                                $obj->field_execMethod['category'] = 
'notes.base._temp_cat';
-                               $result['history_data'] = $obj->get('notes.' . 
$args['note_id']);
-                               $result['datamine']     = 
execMethod('api.datamine._get','notes.base.' . $args['note_id']);
+                               $result['history_data']     = 
$obj->get('notes.base.' . $args['note_id']);
+                               $result['history_location'] = 'notes.base.' . 
$args['note_id'];
+                               $result['datamine']         = 
execMethod('api.datamine._get','notes.base.' . $args['note_id']);
                        }
 
                        return $result;
@@ -283,7 +284,7 @@
                                                );
 
                                                $obj = 
createObject('api_history');
-                                               $obj->set('notes.' . 
$note_id,$history_data,array());
+                                               $obj->set('notes.base.' . 
$note_id,$history_data,array());
                                                
$GLOBALS['msgbox']->add(lang('Note has been successfully created'),'notice');
 
                                                if ($args['dm_type'] == 'D')
@@ -374,7 +375,7 @@
                                                        'category' => 
lang('Category'),
                                                        'content'  => 
lang('Content')
                                                );
-                                               $obj->set('notes.' . 
$args['note_id'],$history_data,$old_values);
+                                               $obj->set('notes.base.' . 
$args['note_id'],$history_data,$old_values);
 
                                                
$GLOBALS['msgbox']->add(lang('Note has been successfully updated'),'notice');
                                                return 
$this->view($args['note_id']);
@@ -436,10 +437,14 @@
                                {
                                        execMethod('api.history.clear','notes.' 
. $args['note_id']);
                                        $GLOBALS['msgbox']->add(lang('Note has 
been deleted successfully'),'notice');
+
+                                       return $this->start();
                                }
                                else
                                {
                                        $GLOBALS['msgbox']->add(lang('There was 
a problem deleting this note'),'warning');
+
+                                       return $this->view($args['note_id']);
                                }
                        }